From f36accd016c079ae972b61234b8e8cf72f75f13a Mon Sep 17 00:00:00 2001
From: Darian Anthony Patrick <dap@darianpatrick.com>
Date: Wed, 22 Sep 2010 21:37:46 -0400
Subject: [PATCH 1/2] RT#61435 Remove extraneous use of port in URL

---
 lib/CPAN/Mini/Webserver.pm | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/CPAN/Mini/Webserver.pm b/lib/CPAN/Mini/Webserver.pm
index 940ceb1..253fde4 100644
--- a/lib/CPAN/Mini/Webserver.pm
+++ b/lib/CPAN/Mini/Webserver.pm
@@ -463,9 +463,7 @@ sub file_page {
     my $contents = $self->get_file_from_tarball( $distribution, $filename );
 
     my $parser = Pod::Simple::HTML->new;
-    my $port   = $self->port;
-    my $host   = $self->hostname;
-    $parser->perldoc_url_prefix("http://$host:$port/perldoc?");
+    $parser->perldoc_url_prefix('/perldoc?');
     $parser->index(0);
     $parser->no_whining(1);
     $parser->no_errata_section(1);
@@ -554,11 +552,9 @@ sub raw_page {
         $_ =~ s{<br>}{}g foreach @lines;
 
         # link module names to ourselves
-        my $port = $self->port;
-        my $host = $self->hostname;
         @lines = map {
             $_
-                =~ s{<span class="word">([^<]+?::[^<]+?)</span>}{<span class="word"><a href="http://$host:$port/perldoc?$1">$1</a></span>};
+                =~ s{<span class="word">([^<]+?::[^<]+?)</span>}{<span class="word"><a href="/perldoc?$1">$1</a></span>}g;
             $_;
         } @lines;
         $html = join '', @lines;
@@ -607,9 +603,7 @@ sub package_page {
     $postfix .= '.pm';
     my ($filename) = grep { $_ =~ /$postfix$/ }
         sort { length($a) <=> length($b) } @filenames;
-    my $port = $self->port;
-    my $host = $self->hostname;
-    my $url  = "http://$host:$port/~$pauseid/$distvname/$filename";
+    my $url  = "/~$pauseid/$distvname/$filename";
 
     $self->redirect($url);
 }

From 75dc6a551d96e1ce0beb124d6f53a7fc8f5e80ee Mon Sep 17 00:00:00 2001
From: Darian Anthony Patrick <dap@darianpatrick.com>
Date: Wed, 22 Sep 2010 22:35:40 -0400
Subject: [PATCH 2/2] RT#57109 Remove unneeded dep on Perl6::Say

---
 Makefile.PL | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile.PL b/Makefile.PL
index 1776c01..d08e127 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -26,7 +26,6 @@ WriteMakefile(
         'Parse::CPAN::Packages'    => '2.28',
         'Path::Class'              => '0',
         'Pod::Simple::HTML'        => '0',
-        'Perl6::Say'               => '0',
         'PPI'                      => '0',
         'PPI::HTML'                => '0',
         'Search::QueryParser'      => '0',