summaryrefslogtreecommitdiff
path: root/lib/http_proxy.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-11-03 10:17:26 +0000
committerSteve Holme <steve_holme@hotmail.com>2013-11-03 10:17:26 +0000
commit052f24c9b7016bcb5fe3a751efb944928e1fb138 (patch)
tree3637d58c934aeec6b7b6e599d70ab94e26d2681c /lib/http_proxy.c
parentbce03fe14452da555468616db52003ba05c0e288 (diff)
downloadcurl-052f24c9b7016bcb5fe3a751efb944928e1fb138.tar.gz
http: Post base64 decoding tidy up
Renamed copy_header_value() to Curl_copy_header_value() as this function is now non static. Simplified proxy flag in Curl_http_input_auth() when calling sub-functions. Removed unnecessary white space removal when using negotiate as it had been missed in commit cdccb422671aeb.
Diffstat (limited to 'lib/http_proxy.c')
-rw-r--r--lib/http_proxy.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index 97edc486e..bf3457f6a 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -453,11 +453,12 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
(checkprefix("Proxy-authenticate:", line_start) &&
(407 == k->httpcode))) {
- char *auth = copy_header_value(line_start);
+ bool proxy = (k->httpcode == 407) ? TRUE : FALSE;
+ char *auth = Curl_copy_header_value(line_start);
if(!auth)
return CURLE_OUT_OF_MEMORY;
- result = Curl_http_input_auth(conn, k->httpcode, auth);
+ result = Curl_http_input_auth(conn, proxy, auth);
Curl_safefree(auth);