* curl-shim.h, curl-shim.c (curl_easy_setopt, curl_easy_perform): Add
authorDavid Shaw <dshaw@jabberwocky.com>
Thu, 23 Jun 2005 04:44:20 +0000 (04:44 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Thu, 23 Jun 2005 04:44:20 +0000 (04:44 +0000)
CURLOPT_USERPWD option for HTTP auth.

keyserver/ChangeLog
keyserver/curl-shim.c
keyserver/curl-shim.h

index 0539dd3..ab689e4 100644 (file)
@@ -1,5 +1,8 @@
 2005-06-23  David Shaw  <dshaw@jabberwocky.com>
 
+       * curl-shim.h, curl-shim.c (curl_easy_setopt, curl_easy_perform):
+       Add CURLOPT_USERPWD option for HTTP auth.
+
        * gpgkeys_http.c (get_key), gpgkeys_oldhkp (send_key, get_key,
        search_key): No longer need to pass a proxyauth.
 
index 33619df..4828f52 100644 (file)
@@ -104,6 +104,9 @@ curl_easy_setopt(CURL *curl,CURLoption option,...)
     case CURLOPT_URL:
       curl->url=va_arg(ap,char *);
       break;
+    case CURLOPT_USERPWD:
+      curl->auth=va_arg(ap,char *);
+      break;
     case CURLOPT_WRITEFUNCTION:
       curl->writer=va_arg(ap,write_func);
       break;
@@ -142,7 +145,7 @@ curl_easy_perform(CURL *curl)
 
   if(curl->flags.post)
     {
-      rc=http_open(&curl->hd,HTTP_REQ_POST,curl->url,0,curl->proxy);
+      rc=http_open(&curl->hd,HTTP_REQ_POST,curl->url,curl->auth,0,curl->proxy);
       if(rc==0)
        {
          char content_len[50];
@@ -163,7 +166,7 @@ curl_easy_perform(CURL *curl)
     }
   else
     {
-      rc=http_open(&curl->hd,HTTP_REQ_GET,curl->url,0,curl->proxy);
+      rc=http_open(&curl->hd,HTTP_REQ_GET,curl->url,curl->auth,0,curl->proxy);
       if(rc==0)
        {
          rc=http_wait_response(&curl->hd,&curl->status);
index 36aa880..6c5bc43 100644 (file)
@@ -36,6 +36,7 @@ typedef enum
 typedef enum
   {
     CURLOPT_URL,
+    CURLOPT_USERPWD,
     CURLOPT_WRITEFUNCTION,
     CURLOPT_FILE,
     CURLOPT_ERRORBUFFER,
@@ -57,6 +58,7 @@ typedef size_t (*write_func)(char *buffer,size_t size,
 typedef struct
 {
   char *url;
+  char *auth;
   char *errorbuffer;
   char *proxy;
   write_func writer;