[svn] GnuPG - r4458 - trunk/common

[svn author dshaw]

Author: dshaw
Date: 2007-03-10 05:52:57 +0100 (Sat, 10 Mar 2007)
New Revision: 4458

Modified:
   trunk/common/ChangeLog
   trunk/common/http.c
Log:
>From STABLE-BRANCH-1-4

* http.c (do_parse_uri): Remove the hkp port 11371 detection.  We
implement hkp in the keyserver handler, and the support here makes it
appear like a bad hkp request actually succeeded.


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2007-03-10 04:07:20 UTC (rev 4457)
+++ trunk/common/ChangeLog	2007-03-10 04:52:57 UTC (rev 4458)
@@ -1,3 +1,11 @@
+2007-03-09  David Shaw  <dshaw at jabberwocky.com>
+
+	From STABLE-BRANCH-1-4
+
+	* http.c (do_parse_uri): Remove the hkp port 11371 detection.  We
+	implement hkp in the keyserver handler, and the support here makes
+	it appear like a bad hkp request actually succeeded.
+
 2007-01-31  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (t_common_ldadd): Add LIBINCONV and LIBINTL.

Modified: trunk/common/http.c
===================================================================
--- trunk/common/http.c	2007-03-10 04:07:20 UTC (rev 4457)
+++ trunk/common/http.c	2007-03-10 04:52:57 UTC (rev 4458)
@@ -584,8 +584,6 @@
           uri->use_tls = 1;
         }
 #endif
-      else if (!strcmp (uri->scheme, "hkp"))
-        uri->port = 11371;
       else
 	return gpg_error (GPG_ERR_INV_URI); /* Unsupported scheme */