[svn] GnuPG - r3848 - trunk/keyserver

[svn author dshaw]

Author: dshaw
Date: 2005-08-04 05:59:16 +0200 (Thu, 04 Aug 2005)
New Revision: 3848

Modified:
   trunk/keyserver/ChangeLog
   trunk/keyserver/curl-shim.h
   trunk/keyserver/gpgkeys_curl.c
   trunk/keyserver/gpgkeys_hkp.c
Log:
* gpgkeys_hkp.c (main), gpgkeys_curl.c (main), curl-shim.h: Show
version of curl (or curl-shim) when debug is set.


Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2005-08-01 17:03:50 UTC (rev 3847)
+++ trunk/keyserver/ChangeLog	2005-08-04 03:59:16 UTC (rev 3848)
@@ -1,3 +1,8 @@
+2005-08-03  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_hkp.c (main), gpgkeys_curl.c (main), curl-shim.h: Show
+	version of curl (or curl-shim) when debug is set.
+
 2005-07-20  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_curl.c (get_key, main): Don't try and be smart about

Modified: trunk/keyserver/curl-shim.h
===================================================================
--- trunk/keyserver/curl-shim.h	2005-08-01 17:03:50 UTC (rev 3847)
+++ trunk/keyserver/curl-shim.h	2005-08-04 03:59:16 UTC (rev 3848)
@@ -85,5 +85,6 @@
 void curl_easy_cleanup(CURL *curl);
 char *curl_escape(char *str,int len);
 void curl_free(char *ptr);
+#define curl_version() "GnuPG curl-shim "VERSION
 
 #endif /* !_CURL_SHIM_H_ */

Modified: trunk/keyserver/gpgkeys_curl.c
===================================================================
--- trunk/keyserver/gpgkeys_curl.c	2005-08-01 17:03:50 UTC (rev 3847)
+++ trunk/keyserver/gpgkeys_curl.c	2005-08-04 03:59:16 UTC (rev 3848)
@@ -260,6 +260,7 @@
 
   if(opt->debug)
     {
+      fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
       curl_easy_setopt(curl,CURLOPT_STDERR,console);
       curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
     }

Modified: trunk/keyserver/gpgkeys_hkp.c
===================================================================
--- trunk/keyserver/gpgkeys_hkp.c	2005-08-01 17:03:50 UTC (rev 3847)
+++ trunk/keyserver/gpgkeys_hkp.c	2005-08-04 03:59:16 UTC (rev 3848)
@@ -533,6 +533,7 @@
 
   if(opt->debug)
     {
+      fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
       curl_easy_setopt(curl,CURLOPT_STDERR,console);
       curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
     }