Commit 8bed4534 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Toshiyuki Maezawa fixed a problem where you couldn't override the 

Proxy-Connection: header when using a proxy and not doing CONNECT.
parent 55138753

CHANGES

+4 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,10 @@ 




                                  Changelog

                                  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)

Daniel (24 June 2006)

- Michael Wallner added curl_formget(), which allows an application to extract

- Michael Wallner added curl_formget(), which allows an application to extract

  (serialise) a previously built formpost (as with curl_formadd()).

  (serialise) a previously built formpost (as with curl_formadd()).

RELEASE-NOTES

+2 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ This release includes the following changes: 




This release includes the following bugfixes:

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

 o curl_multi_fdset() could wrongly return -1 as max_fd value





Other curl-related news:

Other curl-related news:
@@ -32,6 +33,6 @@ New curl mirrors: 
This release would not have looked like this without help, code, reports and

This release would not have looked like this without help, code, reports and

advice from friends like these:

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)
 
        Thanks! (and sorry if I forgot to mention someone)

lib/http.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1970,7 +1970,9 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
                (data->set.encoding && *data->set.encoding && conn->allocptr.accept_encoding)?

                (data->set.encoding && *data->set.encoding && conn->allocptr.accept_encoding)?

                conn->allocptr.accept_encoding:"",

                conn->allocptr.accept_encoding:"",

                (data->change.referer && conn->allocptr.ref)?conn->allocptr.ref:"" /* Referer: <data> */,

                (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":"",

                  "Proxy-Connection: Keep-Alive\r\n":"",

                te

                te

                );

                );