Change several tests to use the sane_unset function introduced in v1.7.3.1-35-g00648ba instead of the built-in unset function. This fixes a failure I was having on t9130-git-svn-authors-file.sh on Solaris, and prevents several other issues from occurring. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			75 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			75 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
test_description='test git-http-backend-noserver'
 | 
						|
. ./test-lib.sh
 | 
						|
 | 
						|
HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
 | 
						|
 | 
						|
test_have_prereq MINGW && export GREP_OPTIONS=-U
 | 
						|
 | 
						|
run_backend() {
 | 
						|
	echo "$2" |
 | 
						|
	QUERY_STRING="${1#*\?}" \
 | 
						|
	PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%\?*}" \
 | 
						|
	git http-backend >act.out 2>act.err
 | 
						|
}
 | 
						|
 | 
						|
GET() {
 | 
						|
	REQUEST_METHOD="GET" && export REQUEST_METHOD &&
 | 
						|
	run_backend "/repo.git/$1" &&
 | 
						|
	sane_unset REQUEST_METHOD &&
 | 
						|
	if ! grep "Status" act.out >act
 | 
						|
	then
 | 
						|
		printf "Status: 200 OK\r\n" >act
 | 
						|
	fi
 | 
						|
	printf "Status: $2\r\n" >exp &&
 | 
						|
	test_cmp exp act
 | 
						|
}
 | 
						|
 | 
						|
POST() {
 | 
						|
	REQUEST_METHOD="POST" && export REQUEST_METHOD &&
 | 
						|
	CONTENT_TYPE="application/x-$1-request" && export CONTENT_TYPE &&
 | 
						|
	run_backend "/repo.git/$1" "$2" &&
 | 
						|
	sane_unset REQUEST_METHOD &&
 | 
						|
	sane_unset CONTENT_TYPE &&
 | 
						|
	if ! grep "Status" act.out >act
 | 
						|
	then
 | 
						|
		printf "Status: 200 OK\r\n" >act
 | 
						|
	fi
 | 
						|
	printf "Status: $3\r\n" >exp &&
 | 
						|
	test_cmp exp act
 | 
						|
}
 | 
						|
 | 
						|
log_div() {
 | 
						|
	return 0
 | 
						|
}
 | 
						|
 | 
						|
. "$TEST_DIRECTORY"/t556x_common
 | 
						|
 | 
						|
expect_aliased() {
 | 
						|
	REQUEST_METHOD="GET" && export REQUEST_METHOD &&
 | 
						|
	if test $1 = 0; then
 | 
						|
		run_backend "$2"
 | 
						|
	else
 | 
						|
		run_backend "$2" &&
 | 
						|
		echo "fatal: '$2': aliased" >exp.err &&
 | 
						|
		test_cmp exp.err act.err
 | 
						|
	fi
 | 
						|
	unset REQUEST_METHOD
 | 
						|
}
 | 
						|
 | 
						|
test_expect_success 'http-backend blocks bad PATH_INFO' '
 | 
						|
	config http.getanyfile true &&
 | 
						|
 | 
						|
	expect_aliased 0 /repo.git/HEAD &&
 | 
						|
 | 
						|
	expect_aliased 1 /repo.git/../HEAD &&
 | 
						|
	expect_aliased 1 /../etc/passwd &&
 | 
						|
	expect_aliased 1 ../etc/passwd &&
 | 
						|
	expect_aliased 1 /etc//passwd &&
 | 
						|
	expect_aliased 1 /etc/./passwd &&
 | 
						|
	expect_aliased 1 //domain/data.txt
 | 
						|
'
 | 
						|
 | 
						|
test_done
 |