aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-11-07 14:07:02 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-11-07 14:07:02 +0000
commitb5b3d9e5c7f88f6586d31a84028ff07fba658ee8 (patch)
tree6215d103459fc8023519afa23a7f17c01a38c3ac
parent6e682c2b0137684e89f3deab548269bde1acae2e (diff)
Olaf fixed a leftover problem with the CONNECT fix of his that would leave a
wrong error message in the error message buffer.
-rw-r--r--CHANGES4
-rw-r--r--lib/url.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index d078ccf32..70c50b897 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
Changelog
+Daniel (7 November 2006)
+- Olaf fixed a leftover problem with the CONNECT fix of his that would leave a
+ wrong error message in the error message buffer.
+
Daniel (3 November 2006)
- Olaf Stueben provided a patch that I edited slightly. It fixes the notorious
KNOWN_BUGS #25, which happens when a proxy closes the connection when
diff --git a/lib/url.c b/lib/url.c
index 2791c718c..c5ce746c0 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3978,8 +3978,13 @@ static CURLcode SetupConnection(struct connectdata *conn,
/* if the connection was closed by the server while exchanging
authentication informations, retry with the new set
authentication information */
- if(conn->bits.proxy_connect_closed)
+ if(conn->bits.proxy_connect_closed) {
+ /* reset the error buffer */
+ if (data->set.errorbuffer)
+ data->set.errorbuffer[0] = '\0';
+ data->state.errorbuf = FALSE;
continue;
+ }
if(CURLE_OK != result)
return result;