From 40e8b4e5277c7ad726b50ec904fa573b656184b3 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 19 Nov 2008 22:00:14 +0000 Subject: - I removed the default use of "Pragma: no-cache" from libcurl when a proxy is used. It has been used since forever but it was never a good idea to use unless explicitly asked for. --- tests/data/test1001 | 2 -- tests/data/test1002 | 3 --- tests/data/test1034 | 1 - tests/data/test1035 | 1 - tests/data/test1077 | 2 -- tests/data/test16 | 1 - tests/data/test162 | 1 - tests/data/test165 | 1 - tests/data/test167 | 2 -- tests/data/test168 | 3 --- tests/data/test169 | 3 --- tests/data/test170 | 1 - tests/data/test171 | 1 - tests/data/test179 | 1 - tests/data/test183 | 2 -- tests/data/test184 | 2 -- tests/data/test185 | 2 -- tests/data/test208 | 1 - tests/data/test233 | 2 -- tests/data/test234 | 2 -- tests/data/test239 | 2 -- tests/data/test243 | 3 --- tests/data/test256 | 1 - tests/data/test257 | 3 --- tests/data/test258 | 2 -- tests/data/test259 | 2 -- tests/data/test262 | Bin 1137 -> 37 bytes tests/data/test263 | 1 - tests/data/test264 | 1 - tests/data/test278 | 1 - tests/data/test279 | 1 - tests/data/test35 | Bin 810 -> 37 bytes tests/data/test43 | 2 -- tests/data/test5 | 1 - tests/data/test523 | 1 - tests/data/test540 | 3 --- tests/data/test545 | Bin 748 -> 37 bytes tests/data/test547 | 3 --- tests/data/test548 | 3 --- tests/data/test549 | 1 - tests/data/test550 | 1 - tests/data/test551 | 2 -- tests/data/test552 | Bin 143263 -> 37 bytes tests/data/test555 | 3 --- tests/data/test63 | 1 - tests/data/test79 | 1 - tests/data/test81 | 2 -- tests/data/test82 | 1 - tests/data/test84 | 1 - tests/data/test85 | 1 - tests/data/test93 | 1 - 51 files changed, 79 deletions(-) (limited to 'tests/data') diff --git a/tests/data/test1001 b/tests/data/test1001 index 8d1a2d422..9a87d6e8b 100644 --- a/tests/data/test1001 +++ b/tests/data/test1001 @@ -84,7 +84,6 @@ GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1 Content-Range: bytes 2-4/5 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -94,7 +93,6 @@ GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1001", response="6af4d89c952f4dd4cc215a6878dc499d" Content-Range: bytes 2-4/5 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 3 diff --git a/tests/data/test1002 b/tests/data/test1002 index bf9bbed91..04c18f91a 100644 --- a/tests/data/test1002 +++ b/tests/data/test1002 @@ -83,7 +83,6 @@ GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1 Content-Range: bytes 2-4/5 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -93,7 +92,6 @@ GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54" Content-Range: bytes 2-4/5 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 3 @@ -105,7 +103,6 @@ Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", u Content-Range: bytes 2-4/5 User-Agent: curl/7.16.1 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 3 diff --git a/tests/data/test1034 b/tests/data/test1034 index a710af25b..c47574051 100644 --- a/tests/data/test1034 +++ b/tests/data/test1034 @@ -54,7 +54,6 @@ http://invalid-utf8- GET http://invalid-utf8-â.local/page/1034 HTTP/1.1 Host: invalid-utf8-â.local -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1035 b/tests/data/test1035 index 7f104c7b6..20b434c34 100644 --- a/tests/data/test1035 +++ b/tests/data/test1035 @@ -51,7 +51,6 @@ http://too-long-IDN-name-c GET http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 HTTP/1.1 Host: too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1077 b/tests/data/test1077 index 7624a30f4..a3c90245a 100644 --- a/tests/data/test1077 +++ b/tests/data/test1077 @@ -62,13 +62,11 @@ FTP over HTTP proxy with downgrade to HTTP 1.0 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002 HTTP/1.0 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test16 b/tests/data/test16 index d926a1fb1..98539bebd 100644 --- a/tests/data/test16 +++ b/tests/data/test16 @@ -44,7 +44,6 @@ HTTP with proxy authorization 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: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test162 b/tests/data/test162 index 892a9bf87..4f793d9a2 100644 --- a/tests/data/test162 +++ b/tests/data/test162 @@ -49,7 +49,6 @@ GET http://%HOSTIP:%HTTPPORT/162 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test165 b/tests/data/test165 index 2893696a3..ddfe1e9dc 100644 --- a/tests/data/test165 +++ b/tests/data/test165 @@ -50,7 +50,6 @@ http://www. GET http://www.xn--4cab6c.se/page/165 HTTP/1.1 Host: www.xn--4cab6c.se -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test167 b/tests/data/test167 index ef83688cb..2ce968db2 100644 --- a/tests/data/test167 +++ b/tests/data/test167 @@ -63,7 +63,6 @@ GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1 Proxy-Authorization: Basic Zm9vOmJhcg== User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 Host: data.from.server.requiring.digest.hohoho.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive @@ -72,7 +71,6 @@ Proxy-Authorization: Basic Zm9vOmJhcg== Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/167", response="13c7c02a252cbe1c46d8669898a3be26" User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 Host: data.from.server.requiring.digest.hohoho.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test168 b/tests/data/test168 index d3a12b8ae..e72e93149 100644 --- a/tests/data/test168 +++ b/tests/data/test168 @@ -76,7 +76,6 @@ http://data.from.server.requiring.digest.hohoho.com/168 --proxy http://%HOSTIP:% GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 Host: data.from.server.requiring.digest.hohoho.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive @@ -84,7 +83,6 @@ GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1 Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976" User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 Host: data.from.server.requiring.digest.hohoho.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive @@ -93,7 +91,6 @@ Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/168", response="ca87f2d768a231e2d637a55698d5c416" User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3 Host: data.from.server.requiring.digest.hohoho.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test169 b/tests/data/test169 index 9a4b954e4..0ad2f8808 100644 --- a/tests/data/test169 +++ b/tests/data/test169 @@ -101,7 +101,6 @@ GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3 Host: data.from.server.requiring.digest.hohoho.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive @@ -109,7 +108,6 @@ GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAwADAHAAAAA User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3 Host: data.from.server.requiring.digest.hohoho.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive @@ -117,7 +115,6 @@ GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1 Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/169", response="95d48591985a03c4b49cb962aa7bd3e6" User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3 Host: data.from.server.requiring.digest.hohoho.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test170 b/tests/data/test170 index 4db486722..a2c221792 100644 --- a/tests/data/test170 +++ b/tests/data/test170 @@ -38,7 +38,6 @@ POST http://a.galaxy.far.far.away/170 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 libidn/0.4.3 Host: a.galaxy.far.far.away -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 diff --git a/tests/data/test171 b/tests/data/test171 index de02d79b5..870d236f2 100644 --- a/tests/data/test171 +++ b/tests/data/test171 @@ -43,7 +43,6 @@ HTTP, get cookie with dot prefixed full domain GET http://z.x.com/171 HTTP/1.1 Host: z.x.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test179 b/tests/data/test179 index 779caf377..f8f7811a7 100644 --- a/tests/data/test179 +++ b/tests/data/test179 @@ -48,7 +48,6 @@ supertrooper.fake FALSE /c FALSE 2139150993 moo2 indeed GET http://supertrooper.fake/c/179 HTTP/1.1 Host: supertrooper.fake -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Cookie: moo2=indeed diff --git a/tests/data/test183 b/tests/data/test183 index e9db2ba0c..f34dc0c98 100644 --- a/tests/data/test183 +++ b/tests/data/test183 @@ -41,14 +41,12 @@ http://deathstar.another.galaxy/183 http://a.galaxy.far.far.away/183 --proxy htt GET http://deathstar.another.galaxy/183 HTTP/1.1 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6 Host: deathstar.another.galaxy -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive GET http://a.galaxy.far.far.away/183 HTTP/1.1 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6 Host: a.galaxy.far.far.away -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test184 b/tests/data/test184 index 0727750f7..e42a393ea 100644 --- a/tests/data/test184 +++ b/tests/data/test184 @@ -60,14 +60,12 @@ http://deathstar.another.galaxy/184 -L -H "Host: another.visitor.stay.a.while.st GET http://deathstar.another.galaxy/184 HTTP/1.1 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Host: another.visitor.stay.a.while.stay.foreeeeeever GET http://yet.another.host/184 HTTP/1.1 Host: yet.another.host -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test185 b/tests/data/test185 index 93542aa21..01a66f6db 100644 --- a/tests/data/test185 +++ b/tests/data/test185 @@ -60,13 +60,11 @@ http://deathstar.another.galaxy/185 -L -H "Host: another.visitor.stay.a.while.st GET http://deathstar.another.galaxy/185 HTTP/1.1 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Host: another.visitor.stay.a.while.stay.foreeeeeever GET http://deathstar.another.galaxy/go/west/185 HTTP/1.1 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Host: another.visitor.stay.a.while.stay.foreeeeeever diff --git a/tests/data/test208 b/tests/data/test208 index 3c8028e1f..a7a99b900 100644 --- a/tests/data/test208 +++ b/tests/data/test208 @@ -56,7 +56,6 @@ the PUT ftp://daniel:mysecret@host.com/we/want/208 HTTP/1.1 Authorization: Basic ZGFuaWVsOm15c2VjcmV0 Host: host.com:21 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 78 diff --git a/tests/data/test233 b/tests/data/test233 index 8e5f8b897..d165da952 100644 --- a/tests/data/test233 +++ b/tests/data/test233 @@ -80,14 +80,12 @@ GET http://first.host.it.is/we/want/that/page/233 HTTP/1.1 Proxy-Authorization: Basic dGVzdGluZzp0aGlz Authorization: Basic aWFtOm15c2VsZg== Host: first.host.it.is -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive GET http://goto.second.host.now/2330002 HTTP/1.1 Proxy-Authorization: Basic dGVzdGluZzp0aGlz Host: goto.second.host.now -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test234 b/tests/data/test234 index 8ea79aef1..1f4f35d3c 100644 --- a/tests/data/test234 +++ b/tests/data/test234 @@ -81,7 +81,6 @@ GET http://first.host.it.is/we/want/that/page/234 HTTP/1.1 Proxy-Authorization: Basic dGVzdGluZzp0aGlz Authorization: Basic aWFtOm15c2VsZg== Host: first.host.it.is -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive @@ -89,7 +88,6 @@ GET http://goto.second.host.now/2340002 HTTP/1.1 Proxy-Authorization: Basic dGVzdGluZzp0aGlz Authorization: Basic aWFtOm15c2VsZg== Host: goto.second.host.now -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test239 b/tests/data/test239 index 1d0610b57..2674b8e3a 100644 --- a/tests/data/test239 +++ b/tests/data/test239 @@ -76,7 +76,6 @@ POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -86,7 +85,6 @@ POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 6 diff --git a/tests/data/test243 b/tests/data/test243 index 3c5a7a213..f24fd7717 100644 --- a/tests/data/test243 +++ b/tests/data/test243 @@ -96,7 +96,6 @@ s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQ POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 6 @@ -106,7 +105,6 @@ postitPOST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -116,7 +114,6 @@ POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 6 diff --git a/tests/data/test256 b/tests/data/test256 index fb28485c1..d82f17414 100644 --- a/tests/data/test256 +++ b/tests/data/test256 @@ -50,7 +50,6 @@ GET http://%HOSTIP:%HTTPPORT/want/256 HTTP/1.1 Proxy-Authorization: Basic ZGFuaWVsOnN0ZW5iZXJn Range: bytes=78- Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test257 b/tests/data/test257 index c8a11a0ee..c211c2f47 100644 --- a/tests/data/test257 +++ b/tests/data/test257 @@ -94,7 +94,6 @@ GET http://supersite.com/want/257 HTTP/1.1 Authorization: Basic dXNlcjE6cGFzc3dkMQ== User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: supersite.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive @@ -102,14 +101,12 @@ GET http://anotherone.com/2570002 HTTP/1.1 Authorization: Basic dXNlcjI6cGFzc3dkMg== User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: anotherone.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive GET http://athird.com/2570003 HTTP/1.1 User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: athird.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test258 b/tests/data/test258 index 50f35e406..0d95dec0a 100644 --- a/tests/data/test258 +++ b/tests/data/test258 @@ -81,7 +81,6 @@ bar POST http://remotehost:54321/we/want/258 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: remotehost:54321 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 409 @@ -108,7 +107,6 @@ POST http://remotehost:54321/we/want/258 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 Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/258", response="2501654ca391f0b5c8c12a1da77e34cd" Host: remotehost:54321 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 409 diff --git a/tests/data/test259 b/tests/data/test259 index 1227d5272..b9d8ef12b 100644 --- a/tests/data/test259 +++ b/tests/data/test259 @@ -77,7 +77,6 @@ bar POST http://remotehost:54321/we/want/259 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: remotehost:54321 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 409 @@ -105,7 +104,6 @@ POST http://remotehost:54321/we/want/259 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 Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/259", response="b479994d13e60f3aa192a67c5892ddc5" Host: remotehost:54321 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 409 diff --git a/tests/data/test262 b/tests/data/test262 index 4c28f22d7..14fb02a25 100644 Binary files a/tests/data/test262 and b/tests/data/test262 differ diff --git a/tests/data/test263 b/tests/data/test263 index b08585166..5088141f5 100644 --- a/tests/data/test263 +++ b/tests/data/test263 @@ -46,7 +46,6 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address GET http://veryveryremotesite.com/263 HTTP/1.1 Host: veryveryremotesite.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test264 b/tests/data/test264 index 9648f05f8..3cfb4d88d 100644 --- a/tests/data/test264 +++ b/tests/data/test264 @@ -41,7 +41,6 @@ http://we.want.that.site.com/264 -x http://f%61ke:user@%HOSTIP:%HTTPPORT GET http://we.want.that.site.com/264 HTTP/1.1 Proxy-Authorization: Basic ZmFrZTp1c2Vy Host: we.want.that.site.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test278 b/tests/data/test278 index ceb8ba71d..6c57822b7 100644 --- a/tests/data/test278 +++ b/tests/data/test278 @@ -41,7 +41,6 @@ http://we.want.that.site.com/278 -x http://f%61ke:@%HOSTIP:%HTTPPORT GET http://we.want.that.site.com/278 HTTP/1.1 Proxy-Authorization: Basic ZmFrZTo= Host: we.want.that.site.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test279 b/tests/data/test279 index f52941cd4..5a1938cb3 100644 --- a/tests/data/test279 +++ b/tests/data/test279 @@ -42,7 +42,6 @@ http://we.want.that.site.com/279 -x http://f%61ke@%HOSTIP:%HTTPPORT GET http://we.want.that.site.com/279 HTTP/1.1 Proxy-Authorization: Basic ZmFrZTo= Host: we.want.that.site.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test35 b/tests/data/test35 index 85733a456..14fb02a25 100644 Binary files a/tests/data/test35 and b/tests/data/test35 differ diff --git a/tests/data/test43 b/tests/data/test43 index 7aef4ed74..e5535bb3a 100644 --- a/tests/data/test43 +++ b/tests/data/test43 @@ -66,13 +66,11 @@ http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT GET http://%HOSTIP:%HTTPPORT/want/43 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive GET http://%HOSTIP:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test5 b/tests/data/test5 index 3f3bb4d9d..7a0ebd730 100644 --- a/tests/data/test5 +++ b/tests/data/test5 @@ -42,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/5 -x %HOSTIP:%HTTPPORT GET http://%HOSTIP:%HTTPPORT/we/want/that/page/5 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test523 b/tests/data/test523 index ff582bdeb..c671ad1be 100644 --- a/tests/data/test523 +++ b/tests/data/test523 @@ -53,7 +53,6 @@ http://www.haxx.se:999/523 http://%HOSTIP:%HTTPPORT GET http://www.haxx.se:19999/523 HTTP/1.1 Authorization: Basic eHh4Onl5eQ== Host: www.haxx.se:19999 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test540 b/tests/data/test540 index 98cf0fa87..e9fc07a37 100644 --- a/tests/data/test540 +++ b/tests/data/test540 @@ -75,21 +75,18 @@ http://test.remote.server.com/path/540 http://%HOSTIP:%HTTPPORT silly:person cus GET http://test.remote.server.com/path/540 HTTP/1.1 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Host: custom.set.host.name GET http://test.remote.server.com/path/540 HTTP/1.1 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261" -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Host: custom.set.host.name GET http://test.remote.server.com/path/540 HTTP/1.1 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261" -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Host: custom.set.host.name diff --git a/tests/data/test545 b/tests/data/test545 index 66ebb6119..14fb02a25 100644 Binary files a/tests/data/test545 and b/tests/data/test545 differ diff --git a/tests/data/test547 b/tests/data/test547 index b43efc94d..954d59845 100644 --- a/tests/data/test547 +++ b/tests/data/test547 @@ -99,7 +99,6 @@ s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQ POST http://test.remote.server.com/path/547 HTTP/1.1 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 @@ -110,7 +109,6 @@ POST http://test.remote.server.com/path/547 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -120,7 +118,6 @@ POST http://test.remote.server.com/path/547 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 diff --git a/tests/data/test548 b/tests/data/test548 index 267adeb5e..7dcae4c39 100644 --- a/tests/data/test548 +++ b/tests/data/test548 @@ -99,7 +99,6 @@ s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQ POST http://test.remote.server.com/path/548 HTTP/1.1 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 @@ -110,7 +109,6 @@ POST http://test.remote.server.com/path/548 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -120,7 +118,6 @@ POST http://test.remote.server.com/path/548 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 diff --git a/tests/data/test549 b/tests/data/test549 index 654bcea26..e83f08af4 100644 --- a/tests/data/test549 +++ b/tests/data/test549 @@ -54,7 +54,6 @@ ftp://www.haxx.se/moo/549 http://%HOSTIP:%HTTPPORT GET ftp://www.haxx.se/moo/549;type=i HTTP/1.1 Host: www.haxx.se:21 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test550 b/tests/data/test550 index 16002ba88..c7a11eb90 100644 --- a/tests/data/test550 +++ b/tests/data/test550 @@ -54,7 +54,6 @@ ftp://www.haxx.se/moo/550 http://%HOSTIP:%HTTPPORT ascii GET ftp://www.haxx.se/moo/550;type=a HTTP/1.1 Host: www.haxx.se:21 -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test551 b/tests/data/test551 index 9319a349c..48e84489f 100644 --- a/tests/data/test551 +++ b/tests/data/test551 @@ -83,7 +83,6 @@ s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQ POST http://test.remote.server.com/path/551 HTTP/1.1 Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 @@ -93,7 +92,6 @@ this is the blurb we want to upload POST http://test.remote.server.com/path/551 HTTP/1.1 Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/551", response="3325240726fbdaf1e61f3a0dd40b930c" Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 diff --git a/tests/data/test552 b/tests/data/test552 index f971be7de..14fb02a25 100644 Binary files a/tests/data/test552 and b/tests/data/test552 differ diff --git a/tests/data/test555 b/tests/data/test555 index d63197ae9..ecac7500e 100644 --- a/tests/data/test555 +++ b/tests/data/test555 @@ -104,7 +104,6 @@ s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQ POST http://test.remote.server.com/path/555 HTTP/1.1 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 @@ -115,7 +114,6 @@ POST http://test.remote.server.com/path/555 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -125,7 +123,6 @@ POST http://test.remote.server.com/path/555 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Host: test.remote.server.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 diff --git a/tests/data/test63 b/tests/data/test63 index 667fc104b..66ed1d86b 100644 --- a/tests/data/test63 +++ b/tests/data/test63 @@ -44,7 +44,6 @@ http://we.want.that.site.com/63 GET http://we.want.that.site.com/63 HTTP/1.1 Proxy-Authorization: Basic ZmFrZTp1c2Vy Host: we.want.that.site.com -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test79 b/tests/data/test79 index 49299379c..b2566e229 100644 --- a/tests/data/test79 +++ b/tests/data/test79 @@ -47,7 +47,6 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test81 b/tests/data/test81 index f66c354c8..9a12cc1a7 100644 --- a/tests/data/test81 +++ b/tests/data/test81 @@ -82,7 +82,6 @@ GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= 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: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive @@ -90,7 +89,6 @@ GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA 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: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test82 b/tests/data/test82 index b0eb62956..9e800bb73 100644 --- a/tests/data/test82 +++ b/tests/data/test82 @@ -48,7 +48,6 @@ GET http://%HOSTIP:%HTTPPORT/82 HTTP/1.1 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: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test84 b/tests/data/test84 index 44388d73f..4dbf16432 100644 --- a/tests/data/test84 +++ b/tests/data/test84 @@ -46,7 +46,6 @@ GET http://%HOSTIP:%HTTPPORT/we/want/that/page/84 HTTP/1.1 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: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test85 b/tests/data/test85 index 043ef7dab..a5d1a3bca 100644 --- a/tests/data/test85 +++ b/tests/data/test85 @@ -50,7 +50,6 @@ Proxy-Authorization: Basic dGVzdGluZzp0aGlz 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: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test93 b/tests/data/test93 index b41841a03..138724835 100644 --- a/tests/data/test93 +++ b/tests/data/test93 @@ -42,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/93 -x %HOSTIP:%HTTPPORT GET http://%HOSTIP:%HTTPPORT/93 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive -- cgit v1.2.1