diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | RELEASE-NOTES | 1 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rwxr-xr-x | lib/mk-ca-bundle.pl | 2 | ||||
| -rw-r--r-- | lib/multi.c | 12 |
5 files changed, 25 insertions, 2 deletions
@@ -6,6 +6,11 @@ Changelog +Daniel Stenberg (23 Aug 2008) +- Constantine Sapuntzakis fixed a bug when doing proxy CONNECT with the multi + interface, and the proxy would send Connection: close during the + authentication phase. http://curl.haxx.se/bug/view.cgi?id=2069047 + Daniel Fandrich (22 Aug 2008) - Fixed a problem when --dump-header - was given with more than one URL, which caused an error when the second header was dumped due to stdout diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 1d8f90ce9..d082085c3 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -57,6 +57,7 @@ This release includes the following bugfixes: o memory leak in libcurl on Windows built with OpenSSL o improved curl_m*printf() integral data type size and signedness handling o error when --dump-header - used with more than one URL + o proxy closing connect during CONNECT with auth with the multi interface This release includes the following known bugs: diff --git a/configure.ac b/configure.ac index 2959b68c8..0e29b9e3e 100644 --- a/configure.ac +++ b/configure.ac @@ -2006,6 +2006,13 @@ CURL_CONFIGURE_LONG AC_CHECK_SIZEOF(time_t) AC_CHECK_SIZEOF(off_t) +dnl now check if curl_off_t is larger than off_t + +if test $ac_cv_sizeof_off_t -ge $ac_cv_sizeof_curl_off_t; then + AC_MSG_WARN([curl_off_t was detected to be larger than off_t.]) +fi + + AC_CHECK_TYPE(long long, [AC_DEFINE(HAVE_LONGLONG, 1, [Define to 1 if the compiler supports the 'long long' data type.])] diff --git a/lib/mk-ca-bundle.pl b/lib/mk-ca-bundle.pl index 279dd447e..4d41af9d3 100755 --- a/lib/mk-ca-bundle.pl +++ b/lib/mk-ca-bundle.pl @@ -163,7 +163,7 @@ while (<TXT>) { . MIME::Base64::encode($data) . "-----END CERTIFICATE-----\n"; open(CRT, ">>$crt") or die "Couldn't open $crt: $!"; - print CRT "\n$caname\n"; + print CRT "\n\"$caname\"\n"; print CRT ("=" x length($caname) . "\n"); if (!$opt_t) { print CRT $pem; diff --git a/lib/multi.c b/lib/multi.c index a2a4eb50b..f49d42699 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -1009,7 +1009,17 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, /* this is HTTP-specific, but sending CONNECT to a proxy is HTTP... */ easy->result = Curl_http_connect(easy->easy_conn, &protocol_connect); - if(CURLE_OK == easy->result) { + if(easy->easy_conn->bits.proxy_connect_closed) { + /* reset the error buffer */ + if(easy->easy_handle->set.errorbuffer) + easy->easy_handle->set.errorbuffer[0] = '\0'; + easy->easy_handle->state.errorbuf = FALSE; + + easy->result = CURLE_OK; + result = CURLM_CALL_MULTI_PERFORM; + multistate(easy, CURLM_STATE_CONNECT); + } + else if (CURLE_OK == easy->result) { if(!easy->easy_conn->bits.tunnel_connecting) multistate(easy, CURLM_STATE_WAITCONNECT); } |