Send a charset only with a text type

Archives, packs and the HEAD file went out as octet-stream or gzip
with a UTF-8 charset on the end, since only the blob page cleared it.
The headers now decide from the type itself, so the two places that
cleared the charset by hand no longer need to.

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/t0105-plain.sh b/tests/t0105-plain.sh
index 2fbe87f..4041d98 100755
--- a/tests/t0105-plain.sh
+++ b/tests/t0105-plain.sh
@@ -14,7 +14,7 @@ test_expect_success 'generate foo/plain/file-1' '
 
 test_expect_success 'a text file is served as text/plain' '
 	head -n 1 tmp | grep "Status: 200 OK" &&
-	sed "/^$/q" tmp | grep "Content-Type: text/plain"
+	sed "/^$/q" tmp | grep "^Content-Type: text/plain; charset=UTF-8$"
 '
 
 test_expect_success 'the body carries the blob byte for byte' '
@@ -43,7 +43,7 @@ test_expect_success 'a blob whose bytes look binary is served as octet-stream' '
 		git commit -m binary
 	) &&
 	cgit_url "foo/plain/blob.bin" >tmp &&
-	sed "/^$/q" tmp | grep "Content-Type: application/octet-stream"
+	sed "/^$/q" tmp | grep "^Content-Type: application/octet-stream$"
 '
 
 test_done
diff --git a/tests/t0110-snapshot.sh b/tests/t0110-snapshot.sh
index ba38b82..4852e7b 100755
--- a/tests/t0110-snapshot.sh
+++ b/tests/t0110-snapshot.sh
@@ -31,7 +31,7 @@ test_tar_snapshot() {
 
 	test_expect_success $prereq "check $ext response headers" "
 		head -n 1 tmp | grep 'Status: 200 OK' &&
-		head -n 2 tmp | grep 'Content-Type: $type' &&
+		head -n 2 tmp | grep '^Content-Type: $type\$' &&
 		head -n 3 tmp | grep 'Content-Disposition: inline; filename=.master.$ext.'
 	"
 
@@ -58,7 +58,7 @@ test_expect_success 'get foo/snapshot/master.tar' '
 
 test_expect_success 'check tar response headers' '
 	head -n 1 tmp | grep "Status: 200 OK" &&
-	head -n 2 tmp | grep "Content-Type: application/x-tar" &&
+	head -n 2 tmp | grep "^Content-Type: application/x-tar$" &&
 	head -n 3 tmp | grep "Content-Disposition: inline; filename=.master.tar."
 '
 
@@ -91,7 +91,7 @@ test_expect_success 'get foo/snapshot/master.zip' '
 
 test_expect_success 'check zip response headers' '
 	head -n 1 tmp | grep "Status: 200 OK" &&
-	head -n 2 tmp | grep "Content-Type: application/zip" &&
+	head -n 2 tmp | grep "^Content-Type: application/zip$" &&
 	head -n 3 tmp | grep "Content-Disposition: inline; filename=.master.zip."
 '