summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-05-22 09:29:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-23 19:43:51 (GMT)
commitdbcf2bd3dec1244fdbafb3ec7312ed14d83c0025 (patch)
tree123631e429deedf2f9d277608a22c37a6fb5336f /t/lib-httpd
parentc7db2d16474874b21aad9141e6856f836f719643 (diff)
downloadgit-dbcf2bd3dec1244fdbafb3ec7312ed14d83c0025.zip
git-dbcf2bd3dec1244fdbafb3ec7312ed14d83c0025.tar.gz
git-dbcf2bd3dec1244fdbafb3ec7312ed14d83c0025.tar.bz2
t5550: test display of remote http error messages
Since commit 426e70d (remote-curl: show server content on http errors, 2013-04-05), we relay any text/plain error messages from the remote server to the user. However, we never tested it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-httpd')
-rw-r--r--t/lib-httpd/apache.conf4
-rwxr-xr-xt/lib-httpd/error.sh17
2 files changed, 21 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 3a03e82..b384d79 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -97,12 +97,16 @@ Alias /auth/dumb/ www/auth/dumb/
</LocationMatch>
ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
ScriptAlias /broken_smart/ broken-smart-http.sh/
+ScriptAlias /error/ error.sh/
<Directory ${GIT_EXEC_PATH}>
Options FollowSymlinks
</Directory>
<Files broken-smart-http.sh>
Options ExecCGI
</Files>
+<Files error.sh>
+ Options ExecCGI
+</Files>
<Files ${GIT_EXEC_PATH}/git-http-backend>
Options ExecCGI
</Files>
diff --git a/t/lib-httpd/error.sh b/t/lib-httpd/error.sh
new file mode 100755
index 0000000..786f281
--- /dev/null
+++ b/t/lib-httpd/error.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+printf "Status: 500 Intentional Breakage\n"
+
+printf "Content-Type: "
+case "$PATH_INFO" in
+*html*)
+ printf "text/html"
+ ;;
+*text*)
+ printf "text/plain"
+ ;;
+esac
+printf "\n"
+
+printf "\n"
+printf "this is the error message\n"