From docsboothjason@example.com Fri Aug 26 08:38:18 2005 Return-Path: <docsboothjason@example.com> Delivered-To: boothjason@example.com Received: (qmail 45568 invoked from network); 26 Aug 2005 08:38:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 26 Aug 2005 08:38:18 -0000 Received: (qmail 77734 invoked by uid 500); 26 Aug 2005 08:38:17 -0000 Delivered-To: boothjason@example.com Received: (qmail 77694 invoked by uid 500); 26 Aug 2005 08:38:16 -0000 Mailing-List: contact boothjason@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:boothjason@example.com> List-Help: <mailto:boothjason@example.com> List-Unsubscribe: <mailto:boothjason@example.com> List-Id: <docs-dev.perl.apache.org> Delivered-To: mailing list boothjason@example.com Received: (qmail 77478 invoked by uid 99); 26 Aug 2005 08:38:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Aug 2005 01:38:15 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO piccollo.p6m7g8.net) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Aug 2005 01:38:27 -0700 Received: from [83.161.120.155] (pcp09579105pcs.rtchrd01.md.comcast.net [83.161.120.155]) (authenticated bits=0) by piccollo.p6m7g8.net (8.13.4/8.13.4) with ESMTP id j7Q8c3qw027175 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO); Fri, 26 Aug 2005 04:38:05 -0400 (EDT) (envelope-from boothjason@example.com) Message-ID: <boothjason@example.com> Date: Fri, 26 Aug 2005 04:38:06 -0400 From: "Philip M. Gollucci" <boothjason@example.com> User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716) X-Accept-Language: en-us, en MIME-Version: 1.0 To: boothjason@example.com Subject: Style update part II Content-Type: multipart/mixed; boundary="------------010808070804010708090406" X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N --------------010808070804010708090406 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit The corresponding update for the docs tree my ( vs my( note, there are some cases of my ( $var that this changes to my( $var whats the opinion on those ? See attached. -- END ------------------------------------------------------------ What doesn't kill us can only make us stronger. Nothing is impossible. Philip M. Gollucci (boothjason@example.com) (646)582-0504 Consultant / http://p6m7g8.net/Resume/ Senior Developer / Liquidity Services, Inc. http://www.liquidityservicesinc.com http://www.liquidation.com http://www.uksurplus.com http://www.govliquidation.com http://www.gowholesale.com --------------010808070804010708090406 Content-Type: text/plain; name="style_docs.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="style_docs.diff" Index: lib/DocSet/Source/POD.pm =================================================================== --- lib/DocSet/Source/POD.pm (revision 219272) +++ lib/DocSet/Source/POD.pm (working copy) @@ -147,7 +147,7 @@ } sub src_filter { - my ($self) = @_; + my($self) = @_; $self->extract_pod; Index: lib/DocSet/Doc/POD2HTML.pm =================================================================== --- lib/DocSet/Doc/POD2HTML.pm (revision 219272) +++ lib/DocSet/Doc/POD2HTML.pm (working copy) @@ -102,31 +102,31 @@ use Fil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Basename; sub view_head1 { - my ($self, $head1) = @_; + my($self, $head1) = @_; return "<h1>" . $self->anchor($head1->title) . "</h1>\n\n" . $head1->content->present($self); } sub view_head2 { - my ($self, $head2) = @_; + my($self, $head2) = @_; return "<h2>" . $self->anchor($head2->title) . "</h2>\n\n" . $head2->content->present($self); } sub view_head3 { - my ($self, $head3) = @_; + my($self, $head3) = @_; return "<h3>" . $self->anchor($head3->title) . "</h3>\n\n" . $head3->content->present($self); } sub view_head4 { - my ($self, $head4) = @_; + my($self, $head4) = @_; return "<h4>" . $self->anchor($head4->title) . "</h4>\n\n" . $head4->content->present($self); } sub view_seq_file { - my ($self, $path) = @_; + my($self, $path) = @_; my $doc_obj = get_render_obj(); my $base_dir = dirname catfile $doc_obj->{src_root}, $doc_obj->{src_uri}; my $file = catfile $base_dir, $path; @@ -140,7 +140,7 @@ # the <pre> section uses class "pre-section", which allows to use a custom # look-n-feel via the CSS sub view_verbatim { - my ($self, $text) = @_; + my($self, $text) = @_; for ($text) { s/&/&amp;/g; s/</&lt;/g; @@ -153,7 +153,7 @@ #sub view_for { # my $self = shift; -# my ($for) = @_; +# my($for) = @_; # return $self->SUPER888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4view_for(@_) if $for->format() =~ /\bhtml\b/; # if ($for->format() =~ /\btt2\b/) { # my $text = $for->text(); @@ -174,7 +174,7 @@ ## the one in superclass screws up URLs in L<>: L<http://foo.bar.com> ## should view_seq_text be called at all on these parts? #sub view_seq_text { -# my ($self, $text) = @_; +# my($self, $text) = @_; #dumper $self; ##print $self->[CMD]; # return $text; Index: lib/DocSet/Doc/POD2HTMLPS.pm =================================================================== --- lib/DocSet/Doc/POD2HTMLPS.pm (revision 219272) +++ lib/DocSet/Doc/POD2HTMLPS.pm (working copy) @@ -96,31 +96,31 @@ # as h1 and the real h1 sections as h2, h2 as h3, and so on. sub view_head1 { - my ($self, $head1) = @_; + my($self, $head1) = @_; return "<h2>" . $self->anchor($head1->title) . "</h2>\n\n" . $head1->content->present($self); } sub view_head2 { - my ($self, $head2) = @_; + my($self, $head2) = @_; return "<h3>" . $self->anchor($head2->title) . "</h3>\n\n" . $head2->content->present($self); } sub view_head3 { - my ($self, $head3) = @_; + my($self, $head3) = @_; return "<h4>" . $self->anchor($head3->title) . "</h4>\n\n" . $head3->content->present($self); } sub view_head4 { - my ($self, $head4) = @_; + my($self, $head4) = @_; return "<h5>" . $self->anchor($head4->title) . "</h5>\n\n" . $head4->content->present($self); } sub view_seq_file { - my ($self, $path) = @_; + my($self, $path) = @_; my $doc_obj = get_render_obj(); my $base_dir = dirname catfile $doc_obj->{src_root}, $doc_obj->{src_uri}; my $file = catfile $base_dir, $path; @@ -139,7 +139,7 @@ # the <pre> section uses class "pre-section", which allows to use a custom # look-n-feel via the CSS sub view_verbatim { - my ($self, $text) = @_; + my($self, $text) = @_; for ($text) { s/&/&amp;/g; s/</&lt;/g; Index: lib/DocSet/Util.pm =================================================================== --- lib/DocSet/Util.pm (revision 219272) +++ lib/DocSet/Util.pm (working copy) @@ -155,7 +155,7 @@ } sub get_timestamp { - my ($mon,$day,$year) = (localtime ( time ) )[4,3,5]; + my($mon,$day,$year) = (localtime ( time ) )[4,3,5]; return scalar gmtime() . ' GMT'; } Index: lib/DocSet/DocSet.pm =================================================================== --- lib/DocSet/DocSet.pm (revision 219272) +++ lib/DocSet/DocSet.pm (working copy) @@ -407,7 +407,7 @@ my $src_root = $self->get_dir('src_root'); my $dst_root = $self->get_dir('dst_root'); note "+++ Copying the non-processed files from $src_root to $dst_root"; - while (my ($src_path, $dst_path) = each %copy_files) { + while (my($src_path, $dst_path) = each %copy_files) { note "+++ cp $src_path $dst_path"; copy_file($src_path, $dst_path); } Index: lib/DocSet/RunTime.pm =================================================================== --- lib/DocSet/RunTime.pm (revision 219272) +++ lib/DocSet/RunTime.pm (working copy) @@ -162,7 +162,7 @@ # if matched, returns the whole path relative to the root, otherwise # returns undef sub match_in_doc_src_subset { - my ($base_path, $rel_path) = @_; + my($base_path, $rel_path) = @_; for my $ext (keys %exts) { #print qq{Try: $base_path 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 $rel_path.$ext\n}; if (exists $src_docs{$base_path}{"$rel_path.$ext"}) { Index: src/docs/2.0/devel/core/coding_style.pod =================================================================== --- src/docs/2.0/devel/core/coding_style.pod (revision 219272) +++ src/docs/2.0/devel/core/coding_style.pod (working copy) @@ -93,7 +93,7 @@ sub foo { - my ($self,$bar,$baz,$taz)=@_; + my($self,$bar,$baz,$taz)=@_; if( $cond ) { &bar(); Index: src/docs/2.0/devel/core/explained.pod =================================================================== --- src/docs/2.0/devel/core/explained.pod (revision 219272) +++ src/docs/2.0/devel/core/explained.pod (working copy) @@ -416,7 +416,7 @@ my $a = 7; my $b = 3; - my ($add, $subst); + my($add, $subst); $add = Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4CoreDemo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4print($a, $b); t_debug "print"; @@ -777,7 +777,7 @@ ... my $a = 7; my $b = 3; - my ($add, $subst); + my($add, $subst); # list context ($add, $subst) = Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4CoreDemo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4_subst_sp($a, $b); Index: src/docs/2.0/os/win32/mpinstall =================================================================== --- src/docs/2.0/os/win32/mpinstall (revision 219272) +++ src/docs/2.0/os/win32/mpinstall (working copy) @@ -20,7 +20,7 @@ die "This only works for Win32" unless $^O =~ /Win32/i; die "No mod_perl ppm package available for this Perl" if ($] < 5.006001); -my ($apache2, $apache); +my($apache2, $apache); my @drives = drives(); # find a possible Apache2 directory @@ -111,7 +111,7 @@ my $ppmsx86 = $ppms . 'x86/'; my $ppmpackages = $theoryx5 . '/ppmpackages/'; my $ppmpackagesx86 = $ppmpackages . 'x86/'; -my ($ppd, $tgz, $ppdfile, $tgzfile, $checksums, $so_fetch, $so_fake); +my($ppd, $tgz, $ppdfile, $tgzfile, $checksums, $so_fetch, $so_fake); my $so = 'mod_perl.so'; my $cs = 'CHECKSUMS'; @@ -289,7 +289,7 @@ sub load_cs { my $cs = shift; - my ($cksum, $fh); + my($cksum, $fh); unless (open $fh, $cs) { warn "Could not open $cs: $!"; return; @@ -308,8 +308,8 @@ } sub verifyMD5 { - my ($cksum, $file) = @_; - my ($fh, $is, $should); + my($cksum, $file) = @_; + my($fh, $is, $should); unless (open($fh, $file)) { warn "Cannot open $file: $!"; return; Index: src/docs/2.0/os/win32/distinstall =================================================================== --- src/docs/2.0/os/win32/distinstall (revision 219272) +++ src/docs/2.0/os/win32/distinstall (working copy) @@ -186,7 +186,7 @@ # verify a CHECKSUM for a file sub verifyMD5 { my $file = shift; - my ($is, $should); + my($is, $should); my $fh = IO888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ile->new; unless ($fh->open($file)) { warn qq{Cannot open "$file": $!}; Index: src/docs/2.0/rename.pod =================================================================== --- src/docs/2.0/rename.pod (revision 219272) +++ src/docs/2.0/rename.pod (working copy) @@ -186,7 +186,7 @@ The directions for L<installing mod_perl 2.0 |docs888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4.888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4user888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4install888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4install>. Help is also available through the archives of and subscribing to -the L<mod_perl mailing list|maillist888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4modperl>. +the L<mod_perl mailing list|maillist888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4moduli>. =head1 Authors Index: src/docs/2.0/api/APR/SockAddr.pod =================================================================== --- src/docs/2.0/api/APR/SockAddr.pod (revision 219272) +++ src/docs/2.0/api/APR/SockAddr.pod (working copy) @@ -58,8 +58,8 @@ If you are familiar with how perl's C<Socket> works: use Socket 'sockaddr_in'; - my ($serverport, $serverip) = sockaddr_in(getpeername($local_sock)); - my ($remoteport, $remoteip) = sockaddr_in(getpeername($remote_sock)); + my($serverport, $serverip) = sockaddr_in(getpeername($local_sock)); + my($remoteport, $remoteip) = sockaddr_in(getpeername($remote_sock)); in apr-speak that'd be written as: Index: src/docs/2.0/api/ModPerl/MethodLookup.pod =================================================================== --- src/docs/2.0/api/ModPerl/MethodLookup.pod (revision 219272) +++ src/docs/2.0/api/ModPerl/MethodLookup.pod (working copy) @@ -392,7 +392,7 @@ my $method = $AUTOLOAD; return if $method =~ /DESTROY/; # exclude DESTROY resolving - my ($hint, @modules) = + my($hint, @modules) = ModPerl888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MethodLookup888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4lookup_method($method, @_); $hint ||= "Can't find method $AUTOLOAD"; croak $hint; Index: src/docs/2.0/api/Apache2/compat.pod =================================================================== --- src/docs/2.0/api/Apache2/compat.pod (revision 219840) +++ src/docs/2.0/api/Apache2/compat.pod (working copy) @@ -15,7 +15,7 @@ # override and restore compat functions colliding with mp2 API Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4compat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4override_mp2_api('Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Connection888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4local_addr'); - my ($local_port, $local_addr) = sockaddr_in($c->local_addr); + my($local_port, $local_addr) = sockaddr_in($c->local_addr); Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4compat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4restore_mp2_api('Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Connection888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4local_addr'); @@ -58,14 +58,14 @@ require Socket; my $sockaddr_in = $c->local_addr; - my ($local_port, $local_addr) = Socket888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4sockaddr_in($sockaddr_in); + my($local_port, $local_addr) = Socket888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4sockaddr_in($sockaddr_in); should be adjusted to be: require Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Connection; require APR888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4SockAddr; my $sockaddr = $c->local_addr; - my ($local_port, $local_addr) = ($sockaddr->port, $sockaddr->ip_get); + my($local_port, $local_addr) = ($sockaddr->port, $sockaddr->ip_get); to work under mod_perl 2.0. @@ -81,17 +81,17 @@ which can be restored when no longer needed. So for example if you have code from mod_perl 1.0: - my ($local_port, $local_addr) = Socket888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4sockaddr_in($c->local_addr); + my($local_port, $local_addr) = Socket888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4sockaddr_in($c->local_addr); and you aren't ready to port it to to use the mp2 API: - my ($local_port, $local_addr) = ($c->local_addr->port, + my($local_port, $local_addr) = ($c->local_addr->port, $c->local_addr->ip_get); you could do the following: Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4compat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4override_mp2_api('Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Connection888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4local_addr'); - my ($local_port, $local_addr) = Socket888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4sockaddr_in($c->local_addr); + my($local_port, $local_addr) = Socket888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4sockaddr_in($c->local_addr); Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4compat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4restore_mp2_api('Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Connection888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4local_addr'); Notice that you need to restore the API as soon as possible. Index: src/docs/2.0/api/Apache2/Filter.pod =================================================================== --- src/docs/2.0/api/Apache2/Filter.pod (revision 219840) +++ src/docs/2.0/api/Apache2/Filter.pod (working copy) @@ -1015,7 +1015,7 @@ use base qw(Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Filter); sub init : FilterInitHandler { ... } sub filter : FilterRequestHandler FilterHasInitHandler(\&init) { - my ($f, $bb) = @_; + my($f, $bb) = @_; # ... return Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Const888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OK; } Index: src/docs/2.0/api/Apache2/Module.pod =================================================================== --- src/docs/2.0/api/Apache2/Module.pod (revision 219840) +++ src/docs/2.0/api/Apache2/Module.pod (working copy) @@ -35,7 +35,7 @@ # access module configuration from a directive sub MyDirective { - my ($self, $parms, $args) = @_; + my($self, $parms, $args) = @_; my $srv_cfg = Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Modul888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4get_config($self, $parms->server); [...] } Index: src/docs/2.0/user/handlers/filters.pod =================================================================== --- src/docs/2.0/user/handlers/filters.pod (revision 219272) +++ src/docs/2.0/user/handlers/filters.pod (working copy) @@ -556,7 +556,7 @@ use APR888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onst -compile => ':common'; sub in { - my ($f, $bb, $mode, $block, $readbytes) = @_; + my($f, $bb, $mode, $block, $readbytes) = @_; my $rv = $f->next->get_brigade($bb, $mode, $block, $readbytes); return $rv unless $rv == APR888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onst888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4SUCCESS; @@ -623,7 +623,7 @@ #file:MyApache2/FilterTransparent.pm (continued) #----------------------------------------------- sub out { - my ($f, $bb) = @_; + my($f, $bb) = @_; my $rv = $f->next->pass_brigade($bb); return $rv unless $rv == APR888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onst888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4SUCCESS; @@ -1139,7 +1139,7 @@ use base qw(Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Filter); sub init : FilterInitHandler { ... } sub filter : FilterRequestHandler FilterHasInitHandler(\&init) { - my ($f, $bb) = @_; + my($f, $bb) = @_; # ... return Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Const888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OK; } @@ -2494,7 +2494,7 @@ } sub flatten_bb { - my ($bb) = shift; + my($bb) = shift; my $seen_eos = 0; @@ -2600,7 +2600,7 @@ } sub flatten_bb { - my ($bb) = shift; + my($bb) = shift; my $seen_eos = 0; @@ -2706,7 +2706,7 @@ } sub context { - my ($f) = shift; + my($f) = shift; my $ctx = $f->ctx; unless ($ctx) { @@ -2727,7 +2727,7 @@ C<context> wrapper to be: sub context { - my ($f) = shift; + my($f) = shift; my $ctx = $f->ctx; unless ($ctx) { Index: src/docs/2.0/user/handlers/http.pod =================================================================== --- src/docs/2.0/user/handlers/http.pod (revision 219272) +++ src/docs/2.0/user/handlers/http.pod (working copy) @@ -838,7 +838,7 @@ sub handler { my $r = shift; - my ($status, $password) = $r->get_basic_auth_pw; + my($status, $password) = $r->get_basic_auth_pw; return $status unless $status == Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Const888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OK; return Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Const888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OK Index: src/docs/2.0/user/handlers/protocols.pod =================================================================== --- src/docs/2.0/user/handlers/protocols.pod (revision 219272) +++ src/docs/2.0/user/handlers/protocols.pod (working copy) @@ -164,7 +164,7 @@ connection record object. Here is a simplified handler skeleton: sub handler { - my ($c) = @_; + my($c) = @_; my $sock = $c->client_socket; $sock->opt_set(APR888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onst888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4SO_NONBLOCK, 0); # ... Index: src/docs/2.0/user/porting/porting.pod =================================================================== --- src/docs/2.0/user/porting/porting.pod (revision 219272) +++ src/docs/2.0/user/porting/porting.pod (working copy) @@ -732,8 +732,8 @@ this code in the function C<is_local()>: my $r = $self->r; - my ($serverport,$serveraddr) = sockaddr_in($r->connection->local_addr); - my ($remoteport,$remoteaddr) = sockaddr_in($r->connection->remote_addr); + my($serverport,$serveraddr) = sockaddr_in($r->connection->local_addr); + my($remoteport,$remoteaddr) = sockaddr_in($r->connection->remote_addr); return $serveraddr eq $remoteaddr; Since something is wrong with function calls @@ -755,8 +755,8 @@ sub is_local { my $self = shift; - my $r = $self->r; - - my ($serverport,$serveraddr) = sockaddr_in($r->connection->local_addr); - - my ($remoteport,$remoteaddr) = sockaddr_in($r->connection->remote_addr); + - my($serverport,$serveraddr) = sockaddr_in($r->connection->local_addr); + - my($remoteport,$remoteaddr) = sockaddr_in($r->connection->remote_addr); - return $serveraddr eq $remoteaddr; + my $c = $self->r->connection; + require APR888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4SockAddr; @@ -934,7 +934,7 @@ *UNIVERSAL888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UTOLOAD = sub { my $method = $AUTOLOAD; return if $method =~ /DESTROY/; - my ($hint, @modules) = + my($hint, @modules) = ModPerl888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MethodLookup888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4lookup_method($method, @_); $hint ||= "Can't find method $AUTOLOAD"; croak $hint; @@ -1125,7 +1125,7 @@ # local user @@ -495,7 +495,7 @@ - return Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Const888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4LINED unless my ($directories,$mp3s,$playlists,$txtfiles) + return Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Const888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4LINED unless my($directories,$mp3s,$playlists,$txtfiles) = $self->read_directory($dir); - $self->r->send_http_header( $self->html_content_type ); Index: src/docs/2.0/user/porting/compat.pod =================================================================== --- src/docs/2.0/user/porting/compat.pod (revision 219272) +++ src/docs/2.0/user/porting/compat.pod (working copy) @@ -1463,8 +1463,8 @@ use Socket 'sockaddr_in'; my $c = $r->connection; - my ($serverport, $serverip) = sockaddr_in($c->local_addr); - my ($remoteport, $remoteip) = sockaddr_in($c->remote_addr); + my($serverport, $serverip) = sockaddr_in($c->local_addr); + my($remoteport, $remoteip) = sockaddr_in($c->remote_addr); now it'll be written as: @@ -1482,11 +1482,11 @@ use Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4compat; Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4compat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4override_mp2_api('Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Connection888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4local_addr'); - my ($serverport, $serverip) = sockaddr_in($r->connection->local_addr); + my($serverport, $serverip) = sockaddr_in($r->connection->local_addr); Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4compat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4restore_mp2_api('Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Connection888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4local_addr'); Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4compat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4override_mp2_api('Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Connection888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4remote_addr'); - my ($remoteport, $remoteip) = sockaddr_in($r->connection->remote_addr); + my($remoteport, $remoteip) = sockaddr_in($r->connection->remote_addr); Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4compat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4restore_mp2_api('Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Connection888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4remote_addr'); Index: src/docs/2.0/user/porting/code/apache_mp3_9.diff =================================================================== --- src/docs/2.0/user/porting/code/apache_mp3_9.diff (revision 219272) +++ src/docs/2.0/user/porting/code/apache_mp3_9.diff (working copy) @@ -38,7 +38,7 @@ - if (my $check = $self->r->header_in("If-None-Match")) { + if (my $check = $self->r->headers_in->{"If-None-Match"}) { - my ($time, $ver) = $check =~ /^([a-f0-9]+)-([0-9.]+)$/; + my($time, $ver) = $check =~ /^([a-f0-9]+)-([0-9.]+)$/; if ($check eq '*' or (hex($time) == $last_modified and $ver == $VERSION)) { @@ -1283,8 +1283,8 @@ Index: src/docs/2.0/user/porting/code/apache_mp3_2.diff =================================================================== --- src/docs/2.0/user/porting/code/apache_mp3_2.diff (revision 219272) +++ src/docs/2.0/user/porting/code/apache_mp3_2.diff (working copy) @@ -45,7 +45,7 @@ @@ -1340,7 +1348,7 @@ sub get_dir { my $self = shift; - my ($config,$default) = @_; + my($config,$default) = @_; - my $dir = $self->r->dir_config($config) || $default; + my $dir = $self->get_config($config) || $default; return $dir if $dir =~ m!^/!; # looks like a path Index: src/docs/2.0/user/porting/code/apache_mp3_7.diff =================================================================== --- src/docs/2.0/user/porting/code/apache_mp3_7.diff (revision 219272) +++ src/docs/2.0/user/porting/code/apache_mp3_7.diff (working copy) @@ -79,7 +79,7 @@ @@ -322,12 +322,12 @@ sub send_playlist { my $self = shift; - my ($urls,$shuffle) = @_; + my($urls,$shuffle) = @_; - return HTTP_NO_CONTENT unless @$urls; + return Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4HTTP_NO_CONTENT unless @$urls; my $r = $self->r; @@ -110,7 +110,7 @@ my $last_modified = (stat(_))[9]; @@ -478,15 +478,15 @@ - my ($time, $ver) = $check =~ /^([a-f0-9]+)-([0-9.]+)$/; + my($time, $ver) = $check =~ /^([a-f0-9]+)-([0-9.]+)$/; if ($check eq '*' or (hex($time) == $last_modified and $ver == $VERSION)) { - return HTTP_NOT_MODIFIED; @@ -118,8 +118,8 @@ } } -- return DECLINED unless my ($directories,$mp3s,$playlists,$txtfiles) -+ return Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4DECLINED unless my ($directories,$mp3s,$playlists,$txtfiles) +- return DECLINED unless my($directories,$mp3s,$playlists,$txtfiles) ++ return Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4DECLINED unless my($directories,$mp3s,$playlists,$txtfiles) = $self->read_directory($dir); $self->r->send_http_header( $self->html_content_type ); Index: src/docs/2.0/user/config/custom.pod =================================================================== --- src/docs/2.0/user/config/custom.pod (revision 219272) +++ src/docs/2.0/user/config/custom.pod (working copy) @@ -310,7 +310,7 @@ sub Location { - my ($cfg, $parms, $data) = @_; + my($cfg, $parms, $data) = @_; # see if we were called via LocationMatch my $regex = $parms->info; Index: src/docs/2.0/user/install/install.pod =================================================================== --- src/docs/2.0/user/install/install.pod (revision 219272) +++ src/docs/2.0/user/install/install.pod (working copy) @@ -47,7 +47,7 @@ you must rebuild Perl without threads enabled or with C<-Dusethreads>. Remember that threads-support slows things down and on some platforms it's unstable (e.g., FreeBSD), so don't enable it -unless you really need it. +unless you really need it. =item Threaded MPMs Index: src/docs/tutorials/tips/mod_perl_tricks/mod_perl_tricks.pod =================================================================== --- src/docs/tutorials/tips/mod_perl_tricks/mod_perl_tricks.pod (revision 219272) +++ src/docs/tutorials/tips/mod_perl_tricks/mod_perl_tricks.pod (working copy) @@ -193,7 +193,7 @@ # CALCULATE THE CURRENT PAGE sub calculate_page { - my ($prev, $dir) = @_; + my($prev, $dir) = @_; return 0 if $prev eq ''; # start with first page return $prev + 1 if $dir eq 'Submit Application'; return $prev + 1 if $dir eq 'Next Page'; @@ -229,7 +229,7 @@ my $current_page = shift; print "Please review this information carefully before submitting it. ", start_form; - my (@rows); + my(@rows); foreach $page ('Personal Information','References','Assets') { push(@rows,th({-align=>LEFT},em($page))); foreach $field (@{$FIELDS{$page}}) { @@ -257,11 +257,11 @@ # CREATE A GENERIC QUESTIONNAIRE sub draw_form { - my (@fields) = @_; - my (%fields); + my(@fields) = @_; + my(%fields); grep ($fields{$_}++, @fields); - my (@hidden_fields) = grep(!$fields{$_}, keys %ALL_FIELDS); - my (@rows); + my(@hidden_fields) = grep(!$fields{$_}, keys %ALL_FIELDS); + my(@rows); foreach (@fields) { push(@rows, TR(th({-align=>LEFT},$_), @@ -537,7 +537,7 @@ rmtree([$dir],0,1); sub draw { - my ($r,$color_index,$dir) = @_; + my($r,$color_index,$dir) = @_; my $im = new G888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Image(END,END); my $white = $im->colorAllocate(255,255,255); my $black = $im->colorAllocate(0,0,0); @@ -607,15 +607,15 @@ @HTML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Parser888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ixNaughty888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ISA = 'HTML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Parser'; sub start { - my ($self,$tag,$attr,$attrseq,$origtext) = @_; + my($self,$tag,$attr,$attrseq,$origtext) = @_; print $origtext; } sub end { - my ($self,$tag) = @_; + my($self,$tag) = @_; print "</$tag>"; } sub text { - my ($self,$text) = @_; + my($self,$text) = @_; $text =~ s/\b(\w)\w{2}(\w)\b/$1**$2/g; print $text; } @@ -649,15 +649,15 @@ @HTML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Parser888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ixNaughty888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ISA = 'HTML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Parser'; sub start { - my ($self,$tag,$attr,$attrseq,$origtext) = @_; + my($self,$tag,$attr,$attrseq,$origtext) = @_; print $origtext; } sub end { - my ($self,$tag) = @_; + my($self,$tag) = @_; print "</$tag>"; } sub text { - my ($self,$text) = @_; + my($self,$text) = @_; $text =~ s/\b(\w)\w{2}(\w)\b/$1**$2/g; print $text; } @@ -1154,7 +1154,7 @@ # after 30 minutes, we consider this a new session use constant MAX_INTERVAL => 60*30; - my (%HITS,%INT_NUMERATOR,%INT_DENOMINATOR,%POLITE,%LAST,$HITS); + my(%HITS,%INT_NUMERATOR,%INT_DENOMINATOR,%POLITE,%LAST,$HITS); # This uses a non-standard agent log with lines formatted like this: # [08/Feb/1998:12:28:35 -0500] phila249-pri.voicenet.com "Mozilla/3.01 (Win95; U)" /cgi-bin/fortune @@ -1596,7 +1596,7 @@ } sub is_child { - my ($base,$url) = @_; + my($base,$url) = @_; my $rel = $url->rel($base); return ($rel ne $url) && ($rel !~ m!^[/.]!); } @@ -1718,7 +1718,7 @@ } sub is_child { - my ($base,$url) = @_; + my($base,$url) = @_; my $rel = $url->rel($base); return ($rel ne $url) && ($rel !~ m!^[/.]!); } @@ -1786,7 +1786,7 @@ } sub redirect { - my ($url,$s) = @_; + my($url,$s) = @_; my $host = $HOSTS[rand(@HOSTS)]; print $s "HTTP/1.0 301 Moved Temporarily"; print $s "Server: Lincoln's Redirector/1.0"; @@ -2162,8 +2162,8 @@ # create a new NavBar object sub new { - my ($class,$conf_file) = @_; - my (@c,%c); + my($class,$conf_file) = @_; + my(@c,%c); my $fh = Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4File->new($conf_file) || return; while (<$fh>) { chomp; @@ -2255,7 +2255,7 @@ sub handler { my $r = shift; - my ($fh,$gz); + my($fh,$gz); my $file = $r->filename; return DECLINED unless $fh=IO888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ile->new($file); $r->header_out('Content-Encoding'=>'gzip'); @@ -2434,7 +2434,7 @@ # This routine creates a pattern matching subroutine from a # list of pattern matches stored in a file. sub get_match_sub { - my ($r,$filename) = @_; + my($r,$filename) = @_; my $mtime = -M $filename; # try to return the sub from cache @@ -2660,7 +2660,7 @@ END foreach (@$requires) { - my ($requirement,@rest ) = split(/\s+/,$_->{requirement}); + my($requirement,@rest ) = split(/\s+/,$_->{requirement}); if (lc $requirement eq 'user') { foreach (@rest) { return OK if $user eq $_; } $explanation .= "<LI>Users @rest.\n"; Index: src/docs/general/control/control.pod =================================================================== --- src/docs/general/control/control.pod (revision 219272) +++ src/docs/general/control/control.pod (working copy) @@ -880,7 +880,7 @@ # output: 1 for success, 0 for failure ####################### sub checkurl{ - my ($url) = @_; + my($url) = @_; # Fetch document my $res = $ua->request(HTTP888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Request->new(GET => $url)); @@ -1261,7 +1261,7 @@ my $restart_command = "/usr/local/sbin/$server/apachectl restart"; my $gzip_exec = "/usr/bin/gzip"; - my ($sec,$min,$hour,$mday,$mon,$year) = localtime(time); + my($sec,$min,$hour,$mday,$mon,$year) = localtime(time); my $time = sprintf "%0.4d.%0.2d.%0.2d-%0.2d.%0.2d.%0.2d", $year+1900,++$mon,$mday,$hour,$min,$sec; $^I = ".$time"; @@ -1305,7 +1305,7 @@ my $CONF = "$ROOT/conf/httpd.conf"; # master conf my $MIDNIGHT = "MIDNIGHT"; # name of program in each logdir - my ($user_id, $group_id, $pidfile); # will be set during parse of conf + my($user_id, $group_id, $pidfile); # will be set during parse of conf die "not running as root" if $>; chdir $ROOT or die "Cannot chdir $ROOT: $!"; Index: src/docs/general/perl_reference/perl_reference.pod =================================================================== --- src/docs/general/perl_reference/perl_reference.pod (revision 219272) +++ src/docs/general/perl_reference/perl_reference.pod (working copy) @@ -2461,7 +2461,7 @@ *{$AUTOLOAD} = sub { shift; - my ($package, $filename, $line) = caller; + my($package, $filename, $line) = caller; push @_, caller => { package => $package, filename => $filename, @@ -2739,7 +2739,7 @@ *{$AUTOLOAD} = sub { shift; - my ($package, $filename, $line) = caller; + my($package, $filename, $line) = caller; push @_, caller => { package => $package, filename => $filename, Index: src/docs/general/testing/testing.pod =================================================================== --- src/docs/general/testing/testing.pod (revision 219272) +++ src/docs/general/testing/testing.pod (working copy) @@ -2954,7 +2954,7 @@ } sub APACHE_TEST_CONFIGURE { - my ($class, $self) = @_; + my($class, $self) = @_; my $vars = $self->{vars}; my $target_dir = catfile $vars->{documentroot}, 'testdirective'; Index: src/docs/1.0/os/win32/mpinstall =================================================================== --- src/docs/1.0/os/win32/mpinstall (revision 219272) +++ src/docs/1.0/os/win32/mpinstall (working copy) @@ -20,7 +20,7 @@ die "This only works for Win32" unless $^O =~ /Win32/i; die "No mod_perl ppm package available for this Perl" if ($] < 5.006001); -my ($apache2, $apache); +my($apache2, $apache); my @drives = drives(); # find a possible Apache2 directory @@ -111,7 +111,7 @@ my $ppmsx86 = $ppms . 'x86/'; my $ppmpackages = $theoryx5 . '/ppmpackages/'; my $ppmpackagesx86 = $ppmpackages . 'x86/'; -my ($ppd, $tgz, $ppdfile, $tgzfile, $checksums, $so_fetch, $so_fake); +my($ppd, $tgz, $ppdfile, $tgzfile, $checksums, $so_fetch, $so_fake); my $so = 'mod_perl.so'; my $cs = 'CHECKSUMS'; @@ -289,7 +289,7 @@ sub load_cs { my $cs = shift; - my ($cksum, $fh); + my($cksum, $fh); unless (open $fh, $cs) { warn "Could not open $cs: $!"; return; @@ -308,8 +308,8 @@ } sub verifyMD5 { - my ($cksum, $file) = @_; - my ($fh, $is, $should); + my($cksum, $file) = @_; + my($fh, $is, $should); unless (open($fh, $file)) { warn "Cannot open $file: $!"; return; Index: src/docs/1.0/os/win32/distinstall =================================================================== --- src/docs/1.0/os/win32/distinstall (revision 219272) +++ src/docs/1.0/os/win32/distinstall (working copy) @@ -186,7 +186,7 @@ # verify a CHECKSUM for a file sub verifyMD5 { my $file = shift; - my ($is, $should); + my($is, $should); my $fh = IO888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ile->new; unless ($fh->open($file)) { warn qq{Cannot open "$file": $!}; Index: src/docs/1.0/api/Apache.pod =================================================================== --- src/docs/1.0/api/Apache.pod (revision 219272) +++ src/docs/1.0/api/Apache.pod (working copy) @@ -466,7 +466,7 @@ sub trans_handler { my $r = shift; - my ($user) = ($r->header_in('Host') =~ /^[^\.]+/); + my($user) = ($r->header_in('Host') =~ /^[^\.]+/); $r->document_root("/home/$user/www"); return DECLINED; } Index: src/docs/1.0/guide/performance.pod =================================================================== --- src/docs/1.0/guide/performance.pod (revision 219272) +++ src/docs/1.0/guide/performance.pod (working copy) @@ -546,7 +546,7 @@ print "On : ",timestr($t2),"\n"; sub test_code{ - my ($a,$b) = qw(foo bar); + my($a,$b) = qw(foo bar); my $c; if ($a == $b) { $c = $a; @@ -564,7 +564,7 @@ Now let's fix the comparison the way it should be, by replacing C<==> with C<eq>, so we get: - my ($a,$b) = qw(foo bar); + my($a,$b) = qw(foo bar); my $c; if ($a eq $b) { $c = $a; @@ -589,7 +589,7 @@ print "Content-type:text/html\n\n"; test_code(); sub test_code{ - my ($a,$b) = qw(foo bar); + my($a,$b) = qw(foo bar); my $c; if ($a == $b) { $c = $a; @@ -4429,7 +4429,7 @@ sub bar { my $class = shift; - my ($x,$y) = (100,100); + my($x,$y) = (100,100); $y = log ($x ** 10) for (0..20); }; @@ -4448,7 +4448,7 @@ sub bar { my $class = shift; - my ($x,$y) = (100,100); + my($x,$y) = (100,100); $y = log ($x ** 10) for (0..40); }; Index: src/docs/1.0/guide/scenario.pod =================================================================== --- src/docs/1.0/guide/scenario.pod (revision 219272) +++ src/docs/1.0/guide/scenario.pod (working copy) @@ -1513,7 +1513,7 @@ and $r->header_in('X-Forwarded-For'); # Select last value in the chain -- original client's ip - if (my ($ip) = $r->headers_in->{'X-Forwarded-For'} =~ /([^,\s]+)$/) { + if (my($ip) = $r->headers_in->{'X-Forwarded-For'} =~ /([^,\s]+)$/) { $r->connection->remote_ip($ip); } Index: src/docs/1.0/guide/snippets.pod =================================================================== --- src/docs/1.0/guide/snippets.pod (revision 219272) +++ src/docs/1.0/guide/snippets.pod (working copy) @@ -524,7 +524,7 @@ ############# sub colorize{ - my ($type,$context) = @_; + my($type,$context) = @_; my %colors = ( @@ -766,7 +766,7 @@ use Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Constants qw(REDIRECT OK); my $r = shift; my $notes = $r->main->notes(); - my ($quota,usage_pp,percent_pp) = getquota($notes->{user}||''); + my($quota,usage_pp,percent_pp) = getquota($notes->{user}||''); $r->notes('quota',$quota); $r->notes('usage_pp',$usage_pp); $r->notes('percent_pp',$percent_pp); @@ -874,20 +874,20 @@ @ISA = qw/Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Request/; sub new { - my ($proto, $apr) = @_; + my($proto, $apr) = @_; my $class = ref($proto) || $proto; bless { _r => $apr }, $class; } sub param { - my ($self, $key) = @_; + my($self, $key) = @_; my $apr = $self->{_r}; # Here we are calling the Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Request object's param method $apr->param($key); } sub sum { - my ($self, $key) = @_; + my($self, $key) = @_; my $apr = $self->{_r}; my @values = $apr->param($key); my $sum = 0; @@ -954,7 +954,7 @@ # Alternatively you can hardcode it here, look for $smtp_server below # sub send_mail{ - my ($from, $to, $subject, $body) = @_; + my($from, $to, $subject, $body) = @_; carp "From missing" unless defined $from ; # Prefer to exit early if errors carp "To missing" unless defined $to ; @@ -1072,7 +1072,7 @@ sub handler { my $r = shift; my $uri = $r->uri; - my ($id) = ($uri =~ m|^/articles/(.*?)/|); + my($id) = ($uri =~ m|^/articles/(.*?)/|); $r->uri("/articles/index.html"); $r->args("id=$id"); return DECLINED; @@ -1155,11 +1155,11 @@ use vars qw($VERSION); $VERSION = '0.03'; - my ($r, %param, $input, $output); + my($r, %param, $input, $output); sub handler { $r = shift; - my ($fh, $status) = $r->filter_input(); + my($fh, $status) = $r->filter_input(); unless ($status == OK) { return $status } @@ -1219,7 +1219,7 @@ my $r = shift; - my ($res, $sent_pwd) = $r->get_basic_auth_pw; + my($res, $sent_pwd) = $r->get_basic_auth_pw; return $res if $res; #decline if not Basic my $user = $r->connection->user; Index: src/docs/1.0/guide/security.pod =================================================================== --- src/docs/1.0/guide/security.pod (revision 219272) +++ src/docs/1.0/guide/security.pod (working copy) @@ -134,7 +134,7 @@ my $r = shift; # get user's authentication credentials - my ($res, $sent_pw) = $r->get_basic_auth_pw; + my($res, $sent_pw) = $r->get_basic_auth_pw; return $res if $res != OK; my $user = $r->connection->user; @@ -150,7 +150,7 @@ } sub authen_dbi{ - my ($r, $user, $sent_pw) = @_; + my($r, $user, $sent_pw) = @_; # validate username/passwd Index: src/docs/1.0/guide/porting.pod =================================================================== --- src/docs/1.0/guide/porting.pod (revision 219272) +++ src/docs/1.0/guide/porting.pod (working copy) @@ -423,7 +423,7 @@ show_user($username); sub authenticate{ - my ($username,$passwd) = @_; + my($username,$passwd) = @_; # some checking $authenticated = 1 if SOME_USER_PASSWD_CHECK_IS_OK; } @@ -452,7 +452,7 @@ show_user($username); sub authenticate{ - my ($username,$passwd) = @_; + my($username,$passwd) = @_; # some checking return (SOME_USER_PASSWD_CHECK_IS_OK) ? 1 : 0; } @@ -2277,7 +2277,7 @@ print "Content-type: text/plain\n\n"; - for (my ($k, $v) = each %hash) { + for (my($k, $v) = each %hash) { print "$k $v\n"; last; } Index: src/docs/1.0/guide/debug.pod =================================================================== --- src/docs/1.0/guide/debug.pod (revision 219272) +++ src/docs/1.0/guide/debug.pod (working copy) @@ -1601,7 +1601,7 @@ my @month_len = (31,28,31,30,31,30,31,31,30,31,30,31); - my ($day,$month,$year) = (localtime)[3..5]; + my($day,$month,$year) = (localtime)[3..5]; for (my $j = 0; $j < 7; $j++) { $day--; @@ -1659,7 +1659,7 @@ my @month_len = (31,28,31,30,31,30,31,31,30,31,30,31); - my ($day,$month,$year) = (localtime)[3..5]; + my($day,$month,$year) = (localtime)[3..5]; print "[set] month : $month\n"; # DEBUG for (my $j = 0; $j < 7; $j++) { @@ -1725,7 +1725,7 @@ localtime(). To correct the above code we just increment the month after we call localtime(): - my ($day,$month,$year) = (localtime)[3..5]; + my($day,$month,$year) = (localtime)[3..5]; $month++; =head2 Using print() and Dat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Dumper for Debugging @@ -1884,7 +1884,7 @@ understand is: sub date_a_week_ago{ - my ($day,$month,$year) = (localtime(time-604800))[3..5]; + my($day,$month,$year) = (localtime(time-604800))[3..5]; return sprintf "%02d/%02d/%04d",$month+1,$day,$year+1900; } @@ -2225,7 +2225,7 @@ /usr/lib/perl5/5.00503/Symbol.pm: 86: my $name = "GEN" . $genseq++; break if (1) - 95: my ($name) = @_; + 95: my($name) = @_; break if (1) The filename and line number of the breakpoint are displayed just Index: src/docs/1.0/guide/code/My-DB.pm =================================================================== --- src/docs/1.0/guide/code/My-DB.pm (revision 219272) +++ src/docs/1.0/guide/code/My-DB.pm (working copy) @@ -121,7 +121,7 @@ # do query $self->{sth} = $self->{dbh}->prepare($do_sql); $self->{sth}->execute(); - my ($count) = $self->{sth}->fetchrow_array; + my($count) = $self->{sth}->fetchrow_array; d("Result: $count") if DEBUG; @@ -188,7 +188,7 @@ my $count = @{$self->{dbh}->selectall_arrayref($do_sql)}; -# my ($count) = $self->{sth}->fetchrow_array; +# my($count) = $self->{sth}->fetchrow_array; d("Result: $count") if DEBUG; @@ -555,7 +555,7 @@ $self->{sth}->execute(); -# my ($count) = $self->{sth}->fetchrow_array; +# my($count) = $self->{sth}->fetchrow_array; # # d("Result: $count") if DEBUG; @@ -704,7 +704,7 @@ sub sql_date{ my $self = shift; - my ($mday,$mon,$year) = (localtime)[3..5]; + my($mday,$mon,$year) = (localtime)[3..5]; return sprintf "%0.4d%0.2d%0.2d",1900+$year,++$mon,$mday; } # end of sub sql_date @@ -720,7 +720,7 @@ sub sql_datetime{ my $self = shift; - my ($sec,$min,$hour,$mday,$mon,$year) = localtime(); + my($sec,$min,$hour,$mday,$mon,$year) = localtime(); return sprintf "%0.4d%0.2d%0.2d%0.2d%0.2d%0.2d",1900+$year,++$mon,$mday,$hour,$min,$sec; } # end of sub sql_datetime Index: src/docs/1.0/guide/code/lwp-bench.pl =================================================================== --- src/docs/1.0/guide/code/lwp-bench.pl (revision 219272) +++ src/docs/1.0/guide/code/lwp-bench.pl (working copy) @@ -29,7 +29,7 @@ # Is called when connection is opened ### sub on_connect { - my ($self, $request, $response, $entry) = @_; + my($self, $request, $response, $entry) = @_; $self->{__start_times}->{$entry} = [Tim888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4HiRes888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gettimeofday]; } @@ -37,7 +37,7 @@ # Are called when connection is closed ### sub on_return { - my ($self, $request, $response, $entry) = @_; + my($self, $request, $response, $entry) = @_; my $start = $self->{__start_times}->{$entry}; $self->{__latency_total} += Tim888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4HiRes888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4tv_interval($start); } @@ -125,7 +125,7 @@ ( $nof_requests_total * @urls ) ), ); -my ($left, $right); +my($left, $right); ### # Print out statistics ### Index: src/search/spider.pl =================================================================== --- src/search/spider.pl (revision 219272) +++ src/search/spider.pl (working copy) @@ -292,7 +292,7 @@ my($uri, $server, $realm ) = @_; my $netloc = $uri->canonical->host_port; - my ($user, $password); + my($user, $password); eval { local $SIG{ALRM} = sub { die "timed out\n" }; @@ -334,7 +334,7 @@ #----------- Non recursive spidering --------------------------- sub spider { - my ( $server, $uri ) = @_; + my( $server, $uri ) = @_; # Validate the first link, just in case return unless check_link( $uri, $server, '', '(Base URL)' ); @@ -345,7 +345,7 @@ die if $abort || $server->{abort}; - my ( $uri, $parent, $depth ) = @{shift @link_array}; + my( $uri, $parent, $depth ) = @{shift @link_array}; my $new_links = process_link( $server, $uri, $parent, $depth ); @@ -357,7 +357,7 @@ #----------- Process a url and return links ----------------------- sub process_link { - my ( $server, $uri, $parent, $depth ) = @_; + my( $server, $uri, $parent, $depth ) = @_; $server->{counts}{'Unique URLs'}++; @@ -384,7 +384,7 @@ # Set basic auth if defined - use URI specific first, then credentials - if ( my ( $user, $pass ) = split /:/, ( $uri->userinfo || $server->{credentials} || '' ) ) { + if ( my( $user, $pass ) = split /:/, ( $uri->userinfo || $server->{credentials} || '' ) ) { $request->authorization_basic( $user, $pass ); } @@ -599,7 +599,7 @@ #--------------------------------------------------------------------------------------------------- sub check_user_function { - my ( $fn, $uri, $server ) = ( shift, shift, shift ); + my( $fn, $uri, $server ) = ( shift, shift, shift ); return 1 unless $server->{$fn}; @@ -643,7 +643,7 @@ #---------------------------------------------------------------------------------------------- sub extract_links { - my ( $server, $content, $response ) = @_; + my( $server, $content, $response ) = @_; return unless $response->header('content-type') && $response->header('content-type') =~ m[^text/html]; @@ -669,7 +669,7 @@ my %skipped_tags; for ( $p->links ) { - my ( $tag, %attr ) = @$_; + my( $tag, %attr ) = @$_; # which tags to use ( not reported in debug ) @@ -749,7 +749,7 @@ # #------------------------------------------------------------------------------ sub check_link { - my ( $u, $server, $base, $tag, $attribute ) = @_; + my( $u, $server, $base, $tag, $attribute ) = @_; $tag ||= ''; $attribute ||= ''; @@ -811,7 +811,7 @@ # #------------------------------------------------------------------------------ sub validate_link { - my ($server, $uri, $base, $response ) = @_; + my($server, $uri, $base, $response ) = @_; # Already checked? @@ -860,7 +860,7 @@ sub output_content { - my ( $server, $content, $uri, $response ) = @_; + my( $server, $content, $uri, $response ) = @_; $server->{indexed}++; @@ -1639,7 +1639,7 @@ use pdf2xml; # included example pdf converter module $server{filter_content} = sub { - my ( $uri, $server, $response, $content_ref ) = @_; + my( $uri, $server, $response, $content_ref ) = @_; return 1 if $response->content_type eq 'text/html'; return 0 unless $response->content_type eq 'application/pdf'; @@ -1683,7 +1683,7 @@ test_response => sub { - my ( $uri, $server, $response ) = @_; + my( $uri, $server, $response ) = @_; # tell swish not to index the contents if this is of type image $server->{no_contents} = $response->content_type =~ m[^image/]; return 1; # ok to index and spider this document @@ -1711,7 +1711,7 @@ the links to the PDF files. $server{test_response} = sub { - my ( $uri, $server, $response ) = @_; + my( $uri, $server, $response ) = @_; $server->{no_index} = $response->content_type ne 'application/pdf'; return 1; # ok to spider, but don't index } Index: src/search/SwishSpiderConfig.pl =================================================================== --- src/search/SwishSpiderConfig.pl (revision 219272) +++ src/search/SwishSpiderConfig.pl (working copy) @@ -102,7 +102,7 @@ } sub create_page { - my ( $head, $section, $params ) = @_; + my( $head, $section, $params ) = @_; my $uri = $params->{uri}; @@ -218,7 +218,7 @@ } sub recurse_sections { - my ( $sections, $items_array ) = @_; + my( $sections, $items_array ) = @_; for ( @$items_array ) { # grab the path and its associated section ID Index: src/search/make.pl =================================================================== --- src/search/make.pl (revision 219272) +++ src/search/make.pl (working copy) @@ -191,7 +191,7 @@ # # sub build_array { - my ( $items ) = @_; + my( $items ) = @_; my $indent = $items->[0]{indent}; Index: src/search/modules/TemplateDumper.pm =================================================================== --- src/search/modules/TemplateDumper.pm (revision 219272) +++ src/search/modules/TemplateDumper.pm (working copy) @@ -2,7 +2,7 @@ # This just dumps out the results object. # Need to use a query string to do anything interesting # -# $Id: TemplateDumper.pm,v 1.1 2002/01/30 06:35:00 stas Exp $ +# $Id$ # #=============================================================================== package TemplateDumper; @@ -11,7 +11,7 @@ use Dat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Dumper; sub show_template { - my ( $class, $template_params, $results ) = @_; + my( $class, $template_params, $results ) = @_; $Dat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Dumper888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Quotekeys = 0; print "Content-Type: text/plain\n\n", Index: src/search/modules/PhraseHighlight.pm =================================================================== --- src/search/modules/PhraseHighlight.pm (revision 219272) +++ src/search/modules/PhraseHighlight.pm (working copy) @@ -1,7 +1,7 @@ #======================================================================= # Phrase Highlighting Code # -# $Id: PhraseHighlight.pm,v 1.2 2002/04/06 19:17:16 moseley Exp $ +# $Id$ #======================================================================= package PhraseHighlight; use strict; @@ -9,7 +9,7 @@ use constant DEBUG_HIGHLIGHT => 0; sub new { - my ( $class, $results, $metaname ) = @_; + my( $class, $results, $metaname ) = @_; my $self = bless { @@ -54,7 +54,7 @@ } sub highlight { - my ( $self, $properties ) = @_; + my( $self, $properties ) = @_; return unless $self->{query}; @@ -99,7 +99,7 @@ sub highlight_text { - my ( $self, $text_ref, $phrase_array ) = @_; + my( $self, $text_ref, $phrase_array ) = @_; my $wc_regexp = $self->{wc_regexp}; my $extract_regexp = $self->{extract_regexp}; @@ -158,7 +158,7 @@ # now compare all the words in the phrase - my ( $begin, $word, $end ); + my( $begin, $word, $end ); for my $match_word ( @$phrase ) { @@ -167,7 +167,7 @@ unless ( $cur_word =~ /$extract_regexp/ ) { my $idx = ($word_pos + $end_pos) * 2; - my ( $s, $e ) = ( $idx - 10, $idx + 10 ); + my( $s, $e ) = ( $idx - 10, $idx + 10 ); $s = 0 if $s < 0; $e = @words-1 if $e >= @words; Index: src/search/modules/DefaultHighlight.pm =================================================================== --- src/search/modules/DefaultHighlight.pm (revision 219272) +++ src/search/modules/DefaultHighlight.pm (working copy) @@ -1,13 +1,13 @@ #======================================================================= # Default Highlighting Code # -# $Id: DefaultHighlight.pm,v 1.1 2002/01/30 06:35:00 stas Exp $ +# $Id$ #======================================================================= package DefaultHighlight; use strict; sub new { - my ( $class, $results, $metaname ) = @_; + my( $class, $results, $metaname ) = @_; my $self = bless { @@ -45,7 +45,7 @@ } sub highlight { - my ( $self, $properties ) = @_; + my( $self, $properties ) = @_; return unless $self->{query}; @@ -90,7 +90,7 @@ sub highlight_text { - my ( $self, $text_ref, $phrase_array ) = @_; + my( $self, $text_ref, $phrase_array ) = @_; my $wc_regexp = $self->{wc_regexp}; my $extract_regexp = $self->{extract_regexp}; @@ -131,7 +131,7 @@ if ( $words[$pos] =~ /$extract_regexp/ ) { - my ( $begin, $word, $end ) = ( $1, $2, $3 ); + my( $begin, $word, $end ) = ( $1, $2, $3 ); my $test = $stemmer_function ? $stemmer_function->($word) Index: src/search/modules/TemplateHTMLTemplate.pm =================================================================== --- src/search/modules/TemplateHTMLTemplate.pm (revision 219272) +++ src/search/modules/TemplateHTMLTemplate.pm (working copy) @@ -1,6 +1,6 @@ #======================================================================= # Module for using Template-Toolkit for generating output -# $Id: TemplateHTMLTemplate.pm,v 1.1 2002/01/30 06:35:00 stas Exp $ +# $Id$ # # This module probably does not automatically support all the features # of the swish.cgi script (such as selecting index files). See @@ -20,7 +20,7 @@ sub show_template { - my ( $class, $template_params, $results ) = @_; + my( $class, $template_params, $results ) = @_; my $cgi = $results->CGI; Index: src/search/modules/DateRanges.pm =================================================================== --- src/search/modules/DateRanges.pm (revision 219272) +++ src/search/modules/DateRanges.pm (working copy) @@ -1,4 +1,4 @@ -# $Id: DateRanges.pm,v 1.1 2002/01/30 06:35:00 stas Exp $ +# $Id$ package DateRanges; use strict; @@ -129,7 +129,7 @@ =cut sub DateRangeForm { - my ( $CGI, $params, $fields ) = @_; + my( $CGI, $params, $fields ) = @_; die "Must supply arrary ref for 'options'" unless $params->{time_periods} && ref $params->{time_periods} eq 'ARRAY'; @@ -226,7 +226,7 @@ #------------------------ Get the report dates --------------------- sub DateRangeParse { - my ( $q, $form ) = @_; + my( $q, $form ) = @_; $form->{DateRanges_error} = ''; @@ -240,7 +240,7 @@ my $time = time(); - my ( @start, @end ); + my( @start, @end ); for ($q->param('DateRanges_date_option') ) { @@ -302,7 +302,7 @@ /^Select/ && do { - my ( $day, $mon, $year ); + my( $day, $mon, $year ); $day = $q->param('DateRanges_start_day') || 0; $mon = $q->param('DateRanges_start_mon') || 0; @@ -345,7 +345,7 @@ #---------------------------------------------------------------------------- sub show_date_input { - my ( $CGI, $name ) = @_; + my( $CGI, $name ) = @_; $name = "DateRanges_$name"; @@ -353,7 +353,7 @@ my $x = 1; my %months = map { $x++, $_ } @months; - my ($mon, $day, $year) = (localtime)[4,3,5]; + my($mon, $day, $year) = (localtime)[4,3,5]; $year = $year + 1900; $mon++; @@ -393,7 +393,7 @@ #----------------------- ymd_to_unix -------------------------- # Silly Dat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Calc sub ymd_to_unix { - my ($y, $m, $d ) = @_; + my($y, $m, $d ) = @_; $m--; $y -= 1900; return timelocal( 0, 0, 0, $d, $m, $y ); Index: src/search/modules/TemplateDefault.pm =================================================================== --- src/search/modules/TemplateDefault.pm (revision 219272) +++ src/search/modules/TemplateDefault.pm (working copy) @@ -1,6 +1,6 @@ #===================================================================== # These routines format the HTML output. -# $Id: TemplateDefault.pm,v 1.1 2002/01/30 06:35:00 stas Exp $ +# $Id$ #===================================================================== package TemplateDefault; use strict; @@ -8,7 +8,7 @@ use CGI; sub show_template { - my ( $class, $template_params, $results ) = @_; + my( $class, $template_params, $results ) = @_; my $q = $results->CGI; @@ -236,7 +236,7 @@ # # sub show_result { - my ($results, $this_result ) = @_; + my($results, $this_result ) = @_; my $conf = $results->{conf}; @@ -334,7 +334,7 @@ #================================================================== sub get_meta_name_limits { - my ( $results ) = @_; + my( $results ) = @_; my $metanames = $results->config('metanames'); return '' unless $metanames; @@ -356,7 +356,7 @@ } sub get_sort_select_list { - my ( $results ) = @_; + my( $results ) = @_; my $sort_metas = $results->config('sorts'); return '' unless $sort_metas; @@ -384,7 +384,7 @@ sub get_index_select_list { - my ( $results ) = @_; + my( $results ) = @_; my $q = $results->CGI; @@ -426,7 +426,7 @@ sub get_limit_select { - my ( $results ) = @_; + my( $results ) = @_; my $q = $results->CGI; Index: src/search/modules/SimpleHighlight.pm =================================================================== --- src/search/modules/SimpleHighlight.pm (revision 219272) +++ src/search/modules/SimpleHighlight.pm (working copy) @@ -1,12 +1,12 @@ #======================================================================= # Simple Highlighting Code -# $Id: SimpleHighlight.pm,v 1.1 2002/01/30 06:35:00 stas Exp $ +# $Id$ #======================================================================= package SimpleHighlight; use strict; sub new { - my ( $class, $results, $metaname ) = @_; + my( $class, $results, $metaname ) = @_; my $self = bless { @@ -35,7 +35,7 @@ } sub highlight { - my ( $self, $properties ) = @_; + my( $self, $properties ) = @_; return unless $self->{query}; @@ -66,7 +66,7 @@ sub highlight_text { - my ( $self, $text_ref, $phrase_array ) = @_; + my( $self, $text_ref, $phrase_array ) = @_; my $settings = $self->{settings}; Index: src/search/modules/TemplateToolkit.pm =================================================================== --- src/search/modules/TemplateToolkit.pm (revision 219272) +++ src/search/modules/TemplateToolkit.pm (working copy) @@ -1,6 +1,6 @@ #======================================================================= # Module for using Template-Toolkit for generating output -# $Id: TemplateToolkit.pm,v 1.3 2002/04/19 19:53:34 moseley Exp $ +# $Id$ # #======================================================================= package TemplateToolkit; @@ -11,7 +11,7 @@ sub show_template { - my ( $class, $template_params, $results ) = @_; + my( $class, $template_params, $results ) = @_; my $cgi = $results->CGI; @@ -50,7 +50,7 @@ use strict; sub new { - my ( $class, $results ) = @_; + my( $class, $results ) = @_; @TemplateToolkit888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Helpers888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ISA = ref $results; # that doesn't look right. @@ -59,7 +59,7 @@ } sub get_meta_name_limits { - my ( $results ) = @_; + my( $results ) = @_; my $metanames = $results->config('metanames'); return '' unless $metanames; @@ -81,7 +81,7 @@ } sub get_sort_select_list { - my ( $results ) = @_; + my( $results ) = @_; my $sort_metas = $results->config('sorts'); return '' unless $sort_metas; @@ -110,7 +110,7 @@ sub get_index_select_list { - my ( $results ) = @_; + my( $results ) = @_; my $q = $results->CGI; @@ -152,7 +152,7 @@ sub get_limit_select { - my ( $results ) = @_; + my( $results ) = @_; my $q = $results->CGI; @@ -177,7 +177,7 @@ } sub get_limit_select_tree { - my ( $results ) = @_; + my( $results ) = @_; my $limit = $results->config('select_by_meta'); return {} unless ref $limit eq 'HASH'; Index: src/search/modules/PhraseTest.pm =================================================================== --- src/search/modules/PhraseTest.pm (revision 219272) +++ src/search/modules/PhraseTest.pm (working copy) @@ -113,7 +113,7 @@ sub header { - my ( $self, $value ) = @_; + my( $self, $value ) = @_; my %values = ( wordcharacters => 'abcdefghijklmnopqrstuvwxyz-,.', @@ -127,7 +127,7 @@ } sub config { - my ($self, $setting, $value ) = @_; + my($self, $setting, $value ) = @_; croak "Failed to pass 'config' a setting" unless $setting; @@ -159,7 +159,7 @@ # # copyright 2001 - Bill Moseley boothjason@example.com # -# $Id: PhraseTest.pm,v 1.1 2002/01/30 06:35:00 stas Exp $ +# $Id$ #======================================================================= package PhraseHighlight; use strict; @@ -167,7 +167,7 @@ use constant DEBUG_HIGHLIGHT => 0; sub new { - my ( $class, $results, $metaname ) = @_; + my( $class, $results, $metaname ) = @_; my $self = bless { results => $results, # just in case we need a method @@ -211,7 +211,7 @@ } sub highlight { - my ( $self, $properties ) = @_; + my( $self, $properties ) = @_; return unless $self->{query}; @@ -255,7 +255,7 @@ sub highlight_text { - my ( $self, $text_ref, $phrase_array ) = @_; + my( $self, $text_ref, $phrase_array ) = @_; my $wc_regexp = $self->{wc_regexp}; my $extract_regexp = $self->{extract_regexp}; @@ -312,7 +312,7 @@ # now compare all the words in the phrase - my ( $begin, $word, $end ); + my( $begin, $word, $end ); for my $match_word ( @$phrase ) { @@ -320,7 +320,7 @@ unless ( $cur_word =~ /$extract_regexp/ ) { my $idx = ($word_pos + $end_pos) * 2; - my ( $s, $e ) = ( $idx - 10, $idx + 10 ); + my( $s, $e ) = ( $idx - 10, $idx + 10 ); $s = 0 if $s < 0; $e = @words-1 if $e >= @words; @@ -446,7 +446,7 @@ # Split the source text into swish and non-swish words sub split_by_wordchars { - my ( $self, $words, $text_ref ) = @_; + my( $self, $words, $text_ref ) = @_; my $wc_regexp = $self->{wc_regexp}; @$words = split /$wc_regexp/, $$text_ref; @@ -457,7 +457,7 @@ # Put all the words together for display # sub build_highlighted_text { - my ( $self, $output, $words, $flags, $last ) = @_; + my( $self, $output, $words, $flags, $last ) = @_; my $dotdotdot = ' ... '; @@ -515,13 +515,13 @@ #================================================================== # sub join_words { - my ( $self, $output, $text_ref ) = @_; + my( $self, $output, $text_ref ) = @_; $$text_ref = join '', @$output; } sub escape_entities { - my ( $self, $text_ref ) = @_; + my( $self, $text_ref ) = @_; my %entities = ( '&' => '&amp;', @@ -536,7 +536,7 @@ # replace the highlight codes sub substitue_highlight { - my ( $self, $text_ref, $on_flag, $off_flag ) = @_; + my( $self, $text_ref, $on_flag, $off_flag ) = @_; my $settings = $self->{settings}; my $On = $settings->{highlight_on} || '<b>'; Index: src/search/checkboxes.storable =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: src/search/swish.cgi =================================================================== --- src/search/swish.cgi (revision 219272) +++ src/search/swish.cgi (working copy) @@ -18,7 +18,7 @@ # # To display documentation for this program type "perldoc swish.cgi" # -# swish.cgi $Revision: 1.9 $ Copyright (C) 2001 Bill Moseley boothjason@example.com +# swish.cgi $Revision$ Copyright (C) 2001 Bill Moseley boothjason@example.com # Example CGI program for searching with SWISH-E # # This example program will only run under an OS that supports fork(). @@ -37,7 +37,7 @@ # # The above lines must remain at the top of this program # -# $Id: swish.cgi,v 1.9 2002/07/01 05:08:43 moseley Exp $ +# $Id$ # #################################################################################### @@ -755,7 +755,7 @@ sub hits { shift->{hits} } sub config { - my ($self, $setting, $value ) = @_; + my($self, $setting, $value ) = @_; croak "Failed to pass 'config' a setting" unless $setting; @@ -805,7 +805,7 @@ sub errstr { - my ($self, $value ) = @_; + my($self, $value ) = @_; $self->{_errstr} = $value if $value; @@ -1062,7 +1062,7 @@ sub get_date_limits { - my ( $self, $query_ref ) = @_; + my( $self, $query_ref ) = @_; my $conf = $self->{config}; @@ -1174,7 +1174,7 @@ sub set_page { - my ( $self, $Page_Size ) = @_; + my( $self, $Page_Size ) = @_; my $q = $self->{q}; @@ -1460,7 +1460,7 @@ use Symbol; sub real_fork { - my ( $conf, $self ) = @_; + my( $conf, $self ) = @_; # Run swish @@ -1495,7 +1495,7 @@ # from perldoc perlfok -- na, that doesn't work. Try IP888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Open2 # sub windows_fork { - my ( $conf, $self ) = @_; + my( $conf, $self ) = @_; if ( $conf->{debug} & $SwishSearch888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UG_COMMAND ) { print STDERR "---- Running swish with the following command and parameters ----\n"; @@ -1505,7 +1505,7 @@ require IP888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Open2; - my ( $rdrfh, $wtrfh ); + my( $rdrfh, $wtrfh ); # Ok, I'll say it. Windows sucks. my @command = map { s/"/\\"/g; $_ } $self->{prog}, $self->swish_command; @@ -1547,7 +1547,7 @@ while ( $query =~ /([a-z]+)\s+=\s+(.+?)(?=\s+[a-z]+\s+=|$)/g ) { - my ( $field, $words ) = ( $1, $2 ); + my( $field, $words ) = ( $1, $2 ); my $inquotes; @@ -2533,7 +2533,7 @@ =head1 LICENSE -swish.cgi $Revision: 1.9 $ Copyright (C) 2001 Bill Moseley boothjason@example.com +swish.cgi $Revision$ Copyright (C) 2001 Bill Moseley boothjason@example.com Example CGI program for searching with SWISH-E Index: src/about/contributors/make.pl =================================================================== --- src/about/contributors/make.pl (revision 219272) +++ src/about/contributors/make.pl (working copy) @@ -123,7 +123,7 @@ } sub small_list { - my ($file, $tmpl, $out) = @_; + my($file, $tmpl, $out) = @_; print "+++ Processing $file\n"; Index: bin/site_build =================================================================== --- bin/site_build (revision 219272) +++ bin/site_build (working copy) @@ -80,11 +80,11 @@ # get available disk space my $disk = qx{ df | grep $fs{$hostname} }; - my ($disk_avail) = ($disk =~ /(\d+)\s+\d+\%/); # avail is before capacity + my($disk_avail) = ($disk =~ /(\d+)\s+\d+\%/); # avail is before capacity # get size of site my $site = qx{ du -c $rel | grep total }; - my ($site_size) = ($site =~ /^(\d+)/); + my($site_size) = ($site =~ /^(\d+)/); # give us a margin of 50MB return 0 unless $site_size + 50*1024 > $disk_avail; --------------010808070804010708090406 Content-Type: text/plain; charset=us-ascii --------------------------------------------------------------------- To unsubscribe, e-mail: boothjason@example.com For additional commands, e-mail: boothjason@example.com --------------010808070804010708090406-- From docsboothjason@example.com Mon Aug 29 17:45:23 2005 Return-Path: <docsboothjason@example.com> Delivered-To: boothjason@example.com Received: (qmail 27640 invoked from network); 29 Aug 2005 17:45:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 29 Aug 2005 17:45:23 -0000 Received: (qmail 24222 invoked by uid 500); 29 Aug 2005 17:45:22 -0000 Delivered-To: boothjason@example.com Received: (qmail 24197 invoked by uid 500); 29 Aug 2005 17:45:22 -0000 Mailing-List: contact boothjason@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:boothjason@example.com> List-Help: <mailto:boothjason@example.com> List-Unsubscribe: <mailto:boothjason@example.com> List-Id: <docs-dev.perl.apache.org> Delivered-To: mailing list boothjason@example.com Received: (qmail 24184 invoked by uid 99); 29 Aug 2005 17:45:22 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2005 10:45:22 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO mail.logilune.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2005 10:45:35 -0700 Received: from [83.161.120.155] (localhost.logilune.com [83.161.120.155]) by mail.logilune.com (Postfix) with ESMTP id 8626ED6ECF; Mon, 29 Aug 2005 19:45:12 +0200 (CEST) Message-ID: <boothjason@example.com> Date: Mon, 29 Aug 2005 10:45:26 -0700 From: Stas Bekman <boothjason@example.com> Organization: Hope, Humanized User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.11) Gecko/20050730 X-Accept-Language: en-us, en, he, ru MIME-Version: 1.0 To: "Philip M. Gollucci" <boothjason@example.com> CC: boothjason@example.com, Bill Moseley <boothjason@example.com> Subject: Re: Style update part II References: <boothjason@example.com> In-Reply-To: <boothjason@example.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Philip M. Gollucci wrote: > The corresponding update for the docs tree > > my ( > vs > my( > > note, there are some cases of > my ( $var > that this changes to > my( $var > whats the opinion on those ? > > See attached. DocSet (the stuff under lib/) is not part of the modperl-docs. It's there just to make the docs repository self-contained. It's actually living on my machine and it's a CPAN module. So I'll need to apply this to my repository first and then I'll resync the convenience copy under lib next. +1 to the most of the rest. See some comments below: While you are at it, please add more spaces as follows: Index: src/docs/2.0/devel/core/coding_style.pod =================================================================== --- src/docs/2.0/devel/core/coding_style.pod (revision 219272) +++ src/docs/2.0/devel/core/coding_style.pod (working copy) @@ -93,7 +93,7 @@ sub foo { -
{'source': 'Apache Software Foundation Public Mail Archives'}