diff --git a/lib/http.c b/lib/http.c
index 7e9713d385f42bee5d089d70c22dd9f34df613c6..09e1fc4c245b9ac3601540458394e8d886117dc4 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1230,7 +1230,7 @@ CURLcode Curl_http(struct connectdata *conn)
     http->p_pragma = "Pragma: no-cache\r\n";
 
   if(!checkheaders(data, "Accept:"))
-    http->p_accept = "Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r\n";
+    http->p_accept = "Accept: */*\r\n";
 
   if(( (HTTPREQ_POST == data->set.httpreq) ||
        (HTTPREQ_POST_FORM == data->set.httpreq) ||
diff --git a/tests/data/test1 b/tests/data/test1
index 42d3ffbe3ee527d74266300169b99b93d05ef885..0d553230d2178e87f327209bb55fa72ea6e7a2a3 100644
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -41,7 +41,7 @@ http://%HOSTIP:%HOSTPORT/1
 GET /1 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test10 b/tests/data/test10
index 885c28259e4e3ee4b32270c6507e665d168903e7..ad2c11473108ed417a5c2bd6929a7f0b63c261a3 100644
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -43,7 +43,7 @@ the
 PUT /we/want/10 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 78
 
 Weird
diff --git a/tests/data/test11 b/tests/data/test11
index fe39c65ac773cc14f2558c7d951a5c895fc30df6..837dc92912d96081c45c317959561fecf37c098c 100644
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -56,12 +56,12 @@ http://%HOSTIP:%HOSTPORT/want/11 -L
 GET /want/11 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /want/data/110002.txt?coolsite=yes HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test12 b/tests/data/test12
index 98dc39f5590c7f961b1663f1b97cdbb187602b11..242246f810cde5c8ce2bc8ea416f926cea17625d 100644
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -41,7 +41,7 @@ GET /want/12 HTTP/1.1
 Range: bytes=100-200
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test13 b/tests/data/test13
index a87c0aee281d26c618619b483567d370cf9c0022..50b41364150293f543a21a218045068d087d5763 100644
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -31,7 +31,7 @@ http://%HOSTIP:%HOSTPORT/want/13 -X DELETE
 DELETE /want/13 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test14 b/tests/data/test14
index 722383d7965f1212390ff63d7cdc455719c43f46..7095bf7a2ae7b6e3bc30fdbc78f6c23955875b94 100644
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -31,7 +31,7 @@ HEAD /want/14 HTTP/1.1
 User-Agent: curl/7.4.2-pre4 (sparc-sun-solaris2.7) libcurl 7.4.2-pre4
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test15 b/tests/data/test15
index d49fffd445e932eb2617904575f16639b15e6926..52225f26f23a2491a09b3f0d05f2933512bee4f2 100644
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -43,7 +43,7 @@ http://127.0.0.1:8999/want/15 200 26
 GET /want/15 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test16 b/tests/data/test16
index c70cf3a7702de57fefa64c73c73cbfa4bb9f6bbc..9e30ce8bf4ec0aee8c6300429e72bd8645c50b52 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -35,7 +35,7 @@ GET http://we.want.that.site.com/16 HTTP/1.1
 Proxy-authorization: Basic ZmFrZUB1c2VyOqenp2xvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==
 Host: we.want.that.site.com
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test17 b/tests/data/test17
index 94196d05c33bd39ed8db37f25c9b27c51cd04856..5b1390eefc14777ea79e213f587b470838f6fc0c 100644
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -40,7 +40,7 @@ MOOO /that.site.com/17 HTTP/1.1
 User-Agent: agent007 license to drill	
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test18 b/tests/data/test18
index 0555fe9604115d1f76697b6d0a5007168585ba97..67a8361f554af39784b8f79201f81de7d5fcf76d 100644
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -46,19 +46,19 @@ GET /18 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /180002 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /180003 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 <stdout>
diff --git a/tests/data/test2 b/tests/data/test2
index b63fc72c8bf386422981fb0440f57bd1d1eb4a1f..a7c231a4958a571bb864d06b8f61fe973fb73d74 100644
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -36,7 +36,7 @@ GET /2 HTTP/1.1
 Authorization: Basic ZmFrZTp1c2Vy
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 <data>
diff --git a/tests/data/test22 b/tests/data/test22
index b59c7ffd4592aa7a8d3592ac0fc6f661345a34cb..32ed119ab5bd64281fa834c887268273aeef4173 100644
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -32,7 +32,7 @@ GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2 (SSL 0.9.6)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol
 </verify>
diff --git a/tests/data/test24 b/tests/data/test24
index 74a012ff71f22aaf952fb7d87d46257323fce478..99d055fc2e730fd890a7aeb1f516d71c2f36b281 100644
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -31,7 +31,7 @@ GET /24 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 <errorcode>
diff --git a/tests/data/test25 b/tests/data/test25
index 2ee484a21bf987e5dfa2f0f08380c328e5e2799c..13ad5a4e8f1083168f79742e7cdac2d734930dd3 100644
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -72,37 +72,37 @@ GET /want/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /want/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /want/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /want/data/reply/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /want/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 
diff --git a/tests/data/test26 b/tests/data/test26
index 79ba8158f3b20e7ff3078e3dd9cc86d211621130..be4f6a96037542e085c3fe578d0a8836e702149d 100644
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -32,7 +32,7 @@ GET /want/26 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test27 b/tests/data/test27
index c801ff5b5f8eb9907bc3cd1d1df4b7ee774e4c1a..2e74e5314881c6c50536fdf6ee1b5c3afcd6a99f 100644
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -31,18 +31,18 @@ Get same cookie page several times
 GET /want/27 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /want/27 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Cookie: thewinneris=nowayyouwin
 
 GET /want/27 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Cookie: thewinneris=nowayyouwin
 
 </protocol>
diff --git a/tests/data/test28 b/tests/data/test28
index 67a5490e1eaab1da4576807a6ff9656373fc8dca..183bd6132beb1353b2c1a4a41b68c766523910fb 100644
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -56,12 +56,12 @@ http://%HOSTIP:%HOSTPORT/want/28 -L
 GET /want/28 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test29 b/tests/data/test29
index 07c77b12acb9f0e16a5498a89cc2e17b7aaf45f0..6f93cfb6ecd7d72737d6bbfd98d1d455c78f8cff 100644
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -34,7 +34,7 @@ http://%HOSTIP:%HOSTPORT/want/29 -m 2
 GET /want/29 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 <errorcode>
diff --git a/tests/data/test3 b/tests/data/test3
index 9c42b8328e13904d6fed4039c33099ce97b2a8e8..36ccad1565a797f8e121cf25daef183d244f9006 100644
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -43,7 +43,7 @@ POST /3 HTTP/1.1
 Authorization: Basic ZmFrZTotdXNlcg==
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 37
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test30 b/tests/data/test30
index 16b3ad124c37d56729cfb9b9f7667dbaf90e18f2..1fc0ae68e5410d5ce437ed9eb7ea3096749a2c14 100644
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -26,7 +26,7 @@ http://%HOSTIP:%HOSTPORT/want/30
 GET /want/30 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 <errorcode>
diff --git a/tests/data/test300 b/tests/data/test300
index 4840f63ff1cd053bb3403e9d84270820c6754d15..deb957b064e9bcb66848087270b4d4666aeb565f 100644
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -35,7 +35,7 @@ simple HTTPS GET
 GET /300 HTTP/1.1
 Host: 127.0.0.1:8433
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test301 b/tests/data/test301
index 2d96074cc108bf353b8190855a8cd48e56ef6899..7160b31b9f5feb5cbcb876ca4a2e0793252f55c6 100644
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -36,7 +36,7 @@ GET /301 HTTP/1.1
 Authorization: Basic ZmFrZTp1c2Vy
 Host: 127.0.0.1:8433
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 <data>
diff --git a/tests/data/test303 b/tests/data/test303
index d7a55a7804271ceddf12ba29cde5842cf6b50b9b..af3e125ef166e95708e3388aaf22a539ff290215 100644
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -34,7 +34,7 @@ http://%HOSTIP:%HOSTPORT/want/303 -m 2
 GET /want/303 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 <errorcode>
diff --git a/tests/data/test304 b/tests/data/test304
index 4cf68a26a83ffe12948418a9de889e98ef67a8ab..b798f6b5e17b9243823777f85b0f1df4379dcd1f 100644
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -37,7 +37,7 @@ POST /we/want/304 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8433
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 1390
 Expect: 100-continue
 Content-Type: multipart/form-data; boundary=----------------------------c3b2ef7f0bb8
diff --git a/tests/data/test306 b/tests/data/test306
index 31d6fbfcdd4151e8d7eb31ee9bb98527c19c98cc..f68d28eba41eb3175021150d348d8ba0b4d94541 100644
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -48,7 +48,7 @@ HTTPS GET, receive no headers only data!
 GET /306 HTTP/1.1
 Host: 127.0.0.1:8433
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test31 b/tests/data/test31
index 03f379fcbfb3fbf7247786cbe4c52fac1996900a..26df799c763e59190d605b35455a1e45158efc47 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -44,7 +44,7 @@ http://%HOSTIP:%HOSTPORT/we/want/31 -b none -c log/jar31.txt
 GET /we/want/31 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 <file name="log/jar31.txt">
diff --git a/tests/data/test32 b/tests/data/test32
index 176639a71c4b0fdccf51d60d1266b486f0cdebcc..fc84a5ca8c4cd3894340b5386033ffb9cf78b1aa 100644
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -42,7 +42,7 @@ GET /32?foo=moo&moo=poo HTTP/1.1
 User-Agent: curl/7.9.5 (i686-pc-linux-gnu) libcurl 7.9.5-cvs (OpenSSL 0.9.5) (ipv6 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test33 b/tests/data/test33
index accabd7fc08e930b3e557aea9d25f4d9eb057311..9702453e5ec6c6f73040f3fcb22a54b458894947 100644
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -42,7 +42,7 @@ Content-Range: bytes 50-99/100
 User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 50
 
 012345678
diff --git a/tests/data/test34 b/tests/data/test34
index f8a526d4d379f11b7ed82fffbf8cc84b325f5fab..f22ec475ff08ed6288a2d79de5bcf4f2159dd87c 100644
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -51,7 +51,7 @@ http://%HOSTIP:%HOSTPORT/34
 GET /34 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test36 b/tests/data/test36
index effaeb73a4aece6d978558a53c06574e9d34b821..60bbf3feb86fd6ddff01fe6e82f7f14e44baf67f 100644
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -50,7 +50,7 @@ http://%HOSTIP:%HOSTPORT/36
 GET /36 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test37 b/tests/data/test37
index d184b5684e04bc82f27f444274352e5b8aead6f9..1705cb03cd02be90c376c9e3368dab8c1403718a 100644
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/37
 GET /37 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test38 b/tests/data/test38
index 32798161785a5218c649e966eb0d16bf45c2bcab..49df17ea576517fcf049f4eaa3ba151686da5f5f 100644
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -40,7 +40,7 @@ GET /want/38 HTTP/1.1
 Range: bytes=78-
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 
diff --git a/tests/data/test39 b/tests/data/test39
index 3eeb3974f117f0bcba4e679688810a3e03b49dae..53aa9550a7c9ccd56d8c7aa11d285428b080b6e4 100644
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -40,7 +40,7 @@ POST /we/want/39 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 598
 Expect: 100-continue
 Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32
diff --git a/tests/data/test40 b/tests/data/test40
index 7686bdc87b336f0e0f933724c377c75895085a01..ca0e2fb8649e869b4c6d561974088e995d2be17a 100644
--- a/tests/data/test40
+++ b/tests/data/test40
@@ -55,13 +55,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/40 -L
 GET /we/are/all/twits/40 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /we/are/all/moo.html/?name=d+a+niel&testcase=/400002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test42 b/tests/data/test42
index 8843b2a54526e7c5f07663bb259e0ce61bec5e93..b179e8a34e64a1367702f04d6a1220e9f38ad4a8 100644
--- a/tests/data/test42
+++ b/tests/data/test42
@@ -55,13 +55,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/42 -L
 GET /we/are/all/twits/42 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /we/are/all/m%20o%20o.html/420002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test43 b/tests/data/test43
index ba40db061d1d961f9dfd4d423ceb937b45cb82b7..22719d86bd0293a55ba46cb002bfdbe5154fa161 100644
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -56,12 +56,12 @@ http://%HOSTIP:%HOSTPORT/want/43 -L -x %HOSTIP:%HOSTPORT
 GET http://127.0.0.1:8999/want/43 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET http://127.0.0.1:8999/want/data/430002.txt?coolsite=yes HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test44 b/tests/data/test44
index 3af86ebe5745bee861df5027b1447db055f86649..9b5ec8b8be4165e5e4430162483447546d377011 100644
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -39,7 +39,7 @@ POST /we/want/44 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 412
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
 
diff --git a/tests/data/test45 b/tests/data/test45
index dbc443b915dbb5c7dc785d8421ffddc639d6b45a..3019d5c9ca44fdb21e9805d7de827d230f4b5b18 100644
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -56,12 +56,12 @@ simple HTTP Location: without protocol in initial URL
 GET /want/45 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /want/data.cgi?moo=http://&/450002 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test46 b/tests/data/test46
index 4ca89ae9b31ad2342523cb24e800a0e2c457b739..48141c6844c16936206e810cdeef28e957c2c154 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -48,7 +48,7 @@ www.loser.com	FALSE	/	FALSE	1139150993	UID	99
 GET /want/46 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Cookie: empty=; mooo=indeed
 
 </protocol>
diff --git a/tests/data/test47 b/tests/data/test47
index 968967d8b491fd233f56732a8fa55c970151c3ca..d13d5f8f7c004660773989ed5075ba1ee30552f3 100644
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -34,7 +34,7 @@ http://%HOSTIP:%HOSTPORT/47 -0
 GET /47 HTTP/1.0
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test48 b/tests/data/test48
index 36aee249aa579e19b97b08953b6ffd1a28393407..8be76bb6eca28814aa1e1ae756bd047e37c364cc 100644
--- a/tests/data/test48
+++ b/tests/data/test48
@@ -33,7 +33,7 @@ HTTP with -d and -G and -I
 HEAD /48?foo=moo&moo=poo HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test49 b/tests/data/test49
index 4c998772c5f5bd9598076cd3c34adb041323e6e7..c49c890ee50485c4dcecdb3649715256c8a76156 100644
--- a/tests/data/test49
+++ b/tests/data/test49
@@ -55,13 +55,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/49 -L
 GET /we/are/all/twits/49 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /we/are/all/moo.html/490002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test5 b/tests/data/test5
index 0ca47bb5b89986df8d02e995c20d2b02fe1d75b3..d8b49f1831f14a4f6fa2a47dca956f81af7b789c 100644
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -35,7 +35,7 @@ http://%HOSTIP:%HOSTPORT/we/want/that/page/5 -x %HOSTIP:%HOSTPORT
 GET http://127.0.0.1:8999/we/want/that/page/5 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test50 b/tests/data/test50
index eb9fd12861ac6a251e052fac44c6a9418e284050..000db4ac5271f73cdba2fde9ebd039e7bdeeb273 100644
--- a/tests/data/test50
+++ b/tests/data/test50
@@ -55,13 +55,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/50 -L
 GET /we/are/all/twits/50 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /we/are/moo.html/500002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test500 b/tests/data/test500
index 52f4174f21272a80cca6ac0809d17c60b8d4e8a6..52288c824493f95f94e45de419125fe4306cea56 100644
--- a/tests/data/test500
+++ b/tests/data/test500
@@ -42,7 +42,7 @@ http://%HOSTIP:%HOSTPORT/500
 GET /500 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test503 b/tests/data/test503
index 2f255e852e33ca3efb8bc2a020ae5fba1f41237a..24d55dc5523267499f41113f2423b3cd377037d4 100644
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -55,7 +55,7 @@ GET /503 HTTP/1.1
 Authorization: Basic dGVzdDppbmc=
 Host: 127.0.0.1:8433
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test508 b/tests/data/test508
index 77f841233cc5b36bee474221b4cd5608d65d60e8..47822bec4689508e1e4c678f210a972150560daf 100644
--- a/tests/data/test508
+++ b/tests/data/test508
@@ -37,7 +37,7 @@ http://%HOSTIP:%HOSTPORT/508
 POST /508 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 45
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test509 b/tests/data/test509
index 27bda4c263d1d44b3b9480c22d3e2f7bd351496c..d4098e1590fa54b9b53fa7732605c69cdbf19c75 100644
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -45,7 +45,7 @@ https://localhost:%HTTPSPORT/dvcs
 GET /509 HTTP/1.1
 Host: localhost:8433
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test51 b/tests/data/test51
index 609414f78a9c1a15425ca0cc1a03a3dd47bd8158..3aa10a3f545ebab4d14c0005a8f91dd369a4651d 100644
--- a/tests/data/test51
+++ b/tests/data/test51
@@ -55,13 +55,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/51 -L
 GET /we/are/all/twits/51 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /510002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test510 b/tests/data/test510
index b688ce490adce3922049e3cb0f94bbe459d65db6..33790dc7941adf67620e10649c42c6c2be248109 100644
--- a/tests/data/test510
+++ b/tests/data/test510
@@ -37,7 +37,7 @@ http://%HOSTIP:%HOSTPORT/510
 POST /510 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Transfer-Encoding: chunked
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test52 b/tests/data/test52
index 80084f86cee31f7b6b64e249bcda5670be7f7b8f..4f49059d6729d95916daac57a9281744e5df80af 100644
--- a/tests/data/test52
+++ b/tests/data/test52
@@ -55,13 +55,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/52 -L
 GET /we/are/all/twits/52 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /we/are/all/twits/520002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test53 b/tests/data/test53
index 09395f92ea681e5e12e0088148a81161449346d2..9e1d6b635b07e96df84ae9e2d047337d867771ea 100644
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -39,7 +39,7 @@ HTTP, junk session cookies
 GET /want/53 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Cookie: mooo=indeed
 
 </protocol>
diff --git a/tests/data/test54 b/tests/data/test54
index 3812ead31b3e49184f705ce3e7e4719d6b8330e7..c71aa2b393edecfd75e33b944bc10871360df31e 100644
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -31,7 +31,7 @@ http://%HOSTIP:%HOSTPORT/want/54 -L
 GET /want/54 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test55 b/tests/data/test55
index 9154b4be8e7d0f2cd0b3c889e7d49288a06cc229..fd7ca55ad63b47888896bcc8b51bd14fd61ca107 100644
--- a/tests/data/test55
+++ b/tests/data/test55
@@ -47,13 +47,13 @@ http://%HOSTIP:%HOSTPORT/55 -L
 GET /55 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /550002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test56 b/tests/data/test56
index fa0a6e4d14174aa016cc75484b10e51d709b1743..c1d2489bceb046b49ac7835656a7eebaab3437f6 100644
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -41,7 +41,7 @@ header "Transfer-Encoding: chunked"
 POST /that.site.com/56 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Transfer-Encoding: chunked
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test57 b/tests/data/test57
index 397619526cf61f5974e3a917f0f44a3c870c4baf..b3fb332dbaa16d1242d5486fa5b4bbdaf636fd0b 100644
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -33,7 +33,7 @@ text/html; charset=ISO-8859-4
 GET /57 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test58 b/tests/data/test58
index 3ab53e8cbb3b41ec1c29950b5ebc2777853831c5..ce83852d4d4f5e12189d1adbd9a6c9fbe365b458 100644
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -35,7 +35,7 @@ a few bytes
 PUT /we/want/58te%5B%5Dst%2Etxt HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 12
 
 a few bytes
diff --git a/tests/data/test59 b/tests/data/test59
index 4e74bcb4f2d9573fe109bef265575eb4f34088be..7e7691d71ef85030e6c9772a6e050dc48a73ffae 100644
--- a/tests/data/test59
+++ b/tests/data/test59
@@ -34,7 +34,7 @@ http://%HOSTIP:%HOSTPORT?mooo/59
 GET /?mooo/59 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test6 b/tests/data/test6
index c16141cb1afb97414b3ecc7da00f0096c21bec27..fbd5c16ab4efde7bedbf1e4873cb8bded066f8cc 100644
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -34,7 +34,7 @@ GET /we/want/that/page/6 HTTP/1.1
 Cookie: name=contents;name2=content2
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test60 b/tests/data/test60
index 4ce2300de281214c3986e29db110638c745cb185..b58fc15767059c25aa9bf88e4906df2e7a3a380a 100644
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -35,7 +35,7 @@ more than one byte
 PUT /bzz/60 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Transfer-Encoding: chunked
 Content-Length: 1
 
diff --git a/tests/data/test61 b/tests/data/test61
index 00cc74d04e19b7e9a9f5ce899e0566bfc3fdbc63..e5f70754ab68f457a1798bccc10f51a7e6606fda 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -38,7 +38,7 @@ http://%HOSTIP:%HOSTPORT/we/want/61 -c log/jar61.txt -H "Host: www.host.foo.com"
 <protocol>
 GET /we/want/61 HTTP/1.1
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Host: www.host.foo.com
 
 </protocol>
diff --git a/tests/data/test62 b/tests/data/test62
index e29c3d7b52839dab594fb3c35c84f08aae5a8e71..00309ea1b1a65b6a5965249dde5b41751789e381 100644
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -41,7 +41,7 @@ http://%HOSTIP:%HOSTPORT/we/want/62 -b log/jar62.txt -H "Host: www.host.foo.com"
 <protocol>
 GET /we/want/62 HTTP/1.1
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Cookie: test2=yes; test=yes
 Host: www.host.foo.com
 
diff --git a/tests/data/test63 b/tests/data/test63
index cb44e0de7b70b013066ee794a9fa1449df60d81f..dc5e8ad1e80c69a3d1211abac29a33d051fbf78a 100644
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -35,7 +35,7 @@ GET http://we.want.that.site.com/63 HTTP/1.1
 Proxy-authorization: Basic aHR0cDovL2Zha2U6dXNlcg==
 Host: we.want.that.site.com
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test64 b/tests/data/test64
index 5fd42e464a472336a563d1bf4336b3bb61ce2b14..26c31d7c2679aab53c29b56b3e8f07fe3f5efd9f 100644
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -56,14 +56,14 @@ http://%HOSTIP:%HOSTPORT/64 -u testuser:testpass --digest
 GET /64 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /64 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/64", response="c55f7f30d83d774a3d2dcacf725abaca"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test65 b/tests/data/test65
index e6445c57083ebded6b39bdfca9e7103489850f0c..e734c275bfdbbc851c8cef93c24e1f3af4b912ec 100644
--- a/tests/data/test65
+++ b/tests/data/test65
@@ -60,14 +60,14 @@ http://%HOSTIP:%HOSTPORT/65 -u testuser:test2pass --digest
 GET /65 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /65 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/65", response="66d68d3251f1839576ba7c766cf9205b"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test66 b/tests/data/test66
index cfc3214b6b818b91960293572e5949fb124bc6ba..285c0c42e79c533ac835ef995931d5af622bf009 100644
--- a/tests/data/test66
+++ b/tests/data/test66
@@ -28,7 +28,7 @@ http://%HOSTIP:%HOSTPORT/66
 GET /66 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test67 b/tests/data/test67
index ae92276b31b6123c90f55f12f0fc1c0205ad23e2..0542ab3141609c9c34cfd8f96fb4e8c795e99445 100644
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -69,14 +69,14 @@ Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /67 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAAAAAAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAABgAAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FB
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test68 b/tests/data/test68
index 0eab3d76b250d62fce84073ae86ed8c32e819a89..639d4f2aa1ef31649d9a712c7110b9a2ca76ab0f 100644
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -71,14 +71,14 @@ Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /68 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAAAAAAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAABgAAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FB
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test69 b/tests/data/test69
index 087783fe0f8dff1586d5fc56fb05b22e4042887e..0cc1e0c9d59b70e3272264167ef338d949102fa0 100644
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -83,21 +83,21 @@ GET /69 HTTP/1.1
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /69 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /69 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAAAAAAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAABgAAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FB
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test7 b/tests/data/test7
index d7c656a7c93023df797d0a8e1a7361028c8e5ac2..7441d31280f6c438c390f0f558d03b6c683861f8 100644
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -35,7 +35,7 @@ http://%HOSTIP:%HOSTPORT/we/want/7 -b none -D log/heads7.txt
 GET /we/want/7 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 <file name="log/heads7.txt">
diff --git a/tests/data/test70 b/tests/data/test70
index b2d5f863b428707b3ba55ffb3e64a7173deef492..a9efd437bb2300a9fd057d71dd2ee9058bdad70d 100644
--- a/tests/data/test70
+++ b/tests/data/test70
@@ -67,14 +67,14 @@ GET /70 HTTP/1.1
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /70 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/70", response="2c9a6f00af0d86497b177b90e90c688a"
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test71 b/tests/data/test71
index 70e0674ac35d72fe378ef068c4138801ede06518..826585dd8e81d8bd8fabceeb98b61c390ccd7be7 100644
--- a/tests/data/test71
+++ b/tests/data/test71
@@ -44,7 +44,7 @@ POST /we/want/71 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 412
 Expect: 100-continue
 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
diff --git a/tests/data/test72 b/tests/data/test72
index 1c9a3704e01507477932ab720ff24ae0ba7c7fc7..e5600a7dc4e14f147566e172304cd63be34f3d7f 100644
--- a/tests/data/test72
+++ b/tests/data/test72
@@ -63,14 +63,14 @@ GET /72 HTTP/1.1
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /72 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/72", response="9fcd1330377365a09bbcb33b2cbb25bd"
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test73 b/tests/data/test73
index 4020c6d0660f56b7670306386597396f540198b4..202375360762727a72ccc73729b4d4ee676a938b 100644
--- a/tests/data/test73
+++ b/tests/data/test73
@@ -31,7 +31,7 @@ http://%HOSTIP:%HOSTPORT/we/want/73 -c log/jar73.txt -H "Host: host.NOT_DISCLOSE
 <protocol>
 GET /we/want/73 HTTP/1.1
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Host: host.NOT_DISCLOSED.se
 
 </protocol>
diff --git a/tests/data/test74 b/tests/data/test74
index ec7a3a4dea75ee3e999d6e823983cd4fa3323b5d..dc837d69ee41938864f9d60d0dfd4ba384e428e1 100644
--- a/tests/data/test74
+++ b/tests/data/test74
@@ -48,12 +48,12 @@ HTTP, urlglob {}-retrieval and -o #[num] usage
 GET /74 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /740001 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 <file name="log/dumpit740001.dump">
diff --git a/tests/data/test77 b/tests/data/test77
index ef462a902bd18e99e3cba20ef761cb977f0b791a..61dba4059f80edb7bcac9aa04f4d045850c2718c 100644
--- a/tests/data/test77
+++ b/tests/data/test77
@@ -40,7 +40,7 @@ http://%HOSTIP:%HOSTPORT/77 -z "1999-12-12 12:00:00 MET"
 GET /77 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
 
 </protocol>
diff --git a/tests/data/test78 b/tests/data/test78
index 34d194a08fe45e0530d78b917bf2d5d58e13046c..a7a37d16c9410250b797227d49522ca581ff6cf0 100644
--- a/tests/data/test78
+++ b/tests/data/test78
@@ -52,7 +52,7 @@ http://%HOSTIP:%HOSTPORT/78 -z "1999-12-12 12:00:00 MET"
 GET /78 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
 
 </protocol>
diff --git a/tests/data/test79 b/tests/data/test79
index c068aaec3d4e8edaf08142322031b2b627a31a0c..5a9e12113854109647b471e021b89ee6fe428fde 100644
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -36,7 +36,7 @@ ftp://%HOSTIP:%HOSTPORT/we/want/that/page/79 -x %HOSTIP:%HOSTPORT
 GET ftp://127.0.0.1:8999/we/want/that/page/79 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test8 b/tests/data/test8
index da68b748ebc7cf2ecea9d9712c85a2a87027b56d..bc1a99ca50ca4668ca04ea23e07b284669461649 100644
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -43,7 +43,7 @@ Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
 GET /we/want/8 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Cookie: partmatch=present; foobar=name
 
 </protocol>
diff --git a/tests/data/test80 b/tests/data/test80
index 893ed85ea815e849ad55102bb4046cfbe7da4acf..6503cfee870c4994c8c7f71b3d844f657ae5942b 100644
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -53,7 +53,7 @@ Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test81 b/tests/data/test81
index 1f93eda35edc7036ca600b1a1e63d3bc19265bfa..4627e0f343b48e5a569bf1c057178ce5e5aac818 100644
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -67,14 +67,14 @@ Proxy-Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET http://127.0.0.1:8999/81 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAAAAAAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAABgAAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FB
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test82 b/tests/data/test82
index 1e967f01651549b7e7036458e7d3395fbcf81567..fc4e490bd40c94c4c0957fb6a4f8ae9d1d3a41a7 100644
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -39,7 +39,7 @@ Proxy-authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test83 b/tests/data/test83
index 64a69fc876f40673d5510d97f72874d2f18e4ffd..55d6a5a136d07146e33d141a3db72c75b17dca09 100644
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -52,7 +52,7 @@ Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test84 b/tests/data/test84
index b95e85386e1348c7d92cdf414eb640512011c12a..939de6f1bf1da482e6c3d10f412a53c6d6a23b76 100644
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -38,7 +38,7 @@ Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test85 b/tests/data/test85
index ce9771b884e55b6998d4cfade804e8c705833625..a1fe043655464a0a5ec6de0dbdbb3b9a55710e04 100644
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -39,7 +39,7 @@ Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test86 b/tests/data/test86
index 1e785daa20531ac89291942040b535ceb9cd518f..7636ee890a5f0de46596720bea90139d7ef68881 100644
--- a/tests/data/test86
+++ b/tests/data/test86
@@ -63,19 +63,19 @@ GET /860001 HTTP/1.1
 User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /860002 HTTP/1.1
 User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /860003 HTTP/1.1
 User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 
diff --git a/tests/data/test88 b/tests/data/test88
index 4f3ee55d9e1c15eb495eeaa96662920b37704761..532418020972dabac6586aaa7f1432caadd151b5 100644
--- a/tests/data/test88
+++ b/tests/data/test88
@@ -62,14 +62,14 @@ four is the number of lines
 PUT /88 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 PUT /88 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/88", response="78a49fa53d0c228778297687d4168e71"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 85
 
 This is data we upload with PUT
diff --git a/tests/data/test89 b/tests/data/test89
index 5701e5f61dda49af4c5a2060bc1dfed91cc6e942..b737107c185da32918acdf62fca04e083c9465de 100644
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -101,28 +101,28 @@ Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /89 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAAAAAAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAABgAAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FB
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /you/890010 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /you/890010 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAAAAAAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAABgAAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FB
 User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test9 b/tests/data/test9
index b2d5c9299714b11dbaeb56fc024e767932cf29c6..10b06041959fadaf540145905174a9f2beada304 100644
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -39,7 +39,7 @@ POST /we/want/9 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 411
 Expect: 100-continue
 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
diff --git a/tests/data/test90 b/tests/data/test90
index 461553706c150cac7014ef17735caa7551027bbe..0c6976af00d44fb5e601f94c0011334fc6fc05f4 100644
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -133,40 +133,40 @@ http://%HOSTIP:%HOSTPORT/90 -u testuser:testpass --anyauth -L
 GET /90 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /90 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /90 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAAAAAAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAABgAAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FB
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /you/900010 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /you/900010 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /you/900010 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAAAAAAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAABgAAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FB
 User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test91 b/tests/data/test91
index 62491b584bbffb02fca98e52e616d705eb2e8546..84eaa9e14c07e927f441813816c49afa14580bdf 100644
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -84,21 +84,21 @@ GET /91 HTTP/1.1
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /91 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 GET /91 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAE4AAAAAAAAAZgAAAAgACABAAAAABgAGAEgAAAAAAAAATgAAAAAAAABmAAAAAYIAAG15ZG9tYWlubXlzZWxmwjImlHmYemDYVmFrmRFoVn3jfoYDE+7Q
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test92 b/tests/data/test92
index 8109844910a68a6f4d82c231ae3db49dc6e8d626..1a1d30b381b66ba0edb8c139bb686daa6fbee3f4 100644
--- a/tests/data/test92
+++ b/tests/data/test92
@@ -37,7 +37,7 @@ GET /want/92 HTTP/1.1
 Range: bytes=87-
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 
diff --git a/tests/data/test93 b/tests/data/test93
index 1c5e73bb14ed6615e8998b3547b6d7d5fc8b971a..ea458cec257390292b96a6ba92a99d197c49e2c1 100644
--- a/tests/data/test93
+++ b/tests/data/test93
@@ -35,7 +35,7 @@ http://%HOSTIP:%HOSTPORT/93 -x %HOSTIP:%HOSTPORT
 GET http://127.0.0.1:8999/93 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 
 </protocol>
 </verify>
diff --git a/tests/data/test95 b/tests/data/test95
index b83735d65f9343ebc070ea4844663a4ed472386f..0602c33c6c6e0f723249d7e529be8e69851a31e3 100644
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -51,7 +51,7 @@ POST /we/want/that/page/95 HTTP/1.1
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 27
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test97 b/tests/data/test97
index 018123c03cb1c3f140a653ff0ee9bf53f6dc8434..170d64114c51ebb0b95a37cac668ce7f7088f89b 100644
--- a/tests/data/test97
+++ b/tests/data/test97
@@ -35,7 +35,7 @@ HTTP POST with custom content-type
 POST /97 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Type: silly/type
 Content-Length: 14
 
diff --git a/tests/data/test98 b/tests/data/test98
index 90f240e9a74baa354d1de50159b389467dd64810..86033c8218da98e2f4079c4244319f8dbe07f8f8 100644
--- a/tests/data/test98
+++ b/tests/data/test98
@@ -38,7 +38,7 @@ data on stdin
 PUT /98 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Accept: */*
 Content-Length: 14
 
 data on stdin