summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2007-03-10 05:52:57 +0100
committerDavid Shaw <dshaw@jabberwocky.com>2007-03-10 05:52:57 +0100
commit24feaa4f8a709a2450991ef553e9e843e4359348 (patch)
treee167aa208aa0134be540a78fab0945eae63cb8d3
parentFrom STABLE-BRANCH-1-4 (diff)
downloadgnupg2-24feaa4f8a709a2450991ef553e9e843e4359348.tar.xz
gnupg2-24feaa4f8a709a2450991ef553e9e843e4359348.zip
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.
-rw-r--r--common/ChangeLog8
-rw-r--r--common/http.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/common/ChangeLog b/common/ChangeLog
index aa221f1ee..6e2ce2b3b 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-09 David Shaw <dshaw@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@g10code.com>
* Makefile.am (t_common_ldadd): Add LIBINCONV and LIBINTL.
diff --git a/common/http.c b/common/http.c
index 6a015d1b3..15f00b9ae 100644
--- a/common/http.c
+++ b/common/http.c
@@ -584,8 +584,6 @@ do_parse_uri (parsed_uri_t uri, int only_local_part)
uri->use_tls = 1;
}
#endif
- else if (!strcmp (uri->scheme, "hkp"))
- uri->port = 11371;
else
return gpg_error (GPG_ERR_INV_URI); /* Unsupported scheme */