[svn] GnuPG - r4428 - branches/STABLE-BRANCH-1-4/util

[svn author dshaw]

Author: dshaw
Date: 2007-02-11 04:10:12 +0100 (Sun, 11 Feb 2007)
New Revision: 4428

Modified:
   branches/STABLE-BRANCH-1-4/util/ChangeLog
   branches/STABLE-BRANCH-1-4/util/http.c
Log:
* 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: branches/STABLE-BRANCH-1-4/util/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/util/ChangeLog	2007-02-05 11:46:58 UTC (rev 4427)
+++ branches/STABLE-BRANCH-1-4/util/ChangeLog	2007-02-11 03:10:12 UTC (rev 4428)
@@ -1,3 +1,9 @@
+2007-02-10  David Shaw  <dshaw at jabberwocky.com>
+
+	* 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  David Shaw  <dshaw at jabberwocky.com>
 
 	* ttyio.c (do_get): Assume that anything read from the user

Modified: branches/STABLE-BRANCH-1-4/util/http.c
===================================================================
--- branches/STABLE-BRANCH-1-4/util/http.c	2007-02-05 11:46:58 UTC (rev 4427)
+++ branches/STABLE-BRANCH-1-4/util/http.c	2007-02-11 03:10:12 UTC (rev 4428)
@@ -321,8 +321,6 @@
 	uri->scheme = p;
 	if(strcmp(uri->scheme,"http")==0)
 	  uri->port = 80;
-	else if(strcmp(uri->scheme,"hkp")==0)
-	  uri->port = 11371;
 	else
 	  return G10ERR_INVALID_URI; /* Unsupported scheme */