summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorYi EungJun <eungjun.yi@navercorp.com>2014-06-17 22:11:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-17 22:25:00 (GMT)
commitf34a655d4d1e25f314cd5760e2a39bec28950aa1 (patch)
tree0f60932eb635669b9429eee85479046dcd4a390f /t/lib-httpd
parentc553fd1c1ef76688b6200e66a825b530b0b02140 (diff)
downloadgit-f34a655d4d1e25f314cd5760e2a39bec28950aa1.zip
git-f34a655d4d1e25f314cd5760e2a39bec28950aa1.tar.gz
git-f34a655d4d1e25f314cd5760e2a39bec28950aa1.tar.bz2
http: fix charset detection of extract_content_type()
extract_content_type() could not extract a charset parameter if the parameter is not the first one and there is a whitespace and a following semicolon just before the parameter. For example: text/plain; format=fixed ;charset=utf-8 And it also could not handle correctly some other cases, such as: text/plain; charset=utf-8; format=fixed text/plain; some-param="a long value with ;semicolons;"; charset=utf-8 Thanks-to: Jeff King <peff@peff.net> Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-httpd')
-rwxr-xr-xt/lib-httpd/error.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/lib-httpd/error.sh b/t/lib-httpd/error.sh
index eafc9d2..a77b8e5 100755
--- a/t/lib-httpd/error.sh
+++ b/t/lib-httpd/error.sh
@@ -19,6 +19,10 @@ case "$PATH_INFO" in
printf "text/plain; charset=utf-16"
charset=utf-16
;;
+*odd-spacing*)
+ printf "text/plain; foo=bar ;charset=utf-16; other=nonsense"
+ charset=utf-16
+ ;;
esac
printf "\n"