From STABLE-BRANCH-1-4
authorDavid Shaw <dshaw@jabberwocky.com>
Sat, 10 Mar 2007 04:07:20 +0000 (04:07 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Sat, 10 Mar 2007 04:07:20 +0000 (04:07 +0000)
* gpgkeys_ldap.c (send_key): Missing a free().

* curl-shim.c (curl_easy_perform): Some debugging items that may be
handy.

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

index 3511889..e50826e 100644 (file)
@@ -1,3 +1,12 @@
+2007-03-09  David Shaw  <dshaw@jabberwocky.com>
+
+       From STABLE-BRANCH-1-4
+
+       * gpgkeys_ldap.c (send_key): Missing a free().
+
+       * curl-shim.c (curl_easy_perform): Some debugging items that may
+       be handy.
+
 2006-12-03  David Shaw  <dshaw@jabberwocky.com>
 
        * gpgkeys_hkp.c (search_key): HKP keyservers like the 0x to be
index 406e26e..6c35c51 100644 (file)
@@ -178,7 +178,14 @@ curl_easy_perform(CURL *curl)
     proxy=getenv(HTTP_PROXY_ENV);
 
   if(curl->flags.verbose)
-    fprintf(curl->errors,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null");
+    {
+      fprintf(curl->errors,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null");
+      fprintf(curl->errors,"* HTTP URL is \"%s\"\n",curl->url);
+      fprintf(curl->errors,"* HTTP auth is \"%s\"\n",
+             curl->auth?curl->auth:"null");
+      fprintf(curl->errors,"* HTTP method is %s\n",
+             curl->flags.post?"POST":"GET");
+    }
 
   if(curl->flags.post)
     {
index df4279f..c409c34 100644 (file)
@@ -782,6 +782,7 @@ send_key(int *eof)
   free(modlist);
   free(addlist);
   free(dn);
+  free(key);
 
   if(ret!=0 && begin)
     fprintf(output,"KEY %s FAILED %d\n",keyid,ret);