Skip to content

Fix for RT#57109 (pointless dep on Perl6::Say) #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for RT#57109 (pointless dep on Perl6::Say) #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f36accd
RT#61435 Remove extraneous use of port in URL
dap Sep 23, 2010
75dc6a5
RT#57109 Remove unneeded dep on Perl6::Say
dap Sep 23, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
12 changes: 3 additions & 9 deletions lib/CPAN/Mini/Webserver.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down