From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 20 Dec 2010 09:13:30 +0000 (-0500)
Subject: accept trailing slashes on http-proxy
X-Git-Tag: msva-perl_debian/0.8-1~1^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=376c2fcb9b0a2c439f8f865a3a4808187584681d;p=monkeysphere-validation-agent.git

accept trailing slashes on http-proxy
---

diff --git a/gpgkeys_hkpms b/gpgkeys_hkpms
index 9d50554..03a79f2 100755
--- a/gpgkeys_hkpms
+++ b/gpgkeys_hkpms
@@ -49,7 +49,7 @@ use warnings;
               $self->{actually_check} = 1;
             } elsif ($opt =~ /^http-proxy=(.*)/) {
               my $hp = $1;
-              if ($hp =~ /^(socks|http|https):\/\/($RE{net}{domain}|$RE{net}{IPv4}):([[:digit:]]+)$/) {
+              if ($hp =~ /^(socks|http|https):\/\/($RE{net}{domain}|$RE{net}{IPv4}):([[:digit:]]+)\/?$/) {
                 if ('socks' eq $1) {
                   if ( ! Module::Load::Conditional::check_install(module => 'LWP::Protocol::socks')) {
                     $self->{logger}->log('error', "Requesting a socks proxy for hkpms, but LWP::Protocol::socks is not installed.\nThis will likely fail.\n");