mirror of
https://github.com/curl/curl.git
synced 2025-09-14 16:12:43 +03:00
Added CURLOPT_HTTPDIGEST support
SOCKS5 fix as suggested by Jis in bugreport #741841.
This commit is contained in:
parent
e912f772e0
commit
9f69deec7d
10
lib/url.c
10
lib/url.c
|
@ -226,6 +226,8 @@ CURLcode Curl_close(struct SessionHandle *data)
|
||||||
if(data->info.contenttype)
|
if(data->info.contenttype)
|
||||||
free(data->info.contenttype);
|
free(data->info.contenttype);
|
||||||
|
|
||||||
|
Curl_digest_cleanup(data);
|
||||||
|
|
||||||
free(data);
|
free(data);
|
||||||
return CURLE_OK;
|
return CURLE_OK;
|
||||||
}
|
}
|
||||||
|
@ -838,6 +840,12 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
|
||||||
data->set.encoding = (char*)ALL_CONTENT_ENCODINGS;
|
data->set.encoding = (char*)ALL_CONTENT_ENCODINGS;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case CURLOPT_HTTPDIGEST:
|
||||||
|
/*
|
||||||
|
* Enable HTTP Digest Authentication
|
||||||
|
*/
|
||||||
|
data->set.httpdigest = va_arg(param, long);
|
||||||
|
break;
|
||||||
case CURLOPT_USERPWD:
|
case CURLOPT_USERPWD:
|
||||||
/*
|
/*
|
||||||
* user:password to use in the operation
|
* user:password to use in the operation
|
||||||
|
@ -1535,7 +1543,7 @@ static int handleSock5Proxy(
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((socksreq[0] != 5) || /* version */
|
if ((socksreq[0] != 1) || /* version */
|
||||||
(socksreq[1] != 0)) { /* status */
|
(socksreq[1] != 0)) { /* status */
|
||||||
failf(conn->data, "User was rejected by the SOCKS5 server (%d %d).",
|
failf(conn->data, "User was rejected by the SOCKS5 server (%d %d).",
|
||||||
socksreq[0], socksreq[1]);
|
socksreq[0], socksreq[1]);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user