curl/0003-curl-7.21.1-13b8fc4.patch

68 lines
2.3 KiB
Diff

CHANGES | 10 ++++++++++
lib/http_negotiate.c | 15 ++++++++++-----
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/CHANGES b/CHANGES
index 1e3a501..c28b005 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,16 @@
Changelog
+Daniel Stenberg (16 Aug 2010)
+- negotiation: Wrong proxy authorization
+
+ There's an error in http_negotiation.c where a mistake is using only
+ userpwd even for proxy requests. Ludek provided a patch, but I decided
+ to write the fix slightly different using his patch as inspiration.
+
+ Reported by: Ludek Finstrle
+ Bug: http://curl.haxx.se/bug/view.cgi?id=3046066
+
Kamil Dudka (15 Aug 2010)
- curl -T: ignore file size of special files
diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index ab1296e..80b0b50 100644
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -277,6 +277,7 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy)
&conn->data->state.negotiate;
char *encoded = NULL;
size_t len;
+ char *userp;
#ifdef HAVE_SPNEGO /* Handle SPNEGO */
if(checkprefix("Negotiate", neg_ctx->protocol)) {
@@ -330,12 +331,16 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy)
if(len == 0)
return CURLE_OUT_OF_MEMORY;
- conn->allocptr.userpwd =
- aprintf("%sAuthorization: %s %s\r\n", proxy ? "Proxy-" : "",
- neg_ctx->protocol, encoded);
+ userp = aprintf("%sAuthorization: %s %s\r\n", proxy ? "Proxy-" : "",
+ neg_ctx->protocol, encoded);
+
+ if(proxy)
+ conn->allocptr.proxyuserpwd = userp;
+ else
+ conn->allocptr.userpwd = userp;
free(encoded);
Curl_cleanup_negotiate (conn->data);
- return (conn->allocptr.userpwd == NULL) ? CURLE_OUT_OF_MEMORY : CURLE_OK;
+ return (userp == NULL) ? CURLE_OUT_OF_MEMORY : CURLE_OK;
}
static void cleanup(struct negotiatedata *neg_ctx)