From 40e8b4e5277c7ad726b50ec904fa573b656184b3 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg <daniel@haxx.se> Date: Wed, 19 Nov 2008 22:00:14 +0000 Subject: [PATCH] - 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. --- CHANGES | 8 ++++++++ RELEASE-NOTES | 3 ++- lib/http.c | 7 ------- 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 - 54 files changed, 10 insertions(+), 87 deletions(-) diff --git a/CHANGES b/CHANGES index 8cff198884..5f2c2d1400 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,14 @@ Changelog Daniel Stenberg (19 Nov 2008) +- 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. + +- Josef Wolf's extension that allows a $TESTDIR/gdbinit$testnum file that when + you use runtests.pl -g, will be sourced by gdb to allow additional fancy or + whatever you see fit + - Christian Krause reported and fixed a memory leak that would occur with HTTP GSS/kerberos authentication (http://curl.haxx.se/bug/view.cgi?id=2284386) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 5648dac1d8..a33b3c9e71 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -20,6 +20,7 @@ This release includes the following bugfixes: o re-use of connections with the multi interface when multiple handles used the same server o memory leak with HTTP GSS/kerberos authentication + o removed the default use of "Pragma: no-cache" This release includes the following known bugs: @@ -33,6 +34,6 @@ This release would not have looked like this without help, code, reports and advice from friends like these: Yang Tse, Daniel Fandrich, Jim Meyering, Christian Krause, Andreas Wurf, - Markus Koetter + Markus Koetter, Josef Wolf Thanks! (and sorry if I forgot to mention someone) diff --git a/lib/http.c b/lib/http.c index 1b20c37e7a..70bf61e391 100644 --- a/lib/http.c +++ b/lib/http.c @@ -2290,11 +2290,6 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) } - http->p_pragma = - (!checkheaders(data, "Pragma:") && - (conn->bits.httpproxy && !conn->bits.tunnel_proxy) )? - "Pragma: no-cache\r\n":NULL; - http->p_accept = checkheaders(data, "Accept:")?NULL:"Accept: */*\r\n"; if(( (HTTPREQ_POST == httpreq) || @@ -2440,7 +2435,6 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) "%s" /* range */ "%s" /* user agent */ "%s" /* host */ - "%s" /* pragma */ "%s" /* accept */ "%s" /* accept-encoding */ "%s" /* referer */ @@ -2460,7 +2454,6 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) *data->set.str[STRING_USERAGENT] && conn->allocptr.uagent)? conn->allocptr.uagent:"", (conn->allocptr.host?conn->allocptr.host:""), /* Host: host */ - http->p_pragma?http->p_pragma:"", http->p_accept?http->p_accept:"", (data->set.str[STRING_ENCODING] && *data->set.str[STRING_ENCODING] && diff --git a/tests/data/test1001 b/tests/data/test1001 index 8d1a2d4227..9a87d6e8b8 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 bf9bbed914..04c18f91a5 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 a710af25bb..c475740513 100644 --- a/tests/data/test1034 +++ b/tests/data/test1034 @@ -54,7 +54,6 @@ http://invalid-utf8- <protocol> 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 7f104c7b60..20b434c341 100644 --- a/tests/data/test1035 +++ b/tests/data/test1035 @@ -51,7 +51,6 @@ http://too-long-IDN-name-c <protocol> 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 7624a30f4b..a3c90245a7 100644 --- a/tests/data/test1077 +++ b/tests/data/test1077 @@ -62,13 +62,11 @@ FTP over HTTP proxy with downgrade to HTTP 1.0 <protocol> 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 d926a1fb19..98539bebd0 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 892a9bf87b..4f793d9a24 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 2893696a36..ddfe1e9dc6 100644 --- a/tests/data/test165 +++ b/tests/data/test165 @@ -50,7 +50,6 @@ http://www. <protocol> 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 ef83688cb0..2ce968db27 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 d3a12b8ae3..e72e931496 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 9a4b954e43..0ad2f8808d 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 4db486722d..a2c221792c 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 de02d79b58..870d236f23 100644 --- a/tests/data/test171 +++ b/tests/data/test171 @@ -43,7 +43,6 @@ HTTP, get cookie with dot prefixed full domain <protocol> 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 779caf3775..f8f7811a7e 100644 --- a/tests/data/test179 +++ b/tests/data/test179 @@ -48,7 +48,6 @@ supertrooper.fake FALSE /c FALSE 2139150993 moo2 indeed <protocol> 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 e9db2ba0cc..f34dc0c987 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 0727750f73..e42a393eac 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 <protocol> 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 93542aa211..01a66f6dba 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 <protocol> 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 3c8028e1fc..a7a99b9008 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 8e5f8b8979..d165da952f 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 8ea79aef10..1f4f35d3c0 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 1d0610b57c..2674b8e3a8 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 3c5a7a2133..f24fd77175 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 fb28485c1a..d82f17414c 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 c8a11a0ee8..c211c2f470 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 50f35e406b..0d95dec0a1 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 1227d52724..b9d8ef12b0 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 4c28f22d7c4195d92b757c8f1600b451dfe39f4b..14fb02a255f4cfa8300c9b73209116184f2fbf4f 100644 GIT binary patch literal 37 scmZ?D%u6h)R7lIrNmbA&E=kNwNi0fH$jmD!EzwlSO)N>yNG;|90RKh}M*si- literal 1137 zcmZWpS&yPh6!y82{tp!=^U@iIrNtQuW5QKhnHKF<#MXzK09CRGRRqcffBjT}(|wbh zu+`!4Ep^VpV7OwTU*Qoj5^|vYcEt6CmZ%zmnd`nb7dW+CU`U^D45>~20=~dCF3-5^ zRSCktC~=Y190d8yhXKbO^nZ10Ty;la{k+<2#y_v~)QX(cyx7)oZkmO)dtYVC<e!Z{ z+f??%)ND&Tqr|M8iFL6jmb^^gv}Kcz7M^LoY*eoXDEDgqk-UFj$n*C_7Lt7yCc}KU zWf=!`b|St}&iiSW`&;iQ2+&p#SU1}$l%OHtA|_T1mZ^35FT=`P#rqqL?9{$G6I+>Y zSLvdbZ%g-0b%dI+ZH|x6=}z@7XsoPvTaE1Boq;|5tpPOkZd}16P&IkK)wqgl7UW3w zCp20_=F6KpJO#OzqG@&xQX1{l>p4_69B^?C$SMoS8}nw_W$)5Rfc4RMNYPZOIOr5@ zwG&<|biaKTmNagkpN=_>3Ld*w!G-?fg%Z0z0&Nw-7>CEUmXh*afvPOS<x2-le1>)C z#;0#k9>N7Z^EZkNmA>8|>O5!axE;{eR)?ZXdR0?s>EIu62h4pQaVSa-2}T^}gug-M z3I0A2!N74;U6DU<EZ2{8*i{u-)p{uW(R&*92Wo%#v)ch?7~+EURz8VvrNf}+WF0W3 zgki#Zb4(%@>u}J72o707i4MbzR$Rs3EVnMW8HTS+idmj@!1IZax))=gYvb+5j}8Da z&N6!6p8K}&)xBkb=;d*i2-3Ef!)C#oxivllF=GY);O`O|#LxNQh%pfp0xt=RVUQ5N ztl<rp6jv}IP>8@KfQHnjLnEYl?i17k>XP(zwp_dRtNv9Wy)IX-qz+V0^pVFO?^+s_ z9xjtZ4VxMB4-A)(#ki>vjQt7*7!%m7V#>O};G@ZNg$Y(B#R&Yn;qrTC#BJ)|ABCGX yZWJYDG^E)G2rEJX6mmq*Jb)Rkm=6D^^Wk1R9X?8r58#2reZm;h2e<V3m-z!0fMPEI diff --git a/tests/data/test263 b/tests/data/test263 index b085851662..5088141f50 100644 --- a/tests/data/test263 +++ b/tests/data/test263 @@ -46,7 +46,6 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address <protocol> 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 9648f05f88..3cfb4d88d0 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 ceb8ba71d4..6c57822b7b 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 f52941cd4a..5a1938cb34 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 85733a456c2ce467ebd7526553eb01ddf098efc8..14fb02a255f4cfa8300c9b73209116184f2fbf4f 100644 GIT binary patch literal 37 scmZ?D%u6h)R7lIrNmbA&E=kNwNi0fH$jmD!EzwlSO)N>yNG;|90RKh}M*si- literal 810 zcmb7DQES^U5Z?1a{=<>cmoP`knlfrMv(mvj)-_>u_c&1Ob1dpeMpEng-|u9%%|f3B z#^&VjzPs<clMLiTp*&?EwW%zB?y2vrD}4r6dA=E5xLM!kkR+uFD%onITn|zlfKoi? zI%=DqIU;b(7t8q)KQ0!y{(-*pMPog|R~0D5yngtAi*vlOkBnF@aJfoX=P6^q{mkK( z+#|UZV}pqw0#T`Z0@yZce1Mx6D@pNO8Q$Y%qsefJE(v5Y1l-ZckU<?n%V{qmN~88H zK1v-_;wTRzFLpZANc%07C6#z{cMT}Tn1Hgd`@J&dNSO+8a>XWn-=rszYqS29i;hI6 zOc1AMc;p>^Y3xo!VW(&F@D#Y8S29`YhA`InJUvEDGstW0-=X$zn^fkgPu%u_)r&~R z;>C*%Y|n3Uy6Q)LstV*V)HJw^wPI!>gHvDIFa^m2U~F_RINfIO=Z<|#E_Up1I-f-w z$8*^_8*E{l4C1EXzsjQ<aS0}HWqnBTjZG7{C<<!%*G$YNaA{45^SdUq3w4UCPlvO- uZ+UN2+cvsTL0co9lCJBL%DR2>;2JW8<w;Fo^8Z#HBuMe9dl=GqJ^lh;3<9nI diff --git a/tests/data/test43 b/tests/data/test43 index 7aef4ed748..e5535bb3af 100644 --- a/tests/data/test43 +++ b/tests/data/test43 @@ -66,13 +66,11 @@ http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT <protocol> 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 3f3bb4d9d7..7a0ebd7305 100644 --- a/tests/data/test5 +++ b/tests/data/test5 @@ -42,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/5 -x %HOSTIP:%HTTPPORT <protocol> 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 ff582bdeb4..c671ad1beb 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 98cf0fa872..e9fc07a377 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 </strip> <protocol> 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 66ebb61199e9df182f53441d97a597468ddbbab5..14fb02a255f4cfa8300c9b73209116184f2fbf4f 100644 GIT binary patch literal 37 scmZ?D%u6h)R7lIrNmbA&E=kNwNi0fH$jmD!EzwlSO)N>yNG;|90RKh}M*si- literal 748 zcmZWn-*4J55Z<#T{)ZE&s)UvrI(TU0MXKmFs<I|3q0(M9ndBhW5<7~Iru_G{lTse~ zc=mU9-;Wc7mNIEEVk0(!H8wBU1Xkt9M1ysCjF`wJNvKSY--m>+G>q6XO%p!7n!@#D z0`UXb)@G%#$nGRz2x)Qn3X>anG%pS@oxpS!&Tc}7{q;L#{f-d)=D>Cf`A+^vwlJDd zQ?Nq4ry_)JjKvR3aKGQt;O~4K%|)p^u&0@Ig#+}nB32O94t^>}K*p4yEVP9rSHQs{ zC~XO44rT|J*`X;fneecPm1;Ym&0T+AG7wr;&K|EBl6alMR%zKBp;c4>R$I(-%t0T@ z(hXL64~xyyDo)aWi#Yk?8-CvZSlzANAl^>`k(sKJI`655oL?**>^=!E{E{SoN_kJ= z11I=NWf#*kHfnc-E*QBZY=8>v4242k*dl5e+QQI~374nCdV8o*b;SN|oH4=e-WeEP zjlEC(yQmvOCi50_Dm?`_1wCL(V=07BL<j6P%dmD|V?G{yig12?eoK$FyA4^_rOG5J zqxoylwr#L8O%=EVP-pJO@&OyLv{3eoPt4!Q$?r~WXS&p9-yb(C*dEE9D?bYm{6jTA GANU*UZ|l4O diff --git a/tests/data/test547 b/tests/data/test547 index b43efc94dd..954d59845b 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 267adeb5ee..7dcae4c39a 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 654bcea26f..e83f08af46 100644 --- a/tests/data/test549 +++ b/tests/data/test549 @@ -54,7 +54,6 @@ ftp://www.haxx.se/moo/549 http://%HOSTIP:%HTTPPORT <protocol> 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 16002ba884..c7a11eb906 100644 --- a/tests/data/test550 +++ b/tests/data/test550 @@ -54,7 +54,6 @@ ftp://www.haxx.se/moo/550 http://%HOSTIP:%HTTPPORT ascii <protocol> 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 9319a349ca..48e84489f4 100644 --- a/tests/data/test551 +++ b/tests/data/test551 @@ -83,7 +83,6 @@ s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQ <protocol> 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 f971be7de696db6714292f100c52215eb4ec3d88..14fb02a255f4cfa8300c9b73209116184f2fbf4f 100644 GIT binary patch literal 37 scmZ?D%u6h)R7lIrNmbA&E=kNwNi0fH$jmD!EzwlSO)N>yNG;|90RKh}M*si- literal 143263 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 Wq%%2w)Mc{XyCW;y#8IVZ-hTiA9Upf9 diff --git a/tests/data/test555 b/tests/data/test555 index d63197ae9d..ecac7500ed 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 667fc104be..66ed1d86b9 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 49299379c0..b2566e229e 100644 --- a/tests/data/test79 +++ b/tests/data/test79 @@ -47,7 +47,6 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT <protocol> 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 f66c354c8b..9a12cc1a7e 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 b0eb629569..9e800bb73e 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 44388d73ff..4dbf16432b 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 043ef7dab8..a5d1a3bca0 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 b41841a038..1387248357 100644 --- a/tests/data/test93 +++ b/tests/data/test93 @@ -42,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/93 -x %HOSTIP:%HTTPPORT <protocol> GET http://%HOSTIP:%HTTPPORT/93 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -Pragma: no-cache Accept: */* Proxy-Connection: Keep-Alive -- GitLab