gnupg/keyserver (ChangeLog curl-shim.c curl-shim.h)

[cvs user dshaw]

    Date: Thursday, June 23, 2005 @ 06:44:21
  Author: dshaw
    Path: /cvs/gnupg/gnupg/keyserver

Modified: ChangeLog curl-shim.c curl-shim.h

* curl-shim.h, curl-shim.c (curl_easy_setopt, curl_easy_perform): Add
CURLOPT_USERPWD option for HTTP auth.


-------------+
 ChangeLog   |    3 +++
 curl-shim.c |    7 +++++--
 curl-shim.h |    2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)


Index: gnupg/keyserver/ChangeLog
diff -u gnupg/keyserver/ChangeLog:1.134 gnupg/keyserver/ChangeLog:1.135
--- gnupg/keyserver/ChangeLog:1.134	Thu Jun 23 06:26:01 2005
+++ gnupg/keyserver/ChangeLog	Thu Jun 23 06:44:20 2005
@@ -1,5 +1,8 @@
 2005-06-23  David Shaw  <dshaw at 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: gnupg/keyserver/curl-shim.c
diff -u gnupg/keyserver/curl-shim.c:1.6 gnupg/keyserver/curl-shim.c:1.7
--- gnupg/keyserver/curl-shim.c:1.6	Tue May 31 10:39:15 2005
+++ gnupg/keyserver/curl-shim.c	Thu Jun 23 06:44:20 2005
@@ -104,6 +104,9 @@
     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 @@
 
   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 @@
     }
   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: gnupg/keyserver/curl-shim.h
diff -u gnupg/keyserver/curl-shim.h:1.5 gnupg/keyserver/curl-shim.h:1.6
--- gnupg/keyserver/curl-shim.h:1.5	Tue May 31 10:39:15 2005
+++ gnupg/keyserver/curl-shim.h	Thu Jun 23 06:44:20 2005
@@ -36,6 +36,7 @@
 typedef enum
   {
     CURLOPT_URL,
+    CURLOPT_USERPWD,
     CURLOPT_WRITEFUNCTION,
     CURLOPT_FILE,
     CURLOPT_ERRORBUFFER,
@@ -57,6 +58,7 @@
 typedef struct
 {
   char *url;
+  char *auth;
   char *errorbuffer;
   char *proxy;
   write_func writer;