[svn] GnuPG - r4325 - branches/STABLE-BRANCH-1-4/keyserver

[svn author dshaw]

Author: dshaw
Date: 2006-11-06 04:37:08 +0100 (Mon, 06 Nov 2006)
New Revision: 4325

Modified:
   branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
   branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c
Log:
* gpgkeys_hkp.c (curl_mrindex_writer): Revert previous change.
Key-not-found still has a HTML response.


Modified: branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2006-11-06 03:22:13 UTC (rev 4324)
+++ branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2006-11-06 03:37:08 UTC (rev 4325)
@@ -1,3 +1,8 @@
+2006-11-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_hkp.c (curl_mrindex_writer): Revert previous change.
+	Key-not-found still has a HTML response.
+
 2006-10-19  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_hkp.c (curl_mrindex_writer): Print a warning if we see

Modified: branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c	2006-11-06 03:22:13 UTC (rev 4324)
+++ branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c	2006-11-06 03:37:08 UTC (rev 4325)
@@ -1,5 +1,6 @@
 /* gpgkeys_hkp.c - talk to an HKP keyserver
- * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005
+ *               2006 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -68,10 +69,7 @@
 	 with it on this side of the pipe.  */
       const char *buf=ptr;
       if(buf[0]=='<')
-	{
-	  fprintf(console,"gpgkeys: unsupported response from keyserver\n");
-	  swallow=1;
-	}
+	swallow=1;
 
       checked=1;
     }