Added CURLOPT_HTTPDIGEST support

SOCKS5 fix as suggested by Jis in bugreport #741841.

diff --git a/lib/url.c b/lib/url.c
index cc6b6474867e57f8c0329766a70d697bd45dc728..89f316530a8ce5fe92b17185ffea0bd0a1775e90 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -226,6 +226,8 @@ CURLcode Curl_close(struct SessionHandle *data)
   if(data->info.contenttype)
     free(data->info.contenttype);
 
+  Curl_digest_cleanup(data);
+
   free(data);
   return CURLE_OK;
 }
@@ -838,6 +840,12 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
       data->set.encoding = (char*)ALL_CONTENT_ENCODINGS;
     break;
 
+  case CURLOPT_HTTPDIGEST:
+    /*
+     * Enable HTTP Digest Authentication
+     */
+    data->set.httpdigest = va_arg(param, long);
+    break;
   case CURLOPT_USERPWD:
     /*
      * user:password to use in the operation
@@ -1535,7 +1543,7 @@ static int handleSock5Proxy(
       return 1;
     }
 
-    if ((socksreq[0] != 5) || /* version */
+    if ((socksreq[0] != 1) || /* version */
         (socksreq[1] != 0)) { /* status */
       failf(conn->data, "User was rejected by the SOCKS5 server (%d %d).",
             socksreq[0], socksreq[1]);