diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2006-07-04 12:01:59 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2006-07-04 12:01:59 +0000 |
| commit | 8bed45340a48585bbd91e508f1ac44f5ed5bf178 (patch) | |
| tree | c083b12a1e8132c2573af2f514ad6b67eda4806a | |
| parent | 55138753c63cb7a6d1191028df25b689b73baefa (diff) | |
Toshiyuki Maezawa fixed a problem where you couldn't override the
Proxy-Connection: header when using a proxy and not doing CONNECT.
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | RELEASE-NOTES | 3 | ||||
| -rw-r--r-- | lib/http.c | 4 |
3 files changed, 9 insertions, 2 deletions
@@ -6,6 +6,10 @@ Changelog +Daniel (4 July 2006) +- Toshiyuki Maezawa fixed a problem where you couldn't override the + Proxy-Connection: header when using a proxy and not doing CONNECT. + Daniel (24 June 2006) - Michael Wallner added curl_formget(), which allows an application to extract (serialise) a previously built formpost (as with curl_formadd()). diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 9412f0d0e..fa925c6be 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -18,6 +18,7 @@ This release includes the following changes: This release includes the following bugfixes: + o couldn't override the Proxy-Connection: header for non-CONNECT requests o curl_multi_fdset() could wrongly return -1 as max_fd value Other curl-related news: @@ -32,6 +33,6 @@ New curl mirrors: This release would not have looked like this without help, code, reports and advice from friends like these: - Dan Fandrich, Peter Silva, Arve Knudsen, Michael Wallner + Dan Fandrich, Peter Silva, Arve Knudsen, Michael Wallner, Toshiyuki Maezawa Thanks! (and sorry if I forgot to mention someone) diff --git a/lib/http.c b/lib/http.c index b1995e61e..ac2a9cf3d 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1970,7 +1970,9 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) (data->set.encoding && *data->set.encoding && conn->allocptr.accept_encoding)? conn->allocptr.accept_encoding:"", (data->change.referer && conn->allocptr.ref)?conn->allocptr.ref:"" /* Referer: <data> */, - (conn->bits.httpproxy && !conn->bits.tunnel_proxy)? + (conn->bits.httpproxy && + !conn->bits.tunnel_proxy && + !checkheaders(data, "Proxy-Connection:"))? "Proxy-Connection: Keep-Alive\r\n":"", te ); |