from:"pgollucci"

svn commit: r219840 - /perl/modperl/trunk/t/apache/content_length_header.t

2005-07-19 Thread pgollucci

Author: pgollucci
Date: Tue Jul 19 22:20:22 2005
New Revision: 219840

URL: http://svn.apache.org/viewcvs?rev=219840&view=rev
Log:
Stop skipping this test
  2.1.x now matches 2.0.x in its handling of C-L 


Modified:
perl/modperl/trunk/t/apache/content_length_header.t

Modified: perl/modperl/trunk/t/apache/content_length_header.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/content_length_header.t?rev=219840&r1=219839&r2=219840&view=diff
==
--- perl/modperl/trunk/t/apache/content_length_header.t (original)
+++ perl/modperl/trunk/t/apache/content_length_header.t Tue Jul 19 22:20:22 2005
@@ -5,11 +5,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest;
 
-my $skip = have_min_apache_version(2.1) ?
-skip_reason('investigating 2.1 C-L behaviors') :
-1;
-
-plan tests => 12 * 2 + 3, $skip;
+plan tests => 12 * 2 + 3;
 
 my $location = "/TestApache__content_length_header";
 
@@ -47,9 +43,9 @@
 my $uri = $location;
 my $res = $method->($uri);
 
-my $cl  = have_min_apache_version(2.1) ? undef : 0;
-my $head_cl = have_min_apache_version(2.1) ? $cl : undef;
-   
+my $cl  = 0;
+my $head_cl = undef;
+
 ok t_cmp $res->code, 200, "$method $uri code";
 ok t_cmp ($res->header('Content-Length'),
   $method eq 'GET' ? $cl : $head_cl,
@@ -68,8 +64,8 @@
 my $uri = "$location?set_content_length";
 my $res = $method->($uri);
 
-my $cl  = have_min_apache_version(2.1) ? 25 : 0;
-my $head_cl = have_min_apache_version(2.1) ? $cl : undef;
+my $cl  = 0;
+my $head_cl = undef;

 ok t_cmp $res->code, 200, "$method $uri code";
 ok t_cmp ($res->header('Content-Length'),

svn commit: r220234 - /perl/modperl/trunk/todo/bugs_build

2005-07-21 Thread pgollucci

Author: pgollucci
Date: Thu Jul 21 21:02:16 2005
New Revision: 220234

URL: http://svn.apache.org/viewcvs?rev=220234&view=rev
Log:
update FreeBSD thread info

Modified:
perl/modperl/trunk/todo/bugs_build

Modified: perl/modperl/trunk/todo/bugs_build
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/todo/bugs_build?rev=220234&r1=220233&r2=220234&view=diff
==
--- perl/modperl/trunk/todo/bugs_build (original)
+++ perl/modperl/trunk/todo/bugs_build Thu Jul 21 21:02:16 2005
@@ -28,14 +28,15 @@
 but doesn't start with worker:
 http://marc.theaimsgroup.com/?t=10689490623&r=1&w=2
 
-FreeBSD ??  DSO Works with non-threaded perl (4.8-RELEASE and
-5.1-RELEASE)
+FreeBSD ??  DSO Works with non-threaded perl (4.8-RELEASE-5.2-RELEASE, 
6.0-CURRENT)
 
http://marc.theaimsgroup.com/?l=apache-modperl&m=106399870822612&w=2
-It doesn't work with threaded perl/worker mpm,
-seemingly because of the problems with threads on
-FreeBSD (not sure what version). But reported to work
-on FreeBSD 5.3+ when linked with libpthread and not
-the older libc_r library.
+The following combo is known to work:
+  http://gossamer-threads.com/lists/modperl/modperl/82887  
+  FreeBSD 5.4-RELEASE
+  gcc 3.4.2
+  perl 5.8.7 WITH ithreads
+  httpd 2.0.54 apr IS THREADED (worker mpm)
+  mod_perl2.0.1 
 
 HPUX11i DSO
 PA-RISC2.0-thread-multi-LP64

svn commit: r224475 - /perl/modperl/trunk/todo/apache2_rename

2005-07-23 Thread pgollucci

Author: pgollucci
Date: Sat Jul 23 09:30:16 2005
New Revision: 224475

URL: http://svn.apache.org/viewcvs?rev=224475&view=rev
Log:
removing... its done!

Removed:
perl/modperl/trunk/todo/apache2_rename

svn commit: r230948 - /perl/modperl/trunk/todo/bugs_build

2005-08-08 Thread pgollucci

Author: pgollucci
Date: Mon Aug  8 18:39:48 2005
New Revision: 230948

URL: http://svn.apache.org/viewcvs?rev=230948&view=rev
Log:
mark some things I'm working on

Modified:
perl/modperl/trunk/todo/bugs_build

Modified: perl/modperl/trunk/todo/bugs_build
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/todo/bugs_build?rev=230948&r1=230947&r2=230948&view=diff
==
--- perl/modperl/trunk/todo/bugs_build (original)
+++ perl/modperl/trunk/todo/bugs_build Mon Aug  8 18:39:48 2005
@@ -71,6 +71,7 @@
   by default gcc doesn't complain about them. Probably need to wait
   till gcc-3.3.2 and enable it then.
   
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ChangeLog.diff?r1=2.639&r2=2.640&f=h
+[pgollucci volunteers]
 
 
 * Testing:
@@ -78,6 +79,7 @@
   -- shouldn't forget to test with perlio enabled and disabled
 
 * mp2bug -- add the output of 'ldd httpd' to the report
+[pgollucci volunteers]
 
 * source_scan won't create Wrap/Foo/Bar.xs if
   xs/maps/modperl_functions.map defines only a boot section:

svn commit: r235745 - in /perl/modperl/trunk: Changes lib/Apache2/Reload.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 09:24:55 2005
New Revision: 235745

URL: http://svn.apache.org/viewcvs?rev=235745&view=rev
Log:
Sort the output of ReloadDebug alphabetically

Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Reload.pm

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=235745&r1=235744&r2=235745&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon Aug 22 09:24:55 2005
@@ -12,6 +12,9 @@
 
 =item 2.0.2-dev
 
+When using Apache2::Reload andReloadDebug is set to 'On' 
+sort the output alphabetically [pgollucci]
+
 croak in case a filter returns DECLINED after calling $f->read (as it
 is not supposed to happen) [Stas]
 

Modified: perl/modperl/trunk/lib/Apache2/Reload.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Reload.pm?rev=235745&r1=235744&r2=235745&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Reload.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Reload.pm Mon Aug 22 09:24:55 2005
@@ -131,7 +131,9 @@
 
 my $ReloadDirs = ref($o) && $o->dir_config("ReloadDirectories");
 my @watch_dirs = split(/\s+/, $ReloadDirs||'');
-while (my($key, $file) = each %Apache2::Reload::INCS) {
+foreach my $key (sort { $a cmp $b } keys %Apache2::Reload::INCS) {
+my $file = $Apache2::Reload::INCS{$key};
+
 next unless defined $file;
 next if @watch_dirs && !grep { $file =~ /^$_/ } @watch_dirs;
 warn "Apache2::Reload: Checking mtime of $key\n" if $DEBUG;

svn commit: r239283 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 18:24:12 2005
New Revision: 239283

URL: http://svn.apache.org/viewcvs?rev=239283&view=rev
Log:
Fix the Peek Dump link

Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239283&r1=239282&r2=239283&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon Aug 22 18:24:12 2005
@@ -66,7 +66,7 @@
 terse   => ["StatusTerse",   "B::Terse",   0,],
 tersesize   => ["StatusTerseSize",   "B::TerseSize",   0,],
 packagesize => ["StatusPackageSize", "B::TerseSize",   0,],
-peek=> ["StatusPeek","Apache2::Peek",   0,], # XXX: 
version?
+peek=> ["StatusPeek","Apache::Peek",   1.03, ],
 );
 
 sub has {
@@ -649,7 +649,7 @@
 my($name, $type) = (split "/", $r->uri)[-2,-1];
 $type =~ s/^FUNCTION$/CODE/;
 $r->print("Peek Dump of $name $type\n\n");
-Apache2::Peek::Dump(*{$name}{$type});
+Apache::Peek::Dump(*{$name}{$type});
 }
 
 sub xref_link {

svn commit: r239285 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 18:38:49 2005
New Revision: 239285

URL: http://svn.apache.org/viewcvs?rev=239285&view=rev
Log:
B::Terse is depracted in favor of B::Concise.

B::Terse is left around, but as a wrapper around B::Concise
with style -terse.

B::Concise doesn't handle 'slow'.  The replacement is basic.

B::Concise take '-arg' rather then 'arg' as aruments.

This fixes the Syntax Tree Dump (syntax order)
link in status_cv_dump().


Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239285&r1=239284&r2=239285&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon Aug 22 18:38:49 2005
@@ -468,7 +468,7 @@
 $r->print(${ $lexi->dumper($info) });
 }
 
-my %b_terse_exp = ('slow' => 'syntax', 'exec' => 'execution');
+my %b_terse_exp = ('slow' => 'syntax', 'exec' => 'execution', basic => 
'syntax');
 
 sub b_terse_link {
 my($r, $name) = @_;
@@ -477,7 +477,7 @@
 
 my $script = $r->location;
 my @retval;
-for (qw(exec slow)) {
+for (qw(exec basic)) {
 my $exp = "$b_terse_exp{$_} order";
 push @retval,
 qq(\nSyntax Tree Dump 
($exp)\n);
@@ -498,9 +498,10 @@
 # XXX: blead perl dumps things to STDERR, though the same version
 # works fine with 1.27
 # B::Concise couldn't parse XS code before perl patch 24681 (perl 5.9.3)
-eval { B::Terse::compile($arg, $name)->() };
+# B::Terse is deprecated and just a wrapper around B::Concise now adays
+eval { B::Concise::compile("-terse", "-$arg", $name)->() };
 if ($@) {
-$r->print("B::Terse has failed: $@");
+$r->print("B::Concise has failed: $@");
 }
 }

svn commit: r239288 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 18:48:12 2005
New Revision: 239288

URL: http://svn.apache.org/viewcvs?rev=239288&view=rev
Log:
Uncomment the Cross Reference Report Link in status_cv_dump() 
This depends on B::Xref which does not come with perl.
I've seen v1.01 work so we'll set that as the minium for now.

Also add StatusXref as option to turn this feature on/off.


Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239288&r1=239287&r2=239288&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon Aug 22 18:48:12 2005
@@ -62,7 +62,7 @@
 b   => ["",  "B",  0,],
 graph   => ["StatusGraph",   "B::Graph",   0.03, ],
 lexinfo => ["StatusLexInfo", "B::LexInfo", 0,],
-xref=> ["",  "B::Xref",0,],
+xref=> ["StatusXref","B::Xref",1.01, ],
 terse   => ["StatusTerse",   "B::Terse",   0,],
 tersesize   => ["StatusTerseSize",   "B::TerseSize",   0,],
 packagesize => ["StatusPackageSize", "B::TerseSize",   0,],
@@ -434,8 +434,8 @@
 push @retval, "Prototype: ", $proto || "none", "\n";
 push @retval, "XSUB: ",  $obj->XSUB ? "yes" : "no", "\n";
 push @retval, peek_link($r, $name, $type);
-#push @retval, xref_link($r, $name);
 push @retval, b_graph_link($r, $name);
+push @retval, xref_link($r, $name) if has($r, "xref");
 push @retval, b_lexinfo_link($r, $name);
 push @retval, b_terse_link($r, $name);
 push @retval, b_terse_size_link($r, $name);

svn commit: r239290 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 18:57:37 2005
New Revision: 239290

URL: http://svn.apache.org/viewcvs?rev=239290&view=rev
Log:
this has("xref") check is already in the link function

Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239290&r1=239289&r2=239290&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon Aug 22 18:57:37 2005
@@ -435,7 +435,7 @@
 push @retval, "XSUB: ",  $obj->XSUB ? "yes" : "no", "\n";
 push @retval, peek_link($r, $name, $type);
 push @retval, b_graph_link($r, $name);
-push @retval, xref_link($r, $name) if has($r, "xref");
+push @retval, xref_link($r, $name);
 push @retval, b_lexinfo_link($r, $name);
 push @retval, b_terse_link($r, $name);
 push @retval, b_terse_size_link($r, $name);

svn commit: r239295 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 19:31:59 2005
New Revision: 239295

URL: http://svn.apache.org/viewcvs?rev=239295&view=rev
Log:
enhance the error handling for the Op Tree Graph link
which requires B::Graph and dot to be installed.

Previously, if dot wasn't found you got a 404 error.  Now, you get
a regular webpage with error message and and entry in the server error_log.


Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239295&r1=239294&r2=239295&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon Aug 22 19:31:59 2005
@@ -707,9 +707,15 @@
 my $file = "$dir/$thing.$$.gif";
 
 unless (-e $file) {
-tie *STDOUT, "B::Graph", $r, $file;
-B::Graph::compile("-$type", $thing)->();
-(tied *STDOUT)->{graph}->close;
+my $rv = tie *STDOUT, "B::Graph", $r, $file;
+unless ($rv) {
+$r->content_type("text/plain");
+$r->print("dot not found\n");
+}
+else {
+B::Graph::compile("-$type", $thing)->();
+(tied *STDOUT)->{graph}->close;
+}
 }
 
 if (-s $file) {
@@ -745,13 +751,17 @@
 
 require IO::File;
 my $pipe = IO::File->new("|$dot -Tgif -o $file");
-$pipe or die "can't open pipe to dot $!";
-$pipe->autoflush(1);
+$pipe && $pipe->autoflush(1);
 
-return bless {
-  graph => $pipe,
-  r => $r,
-}, $class;
+if ($pipe) {
+return bless {
+graph => $pipe,
+r => $r,
+}, $class;
+}
+else {
+return;
+}
 }
 
 sub B::Graph::PRINT {

svn commit: r239297 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 19:43:20 2005
New Revision: 239297

URL: http://svn.apache.org/viewcvs?rev=239297&view=rev
Log:
Add Kb and Mb calcutation of opsize

Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239297&r1=239296&r2=239297&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon Aug 22 19:43:20 2005
@@ -556,7 +556,9 @@
 my $script = $r->location;
 $r->print("Memory Usage for package $package\n\n");
 my($subs, $opcount, $opsize) = B::TerseSize::package_size($package);
-$r->print("Totals: $opsize bytes | $opcount OPs\n\n");
+my $Kb = sprintf "%.2f", $opsize / 1024;
+my $Mb = sprintf "%.2f", $Kb / 1000;
+$r->print("Totals: $opsize bytes, $Kb Kb, $Mb Mb | $opcount OPs\n\n");
 
 my $nlen = 0;
 my @keys = map {

svn commit: r239299 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 19:52:38 2005
New Revision: 239299

URL: http://svn.apache.org/viewcvs?rev=239299&view=rev
Log:
Sort the Links alphabetically so that they show up in the same order
all the time

Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239299&r1=239298&r2=239299&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon Aug 22 19:52:38 2005
@@ -133,7 +133,7 @@
 my $uri = $r->uri;
 $r->print('');
 $r->print(
-map { qq[$status{$_}\n] } keys %status
+map { qq[$status{$_}\n] } sort { lc $a 
cmp lc $b } keys %status
 );
 $r->print('');
 }

svn commit: r239301 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 19:56:24 2005
New Revision: 239301

URL: http://svn.apache.org/viewcvs?rev=239301&view=rev
Log:
hooks has not been in mp2 version to date.  Time to remove it.

Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239301&r1=239300&r2=239301&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon Aug 22 19:56:24 2005
@@ -42,11 +42,7 @@
 env   => "Environment",
 sig   => "Signal Handlers",
 myconfig  => "Perl Configuration",
-hooks => "Enabled mod_perl Hooks",
 );
-# XXX: is $status{hooks} supported with any mp2 version?
-# If not, why not just remove it from the above initialization?
-delete $status{'hooks'} if $mod_perl2::VERSION >= 1.9901;
 delete $status{'sig'} if IS_WIN32;
 
 # XXX: needs porting
@@ -195,22 +191,6 @@
 my($r) = @_;
 require Apache2::PerlSections;
 ["", Apache2::PerlSections->dump, ""];
-}
-
-sub status_hooks {
-my($r) = @_;
-# XXX: hooks list access doesn't exist yet in 2.0
-require mod_perl;
-require mod_perl_hooks;
-my @retval = qw();
-my @list = mod_perl::hooks();
-for my $hook (sort @list) {
-my $on_off = 
-mod_perl::hook($hook) ? "Enabled" : "Disabled";
-push @retval, "$hook$on_off\n";
-}
-push @retval, qw();
-[EMAIL PROTECTED];
 }
 
 sub status_inc {

svn commit: r239306 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 20:06:23 2005
New Revision: 239306

URL: http://svn.apache.org/viewcvs?rev=239306&view=rev
Log:
update the output to XHTML 1.0 Strict

Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239306&r1=239305&r2=239306&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon Aug 22 20:06:23 2005
@@ -129,7 +129,7 @@
 my $uri = $r->uri;
 $r->print('');
 $r->print(
-map { qq[$status{$_}\n] } sort { lc $a 
cmp lc $b } keys %status
+map { qq[$status{$_}\n] } sort { lc $a 
cmp lc $b } keys %status
 );
 $r->print('');
 }
@@ -145,28 +145,30 @@
 $r->content_type("text/html");
 my $v = $^V ? sprintf "v%vd", $^V : $];
 $r->print(<<"EOF");
-
-
-
-  Apache2::Status
-  
-  body {
-color: #000;
-background-color: #fff;
-  }
-  p.hdr {
-background-color: #ddd;
-border: 2px outset;
-padding: 3px;
-width: 99%;
-  }
-  
-
-
-
-  Embedded Perl version $v for $srv process $$,
-  running since $start
-
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+
+http://www.w3.org/1999/xhtml";>
+  
+Apache2::Status $Apache2::Status::VERSION
+
+  body {
+color: #000;
+background-color: #fff;
+  }
+  p.hdr {
+background-color: #ddd;
+border: 2px outset;
+padding: 3px;
+width: 99%;
+ }
+   
+  
+  
+
+  Embedded Perl version $v for $srv process $$,
+  running since $start
+
 EOF
 
 }
@@ -223,7 +225,7 @@
 );
 }
 push @retval, "\n";
-push @retval, "[EMAIL PROTECTED] = ", join "\n", @INC, 
"";
+push @retval, "[EMAIL PROTECTED] = ", join "\n", 
@INC, "";
 [EMAIL PROTECTED];
 }
 
@@ -298,7 +300,7 @@
 push @retval, "$handler:\n\n";
 for (sort @{ $handlers{$handler} }) {
 my $full = join '::', $root, $handler, $_;
-push @retval, qq($_\n), "";
+push @retval, qq($_\n), "";
 }
 push @retval, "\n";
 }

svn commit: r239307 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 20:07:32 2005
New Revision: 239307

URL: http://svn.apache.org/viewcvs?rev=239307&view=rev
Log:
update the version number to 4.0 to reflect all my recent changes

Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239307&r1=239306&r2=239307&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon Aug 22 20:07:32 2005
@@ -28,7 +28,7 @@
 
 use Apache2::Const -compile => qw(OK);
 
-$Apache2::Status::VERSION = '3.00'; # mod_perl 2.0
+$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0
 
 use constant IS_WIN32 => ($^O eq "MSWin32");

svn commit: r239312 - /perl/modperl/trunk/Changes

2005-08-22 Thread pgollucci

Author: pgollucci
Date: Mon Aug 22 20:20:49 2005
New Revision: 239312

URL: http://svn.apache.org/viewcvs?rev=239312&view=rev
Log:
Apache2::Status fixes

Modified:
perl/modperl/trunk/Changes

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=239312&r1=239311&r2=239312&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon Aug 22 20:20:49 2005
@@ -12,6 +12,9 @@
 
 =item 2.0.2-dev
 
+Several fixes to Apache2::Status
+[pgollucci]
+
 When using Apache2::Reload and ReloadDebug is set to 'On', 
 sort the output alphabetically [pgollucci]

svn commit: r239505 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-08-23 Thread pgollucci

Author: pgollucci
Date: Tue Aug 23 18:51:33 2005
New Revision: 239505

URL: http://svn.apache.org/viewcvs?rev=239505&view=rev
Log:
Perl Sections work

Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=239505&r1=239504&r2=239505&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Tue Aug 23 18:51:33 2005
@@ -45,7 +45,6 @@
 );
 delete $status{'sig'} if IS_WIN32;
 
-# XXX: needs porting
 if ($Apache2::PerlSections::Save) {
 $status{"section_config"} = "Perl Section Configuration";
 }

svn commit: r239724 - /perl/modperl/trunk/lib/Apache2/Build.pm

2005-08-24 Thread pgollucci

Author: pgollucci
Date: Wed Aug 24 11:18:19 2005
New Revision: 239724

URL: http://svn.apache.org/viewcvs?rev=239724&view=rev
Log:
check $ccopts for -Wdeclaration-after-statement
if not already present and the gcc version supports its (3.3.2+)
add it


Modified:
perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=239724&r1=239723&r2=239724&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Wed Aug 24 11:18:19 2005
@@ -523,6 +523,12 @@
 $ccopts .= " $Wall -DAP_DEBUG";
 $ccopts .= " -DAP_HAVE_DESIGNATED_INITIALIZER";
 }
+
+if ($self->has_gcc_version('3.3.2') && 
+$ccopts !~ /declaration-after-statement/) {
+debug "Adding -Wdeclaration-after-statement to ccopts";
+$ccopts .= " -Wdeclaration-after-statement";
+}
 }
 
 if ($self->{MP_COMPAT_1X}) {
@@ -555,6 +561,33 @@
 $ccopts;
 }
 
+sub has_gcc_version {
+
+my $self = shift;
+my $requested_version = shift;
+
+my $has_version = $self->perl_config('gccversion');
+
+return 0 unless $has_version;
+
+my @tuples = split /\./, $has_version, 3;
+my @r_tuples = split /\./, $requested_version, 3;
+
+return cmp_tuples([EMAIL PROTECTED], [EMAIL PROTECTED]) == 1;
+}
+
+sub cmp_tuples {
+
+my($a, $b) = @_;
+
+while (@$a && @$b) {
+my $cmp = shift @$a <=> shift @$b;
+return $cmp if $cmp;
+}
+
+return @$a <=> @$b;
+}
+
 sub perl_ccopts {
 my $self = shift;

svn commit: r239725 - /perl/modperl/trunk/todo/bugs_build

2005-08-24 Thread pgollucci

Author: pgollucci
Date: Wed Aug 24 11:18:50 2005
New Revision: 239725

URL: http://svn.apache.org/viewcvs?rev=239725&view=rev
Log:
its done

Modified:
perl/modperl/trunk/todo/bugs_build

Modified: perl/modperl/trunk/todo/bugs_build
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/todo/bugs_build?rev=239725&r1=239724&r2=239725&view=diff
==
--- perl/modperl/trunk/todo/bugs_build (original)
+++ perl/modperl/trunk/todo/bugs_build Wed Aug 24 11:18:50 2005
@@ -65,15 +65,6 @@
   xs/modperl_xs*.h, when the latter change 'make' won't rebuild the
   dependant files
 
-* gcc 3.3 (from cvs 2003-07-28) supports a new option:
-  -Wdeclaration-after-statement, which we need to enable in the
-  maintainer mode, to catch any declarations after statements, since
-  by default gcc doesn't complain about them. Probably need to wait
-  till gcc-3.3.2 and enable it then.
-  
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ChangeLog.diff?r1=2.639&r2=2.640&f=h
-[pgollucci volunteers]
-
-
 * Testing:
   Need to put Philippe's smoking test into the core
   -- shouldn't forget to test with perlio enabled and disabled

svn commit: r239728 - /perl/modperl/trunk/Changes

2005-08-24 Thread pgollucci

Author: pgollucci
Date: Wed Aug 24 11:27:42 2005
New Revision: 239728

URL: http://svn.apache.org/viewcvs?rev=239728&view=rev
Log:
note the new -Wdeclaration-after-statement 

Modified:
perl/modperl/trunk/Changes

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=239728&r1=239727&r2=239728&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Wed Aug 24 11:27:42 2005
@@ -12,11 +12,16 @@
 
 =item 2.0.2-dev
 
+When running Makefile.PL with the MP_MAINTAINER=1 option
+add -Wdeclaration-after-statement if we are using gcc
+version 3.3.2 or higher and its not already part of the ccopts.
+[Philip M. Gollucci, Gozer]
+
 Several fixes to Apache2::Status
-[pgollucci]
+[Philip M. Gollucci]
 
 When using Apache2::Reload and ReloadDebug is set to 'On', 
-sort the output alphabetically [pgollucci]
+sort the output alphabetically [Philip M. Gollucci]
 
 croak in case a filter returns DECLINED after calling $f->read (as it
 is not supposed to happen) [Stas]

svn commit: r239729 - in /perl/modperl/trunk: Changes Makefile.PL

2005-08-24 Thread pgollucci

Author: pgollucci
Date: Wed Aug 24 11:33:22 2005
New Revision: 239729

URL: http://svn.apache.org/viewcvs?rev=239729&view=rev
Log:
Fix undefined variable warning in DSO builds when using MP_APXS.

Submitted: Nikolay Ananiev <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>

Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/Makefile.PL

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=239729&r1=239728&r2=239729&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Wed Aug 24 11:33:22 2005
@@ -12,6 +12,9 @@
 
 =item 2.0.2-dev
 
+Fix an undefined warning in DSO builds when not using MP_APXS.
+[Nikolay Ananiev <[EMAIL PROTECTED]>]
+
 When running Makefile.PL with the MP_MAINTAINER=1 option
 add -Wdeclaration-after-statement if we are using gcc
 version 3.3.2 or higher and its not already part of the ccopts.

Modified: perl/modperl/trunk/Makefile.PL
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?rev=239729&r1=239728&r2=239729&view=diff
==
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Wed Aug 24 11:33:22 2005
@@ -393,9 +393,13 @@
 "You'll need to add the following to httpd.conf:","",
 "  LoadModule perl_module modules/$build->{MODPERL_LIB_DSO}", "",
 "depending on your build, mod_perl might not live in",
-"the modules/ directory - check the results of",  "",
-"  \$ $build->{MP_APXS} -q LIBEXECDIR",   "",
-"and adjust the LoadModule directive accordingly.\n";
+"the modules/ directory.\n";
+if ($build->{MP_APXS}) {
+warning 
+"Check the results of",   "",
+"  \$ $build->{MP_APXS} -q LIBEXECDIR",   "",
+"and adjust the LoadModule directive accordingly.\n";
+}
 }
 
 $build->save;

svn commit: r239915 - /perl/modperl/trunk/lib/Apache2/Build.pm

2005-08-24 Thread pgollucci

Author: pgollucci
Date: Wed Aug 24 13:20:13 2005
New Revision: 239915

URL: http://svn.apache.org/viewcvs?rev=239915&view=rev
Log:
style fixes

Modified:
perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=239915&r1=239914&r2=239915&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Wed Aug 24 13:20:13 2005
@@ -562,7 +562,6 @@
 }
 
 sub has_gcc_version {
-
 my $self = shift;
 my $requested_version = shift;
 
@@ -577,7 +576,6 @@
 }
 
 sub cmp_tuples {
-
 my($a, $b) = @_;
 
 while (@$a && @$b) {

svn commit: r239919 - /perl/modperl/trunk/lib/Apache2/Build.pm

2005-08-24 Thread pgollucci

Author: pgollucci
Date: Wed Aug 24 13:42:53 2005
New Revision: 239919

URL: http://svn.apache.org/viewcvs?rev=239919&view=rev
Log:
s/$a/$num_a/g
s/$b/$num_b/g
to avoid conflicting with the special lexicals $a, $b

Modified:
perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=239919&r1=239918&r2=239919&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Wed Aug 24 13:42:53 2005
@@ -576,14 +576,14 @@
 }
 
 sub cmp_tuples {
-my($a, $b) = @_;
+my($num_a, $num_b) = @_;
 
-while (@$a && @$b) {
-my $cmp = shift @$a <=> shift @$b;
+while (@$num_a && @$num_b) {
+my $cmp = shift @$num_a <=> shift @$num_b;
 return $cmp if $cmp;
 }
 
-return @$a <=> @$b;
+return @$num_a <=> @$num_b;
 }
 
 sub perl_ccopts {

svn commit: r266252 - /perl/modperl/trunk/lib/Apache2/PerlSections/Dump.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:18:53 2005
New Revision: 266252

URL: http://svn.apache.org/viewcvs?rev=266252&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/Apache2/PerlSections/Dump.pm

Modified: perl/modperl/trunk/lib/Apache2/PerlSections/Dump.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/PerlSections/Dump.pm?rev=266252&r1=266251&r2=266252&view=diff
==
--- perl/modperl/trunk/lib/Apache2/PerlSections/Dump.pm (original)
+++ perl/modperl/trunk/lib/Apache2/PerlSections/Dump.pm Thu Sep  1 21:18:53 2005
@@ -54,12 +54,12 @@
 }
 
 sub dump_array {
- my($self, $name, $entry) = @_;
+ my ($self, $name, $entry) = @_;
  $self->add_config(Data::Dumper->Dump([$entry], ["*$name"]));
 }
 
 sub dump_hash {
-my($self, $name, $entry) = @_;
+my ($self, $name, $entry) = @_;
 for my $elem (sort keys %{$entry}) {
 $self->add_config(Data::Dumper->Dump([$entry->{$elem}], 
["\$$name"."{'$elem'}"])); 
 }
@@ -67,7 +67,7 @@
 }
 
 sub dump_entry {
-my($self, $name, $entry) = @_;
+my ($self, $name, $entry) = @_;
 
 return if not defined $entry;
 my $type = ref($entry);
@@ -84,7 +84,7 @@
 }
 
 sub dump_special {
-my($self, @data) = @_;
+my ($self, @data) = @_;
 
 my @dump = grep { defined } @data;
 return unless @dump;

svn commit: r266253 - /perl/modperl/trunk/lib/Apache2/Build.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:19:30 2005
New Revision: 266253

URL: http://svn.apache.org/viewcvs?rev=266253&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=266253&r1=266252&r2=266253&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Thu Sep  1 21:19:30 2005
@@ -154,7 +154,7 @@
 return $path unless $self->{MP_AP_DESTDIR};
 
 if (WIN32) {
-my($dest_vol, $dest_dir) = splitpath $self->{MP_AP_DESTDIR}, 1;
+my ($dest_vol, $dest_dir) = splitpath $self->{MP_AP_DESTDIR}, 1;
 my $real_dir = (splitpath $path)[1];
 
 $path = catpath $dest_vol, catdir($dest_dir, $real_dir), '';
@@ -434,7 +434,7 @@
 my $self = shift;
 my $xlibs = "";
 
-my($path) = $self->find_dlfile('Xau', @Xlib);
+my ($path) = $self->find_dlfile('Xau', @Xlib);
 if ($path) {
 $xlibs = "-L$path -lXau";
 }
@@ -455,7 +455,7 @@
 }
 
 sub ldopts {
-my($self) = @_;
+my ($self) = @_;
 
 my $config = tied %Config;
 my $ldflags = $config->{ldflags};
@@ -508,7 +508,7 @@
 $Wall .= " -Werror" if $] >= 5.006002;
 
 sub ap_ccopts {
-my($self) = @_;
+my ($self) = @_;
 my $ccopts = "-DMOD_PERL";
 
 if ($self->{MP_USE_GTOP}) {
@@ -576,7 +576,7 @@
 }
 
 sub cmp_tuples {
-my($num_a, $num_b) = @_;
+my ($num_a, $num_b) = @_;
 
 while (@$num_a && @$num_b) {
 my $cmp = shift @$num_a <=> shift @$num_b;
@@ -622,7 +622,7 @@
 # XXX: there could be more, but this is just for cosmetics
 my %cflags_dups = map { $_ => 1 } qw(-D_GNU_SOURCE -D_REENTRANT);
 sub ccopts {
-my($self) = @_;
+my ($self) = @_;
 
 my $cflags = $self->perl_ccopts . ExtUtils::Embed::perl_inc() .
  $self->ap_ccopts;
@@ -648,7 +648,7 @@
 }
 
 sub perl_config_optimize {
-my($self, $val) = @_;
+my ($self, $val) = @_;
 
 $val ||= $Config{optimize};
 
@@ -660,7 +660,7 @@
 }
 
 sub perl_config_ld {
-my($self, $val) = @_;
+my ($self, $val) = @_;
 
 $val ||= $Config{ld};
 
@@ -668,7 +668,7 @@
 }
 
 sub perl_config_lddlflags {
-my($self, $val) = @_;
+my ($self, $val) = @_;
 
 if ($self->{MP_DEBUG}) {
 if (MSVC) {
@@ -709,7 +709,7 @@
 }
 
 sub perl_config {
-my($self, $key) = @_;
+my ($self, $key) = @_;
 
 my $val = $Config{$key} || '';
 
@@ -738,14 +738,14 @@
 }
 
 sub find_dlfile {
-my($self, $name) = (shift, shift);
+my ($self, $name) = (shift, shift);
 
 require DynaLoader;
 require AutoLoader; #eek
 
 my $found = 0;
 my $loc = "";
-my(@path) = ($self->libpth, @_);
+my (@path) = ($self->libpth, @_);
 
 for (@path) {
 if ($found = DynaLoader::dl_findfile($_, "-l$name")) {
@@ -758,7 +758,7 @@
 }
 
 sub find_dlfile_maybe {
-my($self, $name) = @_;
+my ($self, $name) = @_;
 
 my $path = $self->libpth;
 
@@ -773,7 +773,7 @@
 }
 
 sub lib_check {
-my($self, $name) = @_;
+my ($self, $name) = @_;
 return unless $self->perl_config('libs') =~ /$name/;
 
 return if $self->find_dlfile($name);
@@ -792,24 +792,24 @@
 #--- user interaction ---
 
 sub prompt {
-my($self, $q, $default) = @_;
+my ($self, $q, $default) = @_;
 return $default if $self->{MP_PROMPT_DEFAULT};
 require ExtUtils::MakeMaker;
 ExtUtils::MakeMaker::prompt($q, $default);
 }
 
 sub prompt_y {
-my($self, $q) = @_;
+my ($self, $q) = @_;
 $self->prompt($q, 'y') =~ /^y/i;
 }
 
 sub prompt_n {
-my($self, $q) = @_;
+my ($self, $q) = @_;
 $self->prompt($q, 'n') =~ /^n/i;
 }
 
 sub phat_warn {
-my($self, $msg, $abort) = @_;
+my ($self, $msg, $abort) = @_;
 my $level = $abort ? 'ERROR' : 'WARNING';
 warn <{$key} ||= ($override || $default_files{$name});
 }
@@ -902,7 +902,7 @@
 }
 
 sub save_ldopts {
-my($self, $file) = @_;
+my ($self, $file) = @_;
 
 $file ||= $self->default_file('ldopts', $file);
 my $ldopts = $self->ldopts;
@@ -918,7 +918,7 @@
 }
 
 sub save {
-my($self, $file) = @_;
+my ($self, $file) = @_;
 
 delete $INC{$bpm};
 
@@ -972,7 +972,7 @@
 }
 
 sub dir {
-my($self, $dir) = @_;
+my ($self, $dir) = @_;
 
 if ($dir) {
 for (qw(ap_includedir)) {
@@ -1034,7 +1034,7 @@
 }
 
 sub ap_includedir  {
-my($self, $d) = @_;
+my ($self, $d) = @_;
 
 return $self->{ap_includedir}
   if $self->{ap_includedir} and -d $self->{ap_includedir};
@@ -1094,7 +1094,7 @@
 }
 
 sub apr_generation {
-my($self) = @_;

svn commit: r266254 - /perl/modperl/trunk/lib/Apache2/ParseSource.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:19:46 2005
New Revision: 266254

URL: http://svn.apache.org/viewcvs?rev=266254&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/Apache2/ParseSource.pm

Modified: perl/modperl/trunk/lib/Apache2/ParseSource.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/ParseSource.pm?rev=266254&r1=266253&r2=266254&view=diff
==
--- perl/modperl/trunk/lib/Apache2/ParseSource.pm (original)
+++ perl/modperl/trunk/lib/Apache2/ParseSource.pm Thu Sep  1 21:19:46 2005
@@ -185,7 +185,7 @@
 }
 
 sub find_includes_wanted {
-my($wanted, $unwanted, @dirs) = @_;
+my ($wanted, $unwanted, @dirs) = @_;
 my @includes = ();
 for my $dir (@dirs) {
 File::Find::finddepth({
@@ -265,8 +265,8 @@
 );
 
 my %defines_wanted_re;
-while (my($class, $groups) = each %defines_wanted) {
-while (my($group, $wanted) = each %$groups) {
+while (my ($class, $groups) = each %defines_wanted) {
+while (my ($group, $wanted) = each %$groups) {
 my $pat = join '|', @$wanted;
 $defines_wanted_re{$class}->{$group} = $pat; #qr{^($pat)};
 }
@@ -282,10 +282,10 @@
 };
 
 sub get_constants {
-my($self) = @_;
+my ($self) = @_;
 
 my $includes = $self->find_includes;
-my(%constants, %seen);
+my (%constants, %seen);
 
 for my $file (@$includes) {
 open my $fh, $file or die "open $file: $!";
@@ -312,15 +312,15 @@
 }
 
 sub handle_constant {
-my($self, $constants) = @_;
+my ($self, $constants) = @_;
 my $keys = keys %defines_wanted_re; #XXX broken bleedperl ?
 
 return if /^($defines_unwanted)/o;
 
-while (my($class, $groups) = each %defines_wanted_re) {
+while (my ($class, $groups) = each %defines_wanted_re) {
 my $keys = keys %$groups; #XXX broken bleedperl ?
 
-while (my($group, $re) = each %$groups) {
+while (my ($group, $re) = each %$groups) {
 next unless /^($re)/;
 push @{ $constants->{$class}->{$group} }, $_;
 return;
@@ -329,9 +329,9 @@
 }
 
 sub handle_enum {
-my($self, $fh, $constants) = @_;
+my ($self, $fh, $constants) = @_;
 
-my($name, $e) = $self->parse_enum($fh);
+my ($name, $e) = $self->parse_enum($fh);
 return unless $name;
 
 $name =~ s/^ap_//;
@@ -351,7 +351,7 @@
 
 #this should win an award for worlds lamest parser
 sub parse_enum {
-my($self, $fh) = @_;
+my ($self, $fh) = @_;
 my $code = $_;
 my @e;
 
@@ -404,7 +404,7 @@
 my @functions;
 
 for my $entry (@$fdecls) {
-my($rtype, $name, $args) = @$entry;
+my ($rtype, $name, $args) = @$entry;
 next unless $name =~ $wanted;
 next if $seen{$name}++;
 my @attr;
@@ -461,7 +461,7 @@
 my @structures;
 my $sx = qr(^struct\s+);
 
-while (my($type, $elts) = each %$typedef_structs) {
+while (my ($type, $elts) = each %$typedef_structs) {
 next unless $type =~ $wanted or $type =~ /($other)$/o;
 
 $type =~ s/$sx//;
@@ -512,12 +512,12 @@
 }
 
 sub write_pm {
-my($self, $file, $name, $data) = @_;
+my ($self, $file, $name, $data) = @_;
 
 require Data::Dumper;
 local $Data::Dumper::Indent = 1;
 
-my($subdir) = (split '::', $name)[0];
+my ($subdir) = (split '::', $name)[0];
 
 my $tdir = 'xs/tables/current';
 if (-d "$tdir/$subdir") {

svn commit: r266255 - /perl/modperl/trunk/lib/Apache2/PerlSections.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:21:24 2005
New Revision: 266255

URL: http://svn.apache.org/viewcvs?rev=266255&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/Apache2/PerlSections.pm

Modified: perl/modperl/trunk/lib/Apache2/PerlSections.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/PerlSections.pm?rev=266255&r1=266254&r2=266255&view=diff
==
--- perl/modperl/trunk/lib/Apache2/PerlSections.pm (original)
+++ perl/modperl/trunk/lib/Apache2/PerlSections.pm Thu Sep  1 21:21:24 2005
@@ -30,7 +30,7 @@
 use constant SPECIAL_PACKAGE => 'Apache2::ReadConfig';
 
 sub new {
-my($package, @args) = @_;
+my ($package, @args) = @_;
 return bless { @args }, ref($package) || $package;
 }
 
@@ -43,7 +43,7 @@
 sub saved  { return @saved }
 
 sub handler : method {
-my($self, $parms, $args) = @_;
+my ($self, $parms, $args) = @_;
 
 unless (ref $self) {
 $self = $self->new('parms' => $parms, 'args' => $args);
@@ -75,7 +75,7 @@
 }
 
 sub symdump {
-my($self) = @_;
+my ($self) = @_;
 
 unless ($self->{symbols}) {
 no strict;
@@ -107,12 +107,12 @@
 }
 
 sub dump_special {
-my($self, @data) = @_;
+my ($self, @data) = @_;
 $self->add_config(@data);
 }
 
 sub dump_any {
-my($self, $name, $entry) = @_;
+my ($self, $name, $entry) = @_;
 my $type = ref $entry;
 
 if ($type eq 'ARRAY') {
@@ -127,7 +127,7 @@
 }
 
 sub dump_hash {
-my($self, $name, $hash) = @_;
+my ($self, $name, $hash) = @_;
 
 for my $entry (sort keys %{ $hash || {} }) {
 my $item = $hash->{$entry};
@@ -145,7 +145,7 @@
 }
 
 sub dump_section {
-my($self, $name, $loc, $hash) = @_;
+my ($self, $name, $loc, $hash) = @_;
 
 $self->add_config("<$name $loc>\n");
 
@@ -157,7 +157,7 @@
 }
 
 sub dump_array {
-my($self, $name, $entries) = @_;
+my ($self, $name, $entries) = @_;
 
 for my $entry (@$entries) {
 $self->dump_entry($name, $entry);
@@ -165,7 +165,7 @@
 }
 
 sub dump_entry {
-my($self, $name, $entry) = @_;
+my ($self, $name, $entry) = @_;
 my $type = ref $entry;
 
 if ($type eq 'SCALAR') {
@@ -192,14 +192,14 @@
 }
 
 sub add_config {
-my($self, $config) = @_;
+my ($self, $config) = @_;
 return unless defined $config;
 chomp($config);
 push @{ $self->directives }, $config;
 }
 
 sub post_config {
-my($self) = @_;
+my ($self) = @_;
 my $errmsg = $self->parms->add_config($self->directives);
 die $errmsg if $errmsg;
 }

svn commit: r266256 - /perl/modperl/trunk/lib/Apache2/Reload.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:22:13 2005
New Revision: 266256

URL: http://svn.apache.org/viewcvs?rev=266256&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/Apache2/Reload.pm

Modified: perl/modperl/trunk/lib/Apache2/Reload.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Reload.pm?rev=266256&r1=266255&r2=266256&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Reload.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Reload.pm Thu Sep  1 21:22:13 2005
@@ -37,7 +37,7 @@
 
 sub import {
 my $class = shift;
-my($package, $file) = (caller)[0,1];
+my ($package, $file) = (caller)[0,1];
 
 $class->register_module($package, $file);
 }
@@ -57,7 +57,7 @@
 }
 
 sub register_module {
-my($class, $package, $file) = @_;
+my ($class, $package, $file) = @_;
 my $module = package_to_module($package);
 
 if ($file) {
@@ -71,7 +71,7 @@
 }
 
 sub unregister_module {
-my($class, $package) = @_;
+my ($class, $package) = @_;
 my $module = package_to_module($package);
 delete $INCS{$module};
 }

svn commit: r266257 - /perl/modperl/trunk/lib/Apache2/Resource.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:22:56 2005
New Revision: 266257

URL: http://svn.apache.org/viewcvs?rev=266257&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/Apache2/Resource.pm

Modified: perl/modperl/trunk/lib/Apache2/Resource.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Resource.pm?rev=266257&r1=266256&r2=266257&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Resource.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Resource.pm Thu Sep  1 21:22:56 2005
@@ -55,7 +55,7 @@
 sub debug { print STDERR @_ if $Debug }
 
 sub install_rlimit ($$$) {
-my($res, $soft, $hard) = @_;
+my ($res, $soft, $hard) = @_;
 
 my $name = $res;
 
@@ -82,11 +82,11 @@
 }
 
 sub handler {
-while (my($k, $v) = each %ENV) {
+while (my ($k, $v) = each %ENV) {
 next unless $k =~ /^PERL_RLIMIT_(\w+)$/;
 $k = $1;
 next if $k eq "DEFAULTS";
-my($soft, $hard) = split ":", $v, 2;
+my ($soft, $hard) = split ":", $v, 2;
 $hard ||= $soft;
 
 my $set = install_rlimit $k, $soft, $hard;
@@ -99,7 +99,7 @@
 }
 
 sub default_handler {
-while (my($k, $v) = each %Apache2::Resource::) {
+while (my ($k, $v) = each %Apache2::Resource::) {
 next unless $k =~ s/^DEFAULT_/PERL_/;
 $ENV{$k} = "";
 }
@@ -114,7 +114,7 @@
 
 for my $res (keys %$lim) {
 my $val = eval "&BSD::Resource::${res}()";
-my($soft, $hard) = getrlimit $val;
+my ($soft, $hard) = getrlimit $val;
 (my $limit = $res) =~ s/^RLIMIT_//;
 ($soft, $hard) = ("$soft " . BM($soft), "$hard ". BM($hard))
 if $is_mb{$limit};

svn commit: r266258 - /perl/modperl/trunk/lib/Apache2/SizeLimit.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:23:15 2005
New Revision: 266258

URL: http://svn.apache.org/viewcvs?rev=266258&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/Apache2/SizeLimit.pm

Modified: perl/modperl/trunk/lib/Apache2/SizeLimit.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/SizeLimit.pm?rev=266258&r1=266257&r2=266258&view=diff
==
--- perl/modperl/trunk/lib/Apache2/SizeLimit.pm (original)
+++ perl/modperl/trunk/lib/Apache2/SizeLimit.pm Thu Sep  1 21:23:15 2005
@@ -87,7 +87,7 @@
 
 # return process size (in KB)
 sub linux_size_check {
-my($size, $resident, $share) = (0, 0, 0);
+my ($size, $resident, $share) = (0, 0, 0);
 
 my $file = "/proc/self/statm";
 if (open my $fh, "<$file") {
@@ -159,7 +159,7 @@
 
 $START_TIME ||= time;
 
-my($size, $share) = $HOW_BIG_IS_IT->();
+my ($size, $share) = $HOW_BIG_IS_IT->();
 
 if (($MAX_PROCESS_SIZE  && $size > $MAX_PROCESS_SIZE) ||
 ($MIN_SHARE_SIZE&& $share < $MIN_SHARE_SIZE)  ||

svn commit: r266259 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:23:33 2005
New Revision: 266259

URL: http://svn.apache.org/viewcvs?rev=266259&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=266259&r1=266258&r2=266259&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Thu Sep  1 21:23:33 2005
@@ -65,11 +65,11 @@
 );
 
 sub has {
-my($r, $what) = @_;
+my ($r, $what) = @_;
 
 return 0 unless exists $requires{$what};
 
-my($opt, $module, $version) = @{ $requires{$what} };
+my ($opt, $module, $version) = @{ $requires{$what} };
 
 (my $file = $module) =~ s|::|/|;
 $file .= ".pm";
@@ -93,13 +93,13 @@
 }
 
 sub status_config {
-my($r, $key) = @_;
+my ($r, $key) = @_;
 return (lc($r->dir_config($key)) eq "on") ||
 (lc($r->dir_config('StatusOptionsAll')) eq "on");
 }
 
 sub menu_item {
-my($self, $key, $val, $sub) = @_;
+my ($self, $key, $val, $sub) = @_;
 $status{$key} = $val;
 no strict;
 no warnings 'redefine';
@@ -107,7 +107,7 @@
 }
 
 sub handler {
-my($r) = @_;
+my ($r) = @_;
 my $qs = $r->args || "";
 my $sub = "status_$qs";
 no strict 'refs';
@@ -173,7 +173,7 @@
 }
 
 sub symdump {
-my($r, $package) = @_;
+my ($r, $package) = @_;
 
 return install_hint("Devel::Symdump") unless has($r, "symdump");
 
@@ -184,18 +184,18 @@
 }
 
 sub status_symdump {
-my($r) = @_;
+my ($r) = @_;
 [symdump($r, 'main')];
 }
 
 sub status_section_config {
-my($r) = @_;
+my ($r) = @_;
 require Apache2::PerlSections;
 ["", Apache2::PerlSections->dump, ""];
 }
 
 sub status_inc {
-my($r) = @_;
+my ($r) = @_;
 
 my $uri = $r->uri;
 my @retval = (
@@ -229,7 +229,7 @@
 }
 
 sub status_script {
-my($r) = @_;
+my ($r) = @_;
 
 my @retval = (
 '',
@@ -248,7 +248,7 @@
 my $RegistryCache;
 
 sub registry_cache {
-my($self, $cache) = @_;
+my ($self, $cache) = @_;
 
 # XXX: generalize
 
@@ -257,7 +257,7 @@
 }
 
 sub get_packages_per_handler {
-my($root, $stash) = @_;
+my ($root, $stash) = @_;
 
 my %handlers = ();
 my @packages = get_packages($stash);
@@ -269,7 +269,7 @@
 }
 
 sub get_packages {
-my($stash) = @_;
+my ($stash) = @_;
 
 no strict 'refs';
 my @packages = ();
@@ -281,7 +281,7 @@
 }
 
 sub status_rgysubs {
-my($r) = @_;
+my ($r) = @_;
 
 local $_;
 my $uri = $r->uri;
@@ -366,11 +366,11 @@
 }
 
 sub status_data_dump {
-my($r) = @_;
+my ($r) = @_;
 
 return install_hint('Data::Dumper') unless has($r, "dumper");
 
-my($name, $type) = (split "/", $r->uri)[-2,-1];
+my ($name, $type) = (split "/", $r->uri)[-2,-1];
 
 no strict 'refs';
 my @retval = "\nData Dump of $name $type\n\n\n";
@@ -390,11 +390,11 @@
 }
 
 sub status_cv_dump { 
-my($r) = @_;
+my ($r) = @_;
 return [] unless has($r, "b");
 
 no strict 'refs';
-my($name, $type) = (split "/", $r->uri)[-2,-1];
+my ($name, $type) = (split "/", $r->uri)[-2,-1];
 # could be another child, which doesn't have this symbol table?
 return unless *$name{CODE}; 
 
@@ -427,7 +427,7 @@
 }
 
 sub b_lexinfo_link {
-my($r, $name) = @_;
+my ($r, $name) = @_;
 
 return unless has($r, "lexinfo");
 
@@ -442,7 +442,7 @@
 return unless has($r, "lexinfo");
 
 no strict 'refs';
-my($name) = (split "/", $r->uri)[-1];
+my ($name) = (split "/", $r->uri)[-1];
 $r->print("Lexical Info for $name\n\n");
 my $lexi = B::LexInfo->new;
 my $info = $lexi->cvlexinfo($name);
@@ -452,7 +452,7 @@
 my %b_terse_exp = ('slow' => 'syntax', 'exec' => 'execution', basic => 
'syntax');
 
 sub b_terse_link {
-my($r, $name) = @_;
+my ($r, $name) = @_;
 
 return unless has($r, "terse");
 
@@ -473,7 +473,7 @@
 return unless has($r, "terse");
 
 no strict 'refs';
-my($arg, $name) = (split "/", $r->uri)[-2,-1];
+my ($arg, $name) = (split "/", $r->uri)[-2,-1];
 $r->print("Syntax Tree Dump ($b_terse_exp{$arg}) for $name\n\n");
 
 # XXX: blead perl dumps things to STDERR, though the same version
@@ -487,7 +487,7 @@
 }
 
 sub b_terse_size_link {
-my($r, $name) = @_;
+my ($r, $name) = @_;
 
 return unless

svn commit: r266260 - /perl/modperl/trunk/lib/Apache2/compat.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:23:49 2005
New Revision: 266260

URL: http://svn.apache.org/viewcvs?rev=266260&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/Apache2/compat.pm

Modified: perl/modperl/trunk/lib/Apache2/compat.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/compat.pm?rev=266260&r1=266259&r2=266260&view=diff
==
--- perl/modperl/trunk/lib/Apache2/compat.pm (original)
+++ perl/modperl/trunk/lib/Apache2/compat.pm Thu Sep  1 21:23:49 2005
@@ -85,7 +85,7 @@
 require APR::Finfo;
 my $orig_sub = *Apache2::RequestRec::filename{CODE};
 *Apache2::RequestRec::filename = sub {
-my($r, $newfile) = @_;
+my ($r, $newfile) = @_;
 my $old_filename;
 if (defined $newfile) {
 $old_filename = $r->$orig_sub($newfile);
@@ -153,7 +153,7 @@
 my $c = shift;
 if (@_) {
 my $addr_in = shift;
-my($port, $addr) = Socket::unpack_sockaddr_in($addr_in);
+my ($port, $addr) = Socket::unpack_sockaddr_in($addr_in);
 $c->$orig_sub->ip_set($addr);
 $c->$orig_sub->port_set($port);
 }
@@ -195,7 +195,7 @@
 require APR::URI;
 my $orig_sub = *APR::URI::unparse{CODE};
 *APR::URI::unparse = sub {
-my($uri, $flags) = @_;
+my ($uri, $flags) = @_;
 
 if (defined $uri->hostname && !defined $uri->scheme) {
 # we do this only for back compat, the new APR::URI is
@@ -321,7 +321,7 @@
 package Apache;
 
 sub unescape_url_info {
-my($class, $string) = @_;
+my ($class, $string) = @_;
 Apache2::URI::unescape_url($string);
 $string =~ tr/+/ /;
 $string;
@@ -481,8 +481,8 @@
 *request = \&Apache2::request;
 
 sub table_get_set {
-my($r, $table) = (shift, shift);
-my($key, $value) = @_;
+my ($r, $table) = (shift, shift);
+my ($key, $value) = @_;
 
 if (1 == @_) {
 return wantarray() 
@@ -539,13 +539,13 @@
 *post_connection = \®ister_cleanup;
 
 sub get_remote_host {
-my($r, $type) = @_;
+my ($r, $type) = @_;
 $type = Apache2::Const::REMOTE_NAME unless defined $type;
 $r->connection->get_remote_host($type, $r->per_dir_config);
 }
 
 sub parse_args {
-my($r, $string) = @_;
+my ($r, $string) = @_;
 return () unless defined $string and $string;
 
 return map {
@@ -599,7 +599,7 @@
 }
 
 sub clear_rgy_endav {
-my($r, $script_name) = @_;
+my ($r, $script_name) = @_;
 require ModPerl::Global;
 my $package = 'Apache2::ROOT' . $script_name;
 ModPerl::Global::special_list_clear(END => $package);
@@ -646,7 +646,7 @@
 #2.0 ap_send_fd() also has an additional offset parameter
 
 sub send_fd_length {
-my($r, $fh, $length) = @_;
+my ($r, $fh, $length) = @_;
 
 my $buff;
 my $total_bytes_sent = 0;
@@ -671,7 +671,7 @@
 }
 
 sub send_fd {
-my($r, $fh) = @_;
+my ($r, $fh) = @_;
 $r->send_fd_length($fh, -1);
 }
 
@@ -687,7 +687,7 @@
 use Carp ();
 
 sub new {
-my($class) = shift;
+my ($class) = shift;
 my $fh = Symbol::gensym;
 my $self = bless $fh, ref($class)||$class;
 if (@_) {
@@ -699,7 +699,7 @@
 }
 
 sub open {
-my($self) = shift;
+my ($self) = shift;
 
 Carp::croak("no Apache2::File object passed")
   unless $self && ref($self);
@@ -716,7 +716,7 @@
 }
 
 sub close {
-my($self) = shift;
+my ($self) = shift;
 CORE::close $self;
 }
 
@@ -761,7 +761,7 @@
 package Apache::Util;
 
 sub size_string {
-my($size) = @_;
+my ($size) = @_;
 
 if (!$size) {
 $size = "   0k";
@@ -818,7 +818,7 @@
 *validate_password = \&APR::Util::password_validate;
 
 sub Apache2::URI::parse {
-my($class, $r, $uri) = @_;
+my ($class, $r, $uri) = @_;
 
 $uri ||= $r->construct_url;
 
@@ -828,7 +828,7 @@
 package Apache::Table;
 
 sub new {
-my($class, $r, $nelts) = @_;
+my ($class, $r, $nelts) = @_;
 $nelts ||= 10;
 APR::Table::make($r->pool, $nelts);
 }

svn commit: r266261 - in /perl/modperl/trunk/lib/ModPerl: BuildMM.pm BuildOptions.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:24:29 2005
New Revision: 266261

URL: http://svn.apache.org/viewcvs?rev=266261&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/ModPerl/BuildMM.pm
perl/modperl/trunk/lib/ModPerl/BuildOptions.pm

Modified: perl/modperl/trunk/lib/ModPerl/BuildMM.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/BuildMM.pm?rev=266261&r1=266260&r2=266261&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/BuildMM.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/BuildMM.pm Thu Sep  1 21:24:29 2005
@@ -153,7 +153,7 @@
 #skip .xs -> .so if we are linking static
 my $name = $self->{NAME};
 unless ($always_dynamic{$name}) {
-if (my($xs) = keys %{ $self->{XS} }) {
+if (my ($xs) = keys %{ $self->{XS} }) {
 $self->{HAS_LINK_CODE} = 0;
 print "$name will be linked static\n";
 #propagate static xs module to src/modules/perl/Makefile
@@ -236,7 +236,7 @@
 }
 }
 
-while (my($pm, $blib) = each %pms) {
+while (my ($pm, $blib) = each %pms) {
 $pm   =~ s|/\./|/|g; # clean the path
 $blib =~ s|/\./|/|g; # clean the path
 my @segm = splitdir $blib;
@@ -286,7 +286,7 @@
 sub glue_pod {
 
 die "expecting 3 arguments: pm, pod, dst" unless @ARGV == 3;
-my($pm, $pod, $dst) = @ARGV;
+my ($pm, $pod, $dst) = @ARGV;
 
 # it's possible that the .pm file is not existing
 # (e.g. ThreadMutex.pm is not created on unless
@@ -317,7 +317,7 @@
 $build ||= build_config();
 my $pm = $self->{PM};
 
-while (my($k, $v) = each %PM) {
+while (my ($k, $v) = each %PM) {
 if (-e $k) {
 $pm->{$k} = $v;
 }
@@ -335,7 +335,7 @@
 my $apr_config;
 
 sub ModPerl::BuildMM::MY::libscan {
-my($self, $path) = @_;
+my ($self, $path) = @_;
 
 $apr_config ||= $build->get_apr_config();
 

Modified: perl/modperl/trunk/lib/ModPerl/BuildOptions.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/BuildOptions.pm?rev=266261&r1=266260&r2=266261&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/BuildOptions.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/BuildOptions.pm Thu Sep  1 21:24:29 2005
@@ -27,7 +27,7 @@
 use File::Spec;
 
 sub init {
-my($self, $build) = @_;
+my ($self, $build) = @_;
 
 [EMAIL PROTECTED] should override what's in .makepl_args.mod_perl2
 #but @ARGV might also override the default MP_OPTS_FILE
@@ -68,7 +68,7 @@
 }
 
 sub parse {
-my($self, $lines, $opts) = @_;
+my ($self, $lines, $opts) = @_;
 
 $opts = VERBOSE|UNKNOWN_FATAL unless defined $opts;
 my $table = table();
@@ -100,7 +100,7 @@
 }
 
 if (/^MP_/) {
-my($key, $val) = split $param_qr, $_, 2;
+my ($key, $val) = split $param_qr, $_, 2;
 $val ||= "" unless defined $val && $val eq '0';
 $continue = $val =~ s/\\$// ? $key : "";
 
@@ -185,7 +185,7 @@
 }
 
 sub parse_table {
-my($fh) = @_;
+my ($fh) = @_;
 my %table;
 local $_;
 
@@ -194,7 +194,7 @@
 s/^\s+//; s/\s+$//;
 next if /^\#/ || /^$/;
 last if /^__END__/;
-my($key, $append, $val) = split /\s+/, $_, 3;
+my ($key, $append, $val) = split /\s+/, $_, 3;
 $table{'MP_' . $key} = { append => $append, val => $val };
 }

svn commit: r266262 - in /perl/modperl/trunk/lib/ModPerl: CScan.pm Code.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:24:58 2005
New Revision: 266262

URL: http://svn.apache.org/viewcvs?rev=266262&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/ModPerl/CScan.pm
perl/modperl/trunk/lib/ModPerl/Code.pm

Modified: perl/modperl/trunk/lib/ModPerl/CScan.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/CScan.pm?rev=266262&r1=266261&r2=266262&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/CScan.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/CScan.pm Thu Sep  1 21:24:58 2005
@@ -398,7 +398,7 @@
 }
 
 sub typedef_structs {
-  my($typehash, $structs) = @_;
+  my ($typehash, $structs) = @_;
   my %structs;
   for (0 .. $#$structs) {
 my $in = $structs->[$_];
@@ -411,7 +411,7 @@
 my $name = parse_struct($in, \%structs);
 $structs{$key} = defined($name) ? $structs{$name} : undef;
   }
-  while (my($key, $text) = each %$typehash) {
+  while (my ($key, $text) = each %$typehash) {
 my $name = parse_struct($text->[0], \%structs);
 $structs{$key} = defined($name) ? $structs{$name} : undef;
   }
@@ -419,8 +419,8 @@
 }
 
 sub parse_struct {
-  my($in, $structs) = @_;
-  my($b, $e, $chunk, $vars, $struct, $structname);
+  my ($in, $structs) = @_;
+  my ($b, $e, $chunk, $vars, $struct, $structname);
   return "$1 $2" if $in =~ /
 ^ \s* (struct | union) \s+ (\w+) \s* $
   /x;
@@ -453,7 +453,7 @@
 
 sub parse_vars {
   my $in = shift;
-  my($vars, $type, $word, $id, $post, $func);
+  my ($vars, $type, $word, $id, $post, $func);
 
   while ($in =~ /\G\s*([\[;,(]|\*+|:\s*\d+|\S+?\b|$)\s*/gc) {
 $word = $1;
@@ -514,7 +514,7 @@
 }
 
 sub vdecl_hash {
-  my($vdecls, $mdecls) = @_;
+  my ($vdecls, $mdecls) = @_;
   my %vdecl_hash;
   for (@$vdecls, @$mdecls) {
 next if /[()]/;# ignore functions, and function pointers
@@ -556,7 +556,7 @@
   $b1 = length $chunk, last unless defined $b1;
 }
 if ($e - $b - $b1 > 0) {
-  my($isvar, $isfunc) = (1, 1);
+  my ($isvar, $isfunc) = (1, 1);
   substr ($chunk, 0, $b1) = '';
   if ($chunk =~ /,/) { # Contains multiple declarations.
push @mdecls, $b + $b1, $e;
@@ -940,7 +940,7 @@
 my $addincludes = "";
 $addincludes = "-I" . join(" -I", @$Includes)
   if defined $Includes and @$Includes;
-my($sym) = gensym;
+my ($sym) = gensym;
 my $cmd = WIN32 ?
 "$Cpp->{cppstdin} $Defines $addincludes $Cpp->{cppflags} $filename |" :
 "echo '\#include \"$filename\"' | $Cpp->{cppstdin} $Defines 
$addincludes $Cpp->{cppflags} $Cpp->{cppminus} |";

Modified: perl/modperl/trunk/lib/ModPerl/Code.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/Code.pm?rev=266262&r1=266261&r2=266262&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/Code.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Code.pm Thu Sep  1 21:24:58 2005
@@ -125,7 +125,7 @@
 }
 }
 
-while (my($k,$v) = each %directive_proto) {
+while (my ($k,$v) = each %directive_proto) {
 $directive_proto{$k}->{ret} = 'const char *';
 my $handlers = join '_', 'handlers', canon_lc($k);
 $directive_proto{$k}->{handlers} =
@@ -168,9 +168,9 @@
 sub path { shift->{path} }
 
 sub handler_desc {
-my($self, $h_add, $c_add) = @_;
+my ($self, $h_add, $c_add) = @_;
 local $" = ",\n";
-while (my($class, $h) = each %{ $self->{handler_index_desc} }) {
+while (my ($class, $h) = each %{ $self->{handler_index_desc} }) {
 my $func = canon_func('handler', 'desc', $class);
 my $array = join '_', 'MP', $func;
 my $proto = "const char *$func(int idx)";
@@ -192,11 +192,11 @@
 }
 
 sub generate_handler_index {
-my($self, $h_fh) = @_;
+my ($self, $h_fh) = @_;
 
 my $type = 1;
 
-while (my($class, $handlers) = each %{ $self->{handlers} }) {
+while (my ($class, $handlers) = each %{ $self->{handlers} }) {
 my $i = 0;
 my $n = @$handlers;
 my $handler_type = canon_define('HANDLER_TYPE', $class);
@@ -220,11 +220,11 @@
 }
 
 sub generate_handler_hooks {
-my($self, $h_fh, $c_fh) = @_;
+my ($self, $h_fh, $c_fh) = @_;
 
 my @register_hooks;
 
-while (my($class, $prototype) = each %{ $self->{hook_proto} }) {
+while (my ($class, $prototype) = each %{ $self->{hook_proto} }) {
 my $callback = canon_func('callback', $class);
 my $return = $prototype->{ret} eq 'void' ? '' : 'return';
 my $i = -1;
@@ -243,7 +243,7 @@
   "ap_hook_$hook($name, NULL, NULL, $order);";

svn commit: r266263 - /perl/modperl/trunk/lib/ModPerl/FunctionMap.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:25:22 2005
New Revision: 266263

URL: http://svn.apache.org/viewcvs?rev=266263&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/ModPerl/FunctionMap.pm

Modified: perl/modperl/trunk/lib/ModPerl/FunctionMap.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/FunctionMap.pm?rev=266263&r1=266262&r2=266263&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/FunctionMap.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/FunctionMap.pm Thu Sep  1 21:25:22 2005
@@ -76,7 +76,7 @@
 sub guess_prefix {
 my $entry = shift;
 
-my($name, $class) = ($entry->{name}, $entry->{class});
+my ($name, $class) = ($entry->{name}, $entry->{class});
 my $prefix = "";
 $name =~ s/^DEFINE_//;
 $name =~ s/^mpxs_//i;
@@ -101,7 +101,7 @@
 }
 
 sub parse {
-my($self, $fh, $map) = @_;
+my ($self, $fh, $map) = @_;
 my %cur;
 my $disabled = 0;
 
@@ -125,7 +125,7 @@
 next;
 }
 
-my($name, $dispatch, $argspec, $alias) = split /\s*\|\s*/;
+my ($name, $dispatch, $argspec, $alias) = split /\s*\|\s*/;
 my $return_type;
 
 if ($name =~ s/^([^:]+)://) {
@@ -200,7 +200,7 @@
 my $map = $self->get;
 my %prefix;
 
-while (my($name, $ent) = each %$map) {
+while (my ($name, $ent) = each %$map) {
 next unless $ent->{prefix};
 $prefix{ $ent->{prefix} }++;
 }

svn commit: r266264 - in /perl/modperl/trunk/lib/ModPerl: MM.pm Manifest.pm MapUtil.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:25:48 2005
New Revision: 266264

URL: http://svn.apache.org/viewcvs?rev=266264&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/ModPerl/MM.pm
perl/modperl/trunk/lib/ModPerl/Manifest.pm
perl/modperl/trunk/lib/ModPerl/MapUtil.pm

Modified: perl/modperl/trunk/lib/ModPerl/MM.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/MM.pm?rev=266264&r1=266263&r2=266264&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/MM.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/MM.pm Thu Sep  1 21:25:48 2005
@@ -54,17 +54,17 @@
 }
 
 sub add_dep {
-my($string, $targ, $add) = @_;
+my ($string, $targ, $add) = @_;
 $$string =~ s/($targ\s+::)/$1 $add/;
 }
 
 sub add_dep_before {
-my($string, $targ, $before_targ, $add) = @_;
+my ($string, $targ, $before_targ, $add) = @_;
 $$string =~ s/($targ\s+::.*?) ($before_targ)/$1 $add $2/;
 }
 
 sub add_dep_after {
-my($string, $targ, $after_targ, $add) = @_;
+my ($string, $targ, $after_targ, $add) = @_;
 $$string =~ s/($targ\s+::.*?$after_targ)/$1 $add/;
 }
 
@@ -160,7 +160,7 @@
 my $build = build_config();
 my $pm = $self->{PM};
 
-while (my($k, $v) = each %PM) {
+while (my ($k, $v) = each %PM) {
 if (-e $k) {
 $pm->{$k} = $v;
 }

Modified: perl/modperl/trunk/lib/ModPerl/Manifest.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/Manifest.pm?rev=266264&r1=266263&r2=266264&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/Manifest.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Manifest.pm Thu Sep  1 21:25:48 2005
@@ -99,7 +99,7 @@
 }
 
 my $sub = "\$matches = "
-. "sub { my(\$arg)[EMAIL PROTECTED]; return 1 if "
+. "sub { my (\$arg)[EMAIL PROTECTED]; return 1 if "
 . join (" || ",  (map {s!/!\\/!g; "\$arg =~ m/$_/o"} @skip), 0)
 . " }";
 

Modified: perl/modperl/trunk/lib/ModPerl/MapUtil.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/MapUtil.pm?rev=266264&r1=266263&r2=266264&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/MapUtil.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/MapUtil.pm Thu Sep  1 21:25:48 2005
@@ -114,9 +114,9 @@
 my $self = shift;
 my $package = ref($self) || $self;
 
-my($wanted) = $package =~ /($map_classes)/io;
+my ($wanted) = $package =~ /($map_classes)/io;
 
-my(@dirs) = (($MapDir || './xs'), ModPerl::MapUtil::xs_glue_dirs());
+my (@dirs) = (($MapDir || './xs'), ModPerl::MapUtil::xs_glue_dirs());
 
 my @files;
 
@@ -143,11 +143,11 @@
 }
 
 sub parse_keywords {
-my($self, $line) = @_;
+my ($self, $line) = @_;
 my %words;
 
 for my $pair (split /\s+/, $line) {
-my($key, $val) = split /=/, $pair;
+my ($key, $val) = split /=/, $pair;
 
 unless ($key and $val) {
 die "parse error ($ModPerl::MapUtil::MapFile line $.)";
@@ -160,7 +160,7 @@
 }
 
 sub parse_map_files {
-my($self) = @_;
+my ($self) = @_;
 
 my $map = {};

svn commit: r266265 - in /perl/modperl/trunk/lib/ModPerl: StructureMap.pm TypeMap.pm WrapXS.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:26:37 2005
New Revision: 266265

URL: http://svn.apache.org/viewcvs?rev=266265&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/lib/ModPerl/StructureMap.pm
perl/modperl/trunk/lib/ModPerl/TypeMap.pm
perl/modperl/trunk/lib/ModPerl/WrapXS.pm

Modified: perl/modperl/trunk/lib/ModPerl/StructureMap.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/StructureMap.pm?rev=266265&r1=266264&r2=266265&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/StructureMap.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/StructureMap.pm Thu Sep  1 21:26:37 2005
@@ -80,7 +80,7 @@
 
 my @missing;
 
-while (my($type, $elts) = each %{ $self->{map} }) {
+while (my ($type, $elts) = each %{ $self->{map} }) {
 for my $name (keys %$elts) {
 next if exists $structures{$type}->{$name};
 push @missing, "$type.$name";
@@ -91,9 +91,9 @@
 }
 
 sub parse {
-my($self, $fh, $map) = @_;
+my ($self, $fh, $map) = @_;
 
-my($disabled, $class);
+my ($disabled, $class);
 my %cur;
 
 while ($fh->readline) {

Modified: perl/modperl/trunk/lib/ModPerl/TypeMap.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/TypeMap.pm?rev=266265&r1=266264&r2=266265&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/TypeMap.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/TypeMap.pm Thu Sep  1 21:26:37 2005
@@ -42,7 +42,7 @@
 my %special = map { $_, 1 } qw(UNDEFINED NOTIMPL CALLBACK);
 
 sub special {
-my($self, $class) = @_;
+my ($self, $class) = @_;
 return $special{$class};
 }
 
@@ -50,19 +50,19 @@
 sub structure_map { shift->{structure_map}->get }
 
 sub parse {
-my($self, $fh, $map) = @_;
+my ($self, $fh, $map) = @_;
 
 while ($fh->readline) {
 if (/E=/) {
 my %args = $self->parse_keywords($_);
-while (my($key,$val) = each %args) {
+while (my ($key,$val) = each %args) {
 push @{ $self->{$key} }, $val;
 }
 next;
 }
 
 my @aliases;
-my($type, $class) = (split /\s*\|\s*/, $_)[0,1];
+my ($type, $class) = (split /\s*\|\s*/, $_)[0,1];
 $class ||= 'UNDEFINED';
 
 if ($type =~ s/^(struct|typedef)\s+(.*)/$2/) {
@@ -106,17 +106,17 @@
 };
 
 sub should_ignore {
-my($self, $type) = @_;
+my ($self, $type) = @_;
 return 1 if $type =~ /^($ignore)/o;
 }
 
 sub is_callback {
-my($self, $type) = @_;
+my ($self, $type) = @_;
 return 1 if $type =~ /\(/ and $type =~ /\)/; #XXX: callback
 }
 
 sub exists {
-my($self, $type) = @_;
+my ($self, $type) = @_;
 
 return 1 if $self->is_callback($type) || $self->should_ignore($type);
 
@@ -126,7 +126,7 @@
 }
 
 sub map_type {
-my($self, $type) = @_;
+my ($self, $type) = @_;
 my $class = $self->get->{$type};
 
 return unless $class and ! $self->special($class);
@@ -140,7 +140,7 @@
 }
 
 sub null_type {
-my($self, $type) = @_;
+my ($self, $type) = @_;
 my $class = $self->get->{$type};
 
 if ($class =~ /^[INU]V/) {
@@ -165,7 +165,7 @@
 }
 
 sub map_arg {
-my($self, $arg) = @_;
+my ($self, $arg) = @_;
 
 my $map_type = $self->map_type($arg->{type});
 die "unknown typemap: '$arg->{type}'" unless defined $map_type;
@@ -179,7 +179,7 @@
 }
 
 sub map_args {
-my($self, $func) = @_;
+my ($self, $func) = @_;
 
 my $entry = $self->function_map->{ $func->{name} };
 my $argspec = $entry->{argspec};
@@ -191,7 +191,7 @@
 for my $arg (@$argspec) {
 my $default;
 ($arg, $default) = split /=/, $arg, 2;
-my($type, $name) = split ':', $arg, 2;
+my ($type, $name) = split ':', $arg, 2;
 
 if ($type and $name) {
 push @$args, {
@@ -224,7 +224,7 @@
 #this is needed for modperl-only functions
 #unlike apache/apr functions which are remapped to a mpxs_ function
 sub thx_fixup {
-my($self, $func) = @_;
+my ($self, $func) = @_;
 
 my $first = $func->{args}->[0];
 
@@ -237,14 +237,14 @@
 }
 
 sub map_function {
-my($self, $func) = @_;
+my ($self, $func) = @_;
 
 my $map = $self->function_map->{ $func->{name} };
 return unless $map;
 
 $self->thx_fixup($func);
 
-my($status, $failed_type) = 
+my ($status, $failed_type) = 
 $self->can_map($map, $func->{return_type},
 map $_->{type}, @{ $func->{args} });
 
@@ -282,15 +282,15 @@
 }
 
 sub map_structure {
-my($self, $struct) = @_;
+my ($self, $struct) = @_;
 
-my($class, @elts);
+my ($class, @elts);
 my $stype = $struct->{

svn commit: r266266 - in /perl/modperl/trunk/t/api: internal_redirect.t lookup_uri.t

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:27:19 2005
New Revision: 266266

URL: http://svn.apache.org/viewcvs?rev=266266&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/t/api/internal_redirect.t
perl/modperl/trunk/t/api/lookup_uri.t

Modified: perl/modperl/trunk/t/api/internal_redirect.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/api/internal_redirect.t?rev=266266&r1=266265&r2=266266&view=diff
==
--- perl/modperl/trunk/t/api/internal_redirect.t (original)
+++ perl/modperl/trunk/t/api/internal_redirect.t Thu Sep  1 21:27:19 2005
@@ -20,7 +20,7 @@
 
 plan tests => scalar keys %map;
 
-while (my($key, $val) = each %map) {
+while (my ($key, $val) = each %map) {
 my $expected = "internal redirect: $key";
 my $received = GET_BODY_ASSERT $val;
 ok t_cmp($received, $expected);

Modified: perl/modperl/trunk/t/api/lookup_uri.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/api/lookup_uri.t?rev=266266&r1=266265&r2=266266&view=diff
==
--- perl/modperl/trunk/t/api/lookup_uri.t (original)
+++ perl/modperl/trunk/t/api/lookup_uri.t Thu Sep  1 21:27:19 2005
@@ -19,7 +19,7 @@
 
 plan tests => scalar keys %opts;
 
-while (my($filter, $runs) = each %opts) {
+while (my ($filter, $runs) = each %opts) {
 my $args = "subreq=lookup_uri;filter=$filter";
 my $prefix = "pre+" x $runs->[PREFIX];
 my $suffix = "+suf" x $runs->[SUFFIX];

svn commit: r266267 - /perl/modperl/trunk/t/compat/request_body.t

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:27:41 2005
New Revision: 266267

URL: http://svn.apache.org/viewcvs?rev=266267&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/t/compat/request_body.t

Modified: perl/modperl/trunk/t/compat/request_body.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/compat/request_body.t?rev=266267&r1=266266&r2=266267&view=diff
==
--- perl/modperl/trunk/t/compat/request_body.t (original)
+++ perl/modperl/trunk/t/compat/request_body.t Thu Sep  1 21:27:41 2005
@@ -73,7 +73,7 @@
 
 ### helper subs ###
 sub query {
-my(%args) = (@_ % 2) ? %{+shift} : @_;
+my (%args) = (@_ % 2) ? %{+shift} : @_;
 "$location?" . join '&', map { "$_=$args{$_}" } keys %args;
 }

svn commit: r266268 - in /perl/modperl/trunk/t/conf: modperl_extra.pl post_config_startup.pl

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:28:06 2005
New Revision: 266268

URL: http://svn.apache.org/viewcvs?rev=266268&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/t/conf/modperl_extra.pl
perl/modperl/trunk/t/conf/post_config_startup.pl

Modified: perl/modperl/trunk/t/conf/modperl_extra.pl
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/conf/modperl_extra.pl?rev=266268&r1=266267&r2=266268&view=diff
==
--- perl/modperl/trunk/t/conf/modperl_extra.pl (original)
+++ perl/modperl/trunk/t/conf/modperl_extra.pl Thu Sep  1 21:28:06 2005
@@ -112,7 +112,7 @@
 PerlPostConfigHandler => \&add_my_version);
 
 sub add_my_version {
-my($conf_pool, $log_pool, $temp_pool, $s) = @_;
+my ($conf_pool, $log_pool, $temp_pool, $s) = @_;
 $s->add_version_component("world domination series/2.0");
 return Apache2::Const::OK;
 }

Modified: perl/modperl/trunk/t/conf/post_config_startup.pl
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/conf/post_config_startup.pl?rev=266268&r1=266267&r2=266268&view=diff
==
--- perl/modperl/trunk/t/conf/post_config_startup.pl (original)
+++ perl/modperl/trunk/t/conf/post_config_startup.pl Thu Sep  1 21:28:06 2005
@@ -81,7 +81,7 @@
 Apache2::Status->menu_item(
'test_menu' => "Test Menu Entry",
sub {
-   my($r) = @_;
+   my ($r) = @_;
return ["This is just a test entry"];
}
 ) if Apache2::Module::loaded('Apache2::Status');
@@ -130,7 +130,7 @@
 }
 
 sub ModPerl::Test::exit_handler {
-my($p, $s) = @_;
+my ($p, $s) = @_;
 
 $s->log->info("Child process pid=$$ is exiting");

svn commit: r266269 - /perl/modperl/trunk/t/directive/setupenv.t

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:28:20 2005
New Revision: 266269

URL: http://svn.apache.org/viewcvs?rev=266269&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/t/directive/setupenv.t

Modified: perl/modperl/trunk/t/directive/setupenv.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/directive/setupenv.t?rev=266269&r1=266268&r2=266269&view=diff
==
--- perl/modperl/trunk/t/directive/setupenv.t (original)
+++ perl/modperl/trunk/t/directive/setupenv.t Thu Sep  1 21:28:20 2005
@@ -17,7 +17,7 @@
 
 for my $line (split /\n/, $env) {
 next unless $line =~ /=/;
-my($key, $val) = split /=/, $line, 2;
+my ($key, $val) = split /=/, $line, 2;
 $env{$key} = $val || '';
 }

svn commit: r266270 - in /perl/modperl/trunk/t/filter: ./ TestFilter/

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:28:36 2005
New Revision: 266270

URL: http://svn.apache.org/viewcvs?rev=266270&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/t/filter/TestFilter/in_bbs_body.pm
perl/modperl/trunk/t/filter/TestFilter/in_bbs_consume.pm
perl/modperl/trunk/t/filter/TestFilter/in_bbs_inject_header.pm
perl/modperl/trunk/t/filter/TestFilter/in_bbs_msg.pm
perl/modperl/trunk/t/filter/TestFilter/in_bbs_underrun.pm
perl/modperl/trunk/t/filter/TestFilter/out_bbs_basic.pm
perl/modperl/trunk/t/filter/TestFilter/out_bbs_ctx.pm
perl/modperl/trunk/t/filter/TestFilter/out_bbs_filebucket.pm
perl/modperl/trunk/t/filter/TestFilter/out_str_buffer.pm
perl/modperl/trunk/t/filter/out_bbs_filebucket.t

Modified: perl/modperl/trunk/t/filter/TestFilter/in_bbs_body.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/filter/TestFilter/in_bbs_body.pm?rev=266270&r1=266269&r2=266270&view=diff
==
--- perl/modperl/trunk/t/filter/TestFilter/in_bbs_body.pm (original)
+++ perl/modperl/trunk/t/filter/TestFilter/in_bbs_body.pm Thu Sep  1 21:28:36 
2005
@@ -16,7 +16,7 @@
 use APR::Const -compile => ':common';
 
 sub handler : FilterRequestHandler {
-my($filter, $bb, $mode, $block, $readbytes) = @_;
+my ($filter, $bb, $mode, $block, $readbytes) = @_;
 
 $filter->next->get_brigade($bb, $mode, $block, $readbytes);
 

Modified: perl/modperl/trunk/t/filter/TestFilter/in_bbs_consume.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/filter/TestFilter/in_bbs_consume.pm?rev=266270&r1=266269&r2=266270&view=diff
==
--- perl/modperl/trunk/t/filter/TestFilter/in_bbs_consume.pm (original)
+++ perl/modperl/trunk/t/filter/TestFilter/in_bbs_consume.pm Thu Sep  1 
21:28:36 2005
@@ -24,7 +24,7 @@
 use constant READ_SIZE => 26;
 
 sub handler {
-my($filter, $bb, $mode, $block, $readbytes) = @_;
+my ($filter, $bb, $mode, $block, $readbytes) = @_;
 my $ba = $filter->r->connection->bucket_alloc;
 my $seen_eos = 0;
 my $satisfied = 0;

Modified: perl/modperl/trunk/t/filter/TestFilter/in_bbs_inject_header.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/filter/TestFilter/in_bbs_inject_header.pm?rev=266270&r1=266269&r2=266270&view=diff
==
--- perl/modperl/trunk/t/filter/TestFilter/in_bbs_inject_header.pm (original)
+++ perl/modperl/trunk/t/filter/TestFilter/in_bbs_inject_header.pm Thu Sep  1 
21:28:36 2005
@@ -119,7 +119,7 @@
 }
 
 sub handler : FilterConnectionHandler {
-my($filter, $bb, $mode, $block, $readbytes) = @_;
+my ($filter, $bb, $mode, $block, $readbytes) = @_;
 
 debug join '', "-" x 20 , " input filter called -", "-" x 20;
 

Modified: perl/modperl/trunk/t/filter/TestFilter/in_bbs_msg.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/filter/TestFilter/in_bbs_msg.pm?rev=266270&r1=266269&r2=266270&view=diff
==
--- perl/modperl/trunk/t/filter/TestFilter/in_bbs_msg.pm (original)
+++ perl/modperl/trunk/t/filter/TestFilter/in_bbs_msg.pm Thu Sep  1 21:28:36 
2005
@@ -19,7 +19,7 @@
 my $to_url = '/TestFilter__in_bbs_msg';
 
 sub handler : FilterConnectionHandler {
-my($filter, $bb, $mode, $block, $readbytes) = @_;
+my ($filter, $bb, $mode, $block, $readbytes) = @_;
 
 debug "FILTER CALLED";
 

Modified: perl/modperl/trunk/t/filter/TestFilter/in_bbs_underrun.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/filter/TestFilter/in_bbs_underrun.pm?rev=266270&r1=266269&r2=266270&view=diff
==
--- perl/modperl/trunk/t/filter/TestFilter/in_bbs_underrun.pm (original)
+++ perl/modperl/trunk/t/filter/TestFilter/in_bbs_underrun.pm Thu Sep  1 
21:28:36 2005
@@ -56,7 +56,7 @@
 use constant SIZE => 1024*16 + 5; # ~16k
 
 sub handler {
-my($filter, $bb, $mode, $block, $readbytes) = @_;
+my ($filter, $bb, $mode, $block, $readbytes) = @_;
 my $ba = $filter->r->connection->bucket_alloc;
 my $ctx = $filter->ctx;
 my $buffer = defined $ctx ? $ctx : '';

Modified: perl/modperl/trunk/t/filter/TestFilter/out_bbs_basic.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/filter/TestFilter/out_bbs_basic.pm?rev=266270&r1=266269&r2=266270&view=diff
==
--- perl/modperl/trunk/t/filter/TestFilter/out_bbs_basic.pm (original)
+++ perl/modperl/trunk/t/filter/TestFilter/out_bbs_basic.pm Thu Sep  1 21:28:36 
2005
@@ -18,7 +18,7 @@
 sub Apache::TestToString::

svn commit: r266271 - in /perl/modperl/trunk/t/hooks: TestHooks/authen_basic.pm TestHooks/authz.pm TestHooks/push_handlers_anon.pm TestHooks/startup.pm hookrun.t

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:28:54 2005
New Revision: 266271

URL: http://svn.apache.org/viewcvs?rev=266271&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/t/hooks/TestHooks/authen_basic.pm
perl/modperl/trunk/t/hooks/TestHooks/authz.pm
perl/modperl/trunk/t/hooks/TestHooks/push_handlers_anon.pm
perl/modperl/trunk/t/hooks/TestHooks/startup.pm
perl/modperl/trunk/t/hooks/hookrun.t

Modified: perl/modperl/trunk/t/hooks/TestHooks/authen_basic.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/hooks/TestHooks/authen_basic.pm?rev=266271&r1=266270&r2=266271&view=diff
==
--- perl/modperl/trunk/t/hooks/TestHooks/authen_basic.pm (original)
+++ perl/modperl/trunk/t/hooks/TestHooks/authen_basic.pm Thu Sep  1 21:28:54 
2005
@@ -10,7 +10,7 @@
 sub handler {
 my $r = shift;
 
-my($rc, $sent_pw) = $r->get_basic_auth_pw;
+my ($rc, $sent_pw) = $r->get_basic_auth_pw;
 
 return $rc if $rc != Apache2::Const::OK;
 

Modified: perl/modperl/trunk/t/hooks/TestHooks/authz.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/hooks/TestHooks/authz.pm?rev=266271&r1=266270&r2=266271&view=diff
==
--- perl/modperl/trunk/t/hooks/TestHooks/authz.pm (original)
+++ perl/modperl/trunk/t/hooks/TestHooks/authz.pm Thu Sep  1 21:28:54 2005
@@ -10,7 +10,7 @@
 sub auth_any {
 my $r = shift;
 
-my($res, $sent_pw) = $r->get_basic_auth_pw;
+my ($res, $sent_pw) = $r->get_basic_auth_pw;
 return $res if $res != Apache2::Const::OK;
 
 unless($r->user and $sent_pw) {
@@ -30,7 +30,7 @@
 
 return Apache2::Const::HTTP_UNAUTHORIZED unless $user;
 
-my($u, @allowed) = split /\s+/, $r->requires->[0]->{requirement};
+my ($u, @allowed) = split /\s+/, $r->requires->[0]->{requirement};
 
 return Apache2::Const::HTTP_UNAUTHORIZED unless grep { $_ eq $user } 
@allowed;
 

Modified: perl/modperl/trunk/t/hooks/TestHooks/push_handlers_anon.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/hooks/TestHooks/push_handlers_anon.pm?rev=266271&r1=266270&r2=266271&view=diff
==
--- perl/modperl/trunk/t/hooks/TestHooks/push_handlers_anon.pm (original)
+++ perl/modperl/trunk/t/hooks/TestHooks/push_handlers_anon.pm Thu Sep  1 
21:28:54 2005
@@ -50,7 +50,7 @@
 use Apache::TestRequest;
 Apache::TestRequest::module('TestHooks::push_handlers_anon');
 my $hostport = Apache::TestRequest::hostport(Apache::Test::config());
-my($host, $port) = split ':', $hostport;
+my ($host, $port) = split ':', $hostport;
 my $s = Apache2::ServerUtil->server;
 my $vs = $s->next;
 for (; $vs; $vs = $vs->next) {

Modified: perl/modperl/trunk/t/hooks/TestHooks/startup.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/hooks/TestHooks/startup.pm?rev=266271&r1=266270&r2=266271&view=diff
==
--- perl/modperl/trunk/t/hooks/TestHooks/startup.pm (original)
+++ perl/modperl/trunk/t/hooks/TestHooks/startup.pm Thu Sep  1 21:28:54 2005
@@ -24,7 +24,7 @@
 my $dir = catdir Apache::Test::vars("documentroot"), 'hooks', 'startup';
 
 sub open_logs {
-my($conf_pool, $log_pool, $temp_pool, $s) = @_;
+my ($conf_pool, $log_pool, $temp_pool, $s) = @_;
 
 # main server
 run("open_logs", $s);
@@ -41,7 +41,7 @@
 }
 
 sub post_config {
-my($conf_pool, $log_pool, $temp_pool, $s) = @_;
+my ($conf_pool, $log_pool, $temp_pool, $s) = @_;
 
 # main server
 run("post_config", $s);
@@ -58,7 +58,7 @@
 }
 
 sub run {
-my($phase, $s) = @_;
+my ($phase, $s) = @_;
 
 my $val = $s->dir_config->{PostConfig} or die "Can't read PostConfig var";
 

Modified: perl/modperl/trunk/t/hooks/hookrun.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/hooks/hookrun.t?rev=266271&r1=266270&r2=266271&view=diff
==
--- perl/modperl/trunk/t/hooks/hookrun.t (original)
+++ perl/modperl/trunk/t/hooks/hookrun.t Thu Sep  1 21:28:54 2005
@@ -20,6 +20,6 @@
 
 my $body = GET_BODY_ASSERT "http://$hostport/$path?normal";;
 for my $line (split /\n/, $body) {
-my($phase, $value) = split /:/, $line;
+my ($phase, $value) = split /:/, $line;
 ok t_cmp $value, 1, "$phase";
 }

svn commit: r266272 - in /perl/modperl/trunk/t/lib: TestAPRlib/string.pm TestAPRlib/table.pm TestAPRlib/uri.pm TestAPRlib/util.pm TestCommon/FilterDebug.pm TestCommon/SameInterp.pm TestCommon/TiePerlSection.pm TestExit/FromPerlModule.pm

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:29:14 2005
New Revision: 266272

URL: http://svn.apache.org/viewcvs?rev=266272&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/t/lib/TestAPRlib/string.pm
perl/modperl/trunk/t/lib/TestAPRlib/table.pm
perl/modperl/trunk/t/lib/TestAPRlib/uri.pm
perl/modperl/trunk/t/lib/TestAPRlib/util.pm
perl/modperl/trunk/t/lib/TestCommon/FilterDebug.pm
perl/modperl/trunk/t/lib/TestCommon/SameInterp.pm
perl/modperl/trunk/t/lib/TestCommon/TiePerlSection.pm
perl/modperl/trunk/t/lib/TestExit/FromPerlModule.pm

Modified: perl/modperl/trunk/t/lib/TestAPRlib/string.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestAPRlib/string.pm?rev=266272&r1=266271&r2=266272&view=diff
==
--- perl/modperl/trunk/t/lib/TestAPRlib/string.pm (original)
+++ perl/modperl/trunk/t/lib/TestAPRlib/string.pm Thu Sep  1 21:29:14 2005
@@ -24,7 +24,7 @@
 sub test {
 
 t_debug("size_string");
-while (my($k, $v) = each %size_string) {
+while (my ($k, $v) = each %size_string) {
 ok t_cmp($v, APR::String::format_size($k));
 }
 }

Modified: perl/modperl/trunk/t/lib/TestAPRlib/table.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestAPRlib/table.pm?rev=266272&r1=266271&r2=266272&view=diff
==
--- perl/modperl/trunk/t/lib/TestAPRlib/table.pm (original)
+++ perl/modperl/trunk/t/lib/TestAPRlib/table.pm Thu Sep  1 21:29:14 2005
@@ -191,7 +191,7 @@
 $table->add("first"  => 3);
 
 my $i = 0;
-while (my($a,$b) = each %$table) {
+while (my ($a,$b) = each %$table) {
 my $key = ("first", "second")[$i % 2];
 my $val = ++$i;
 
@@ -351,7 +351,7 @@
 }
 
 sub my_filter {
-my($key, $value) = @_;
+my ($key, $value) = @_;
 $filter_count++;
 unless ($key eq chr($value+97)) {
 die "arguments I received are bogus($key,$value)";
@@ -360,7 +360,7 @@
 }
 
 sub my_filter_stop {
-my($key, $value) = @_;
+my ($key, $value) = @_;
 $filter_count++;
 unless ($key eq chr($value+97)) {
 die "arguments I received are bogus($key,$value)";

Modified: perl/modperl/trunk/t/lib/TestAPRlib/uri.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestAPRlib/uri.pm?rev=266272&r1=266271&r2=266272&view=diff
==
--- perl/modperl/trunk/t/lib/TestAPRlib/uri.pm (original)
+++ perl/modperl/trunk/t/lib/TestAPRlib/uri.pm Thu Sep  1 21:29:14 2005
@@ -154,7 +154,7 @@
 }
 
 ### port_of_scheme ###
-while (my($scheme, $port) = each %default_ports) {
+while (my ($scheme, $port) = each %default_ports) {
 my $apr_port = APR::URI::port_of_scheme($scheme);
 ok t_cmp($apr_port, $port, "scheme: $scheme");
 }

Modified: perl/modperl/trunk/t/lib/TestAPRlib/util.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestAPRlib/util.pm?rev=266272&r1=266271&r2=266272&view=diff
==
--- perl/modperl/trunk/t/lib/TestAPRlib/util.pm (original)
+++ perl/modperl/trunk/t/lib/TestAPRlib/util.pm Thu Sep  1 21:29:14 2005
@@ -34,7 +34,7 @@
 {
 ok ! APR::Util::password_validate("one", "two");
 
-while (my($mode, $hash) = each %hashes) {
+while (my ($mode, $hash) = each %hashes) {
 t_debug($mode);
 if ($mode eq 'crypt' && !CRYPT_WORKS) {
 t_debug("crypt is not supported on $^O");

Modified: perl/modperl/trunk/t/lib/TestCommon/FilterDebug.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestCommon/FilterDebug.pm?rev=266272&r1=266271&r2=266272&view=diff
==
--- perl/modperl/trunk/t/lib/TestCommon/FilterDebug.pm (original)
+++ perl/modperl/trunk/t/lib/TestCommon/FilterDebug.pm Thu Sep  1 21:29:14 2005
@@ -24,7 +24,7 @@
 
 sub snoop {
 my $type = shift;
-my($filter, $bb, $mode, $block, $readbytes) = @_; # filter args
+my ($filter, $bb, $mode, $block, $readbytes) = @_; # filter args
 
 # $mode, $block, $readbytes are passed only for input filters
 my $stream = defined $mode ? "input" : "output";
@@ -50,7 +50,7 @@
 }
 
 sub bb_dump {
-my($type, $stream, $bb) = @_;
+my ($type, $stream, $bb) = @_;
 
 my @data;
 for (my $b = $bb->first; $b; $b = $bb->next($b)) {
@@ -69,7 +69,7 @@
 }
 
 my $c = 1;
-while (my($btype, $data) = splice @data, 0, 2) {
+while (my ($btype, $data) = splice @data, 0, 2) {
 print STDERR "o bucket $c: $btype\n&

svn commit: r266273 - /perl/modperl/trunk/t/modperl/setupenv2.t

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:29:34 2005
New Revision: 266273

URL: http://svn.apache.org/viewcvs?rev=266273&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/t/modperl/setupenv2.t

Modified: perl/modperl/trunk/t/modperl/setupenv2.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/modperl/setupenv2.t?rev=266273&r1=266272&r2=266273&view=diff
==
--- perl/modperl/trunk/t/modperl/setupenv2.t (original)
+++ perl/modperl/trunk/t/modperl/setupenv2.t Thu Sep  1 21:29:34 2005
@@ -17,7 +17,7 @@
 
 plan tests => 2 + scalar(@{ $expected{mixed} }) + scalar(@{ $expected{perl} });
 
-while (my($k, $v) = each %expected) {
+while (my ($k, $v) = each %expected) {
 my @expected = @$v;
 my $elements = scalar @expected;
 my $received = GET_BODY "$location?$k";

svn commit: r266274 - in /perl/modperl/trunk/t/protocol: TestProtocol/pseudo_http.pm pseudo_http.t

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:30:03 2005
New Revision: 266274

URL: http://svn.apache.org/viewcvs?rev=266274&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/t/protocol/TestProtocol/pseudo_http.pm
perl/modperl/trunk/t/protocol/pseudo_http.t

Modified: perl/modperl/trunk/t/protocol/TestProtocol/pseudo_http.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/protocol/TestProtocol/pseudo_http.pm?rev=266274&r1=266273&r2=266274&view=diff
==
--- perl/modperl/trunk/t/protocol/TestProtocol/pseudo_http.pm (original)
+++ perl/modperl/trunk/t/protocol/TestProtocol/pseudo_http.pm Thu Sep  1 
21:30:03 2005
@@ -123,7 +123,7 @@
 }
 
 sub prompt {
-my($socket, $msg) = @_;
+my ($socket, $msg) = @_;
 
 $socket->send("$msg:\n");
 getline($socket);

Modified: perl/modperl/trunk/t/protocol/pseudo_http.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/protocol/pseudo_http.t?rev=266274&r1=266273&r2=266274&view=diff
==
--- perl/modperl/trunk/t/protocol/pseudo_http.t (original)
+++ perl/modperl/trunk/t/protocol/pseudo_http.t Thu Sep  1 21:30:03 2005
@@ -55,13 +55,13 @@
 }
 
 sub expect {
-my($socket, $expect, $action) = @_;
+my ($socket, $expect, $action) = @_;
 chomp(my $recv = <$socket> || '');
 ok t_cmp($recv, $expect, $action);
 }
 
 sub expect_reply {
-my($socket, $expect, $reply, $action) = @_;
+my ($socket, $expect, $reply, $action) = @_;
 chomp(my $recv = <$socket> || '');
 ok t_cmp($recv, $expect, $action);
 t_debug("send: $reply");

svn commit: r266275 - in /perl/modperl/trunk/t/response: TestAPI/ TestAPR/ TestApache/ TestCompat/ TestDirective/ TestError/ TestModperl/

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:30:22 2005
New Revision: 266275

URL: http://svn.apache.org/viewcvs?rev=266275&view=rev
Log:
s/my(/my (/g


Modified:
perl/modperl/trunk/t/response/TestAPI/access2.pm
perl/modperl/trunk/t/response/TestAPI/aplog.pm
perl/modperl/trunk/t/response/TestAPI/in_out_filters.pm
perl/modperl/trunk/t/response/TestAPI/lookup_uri2.pm
perl/modperl/trunk/t/response/TestAPI/request_util.pm
perl/modperl/trunk/t/response/TestAPI/status.pm
perl/modperl/trunk/t/response/TestAPR/flatten.pm
perl/modperl/trunk/t/response/TestAPR/perlio.pm
perl/modperl/trunk/t/response/TestApache/subprocess.pm
perl/modperl/trunk/t/response/TestApache/util.pm
perl/modperl/trunk/t/response/TestCompat/apache_module.pm
perl/modperl/trunk/t/response/TestCompat/apache_util.pm
perl/modperl/trunk/t/response/TestCompat/conn_authen.pm
perl/modperl/trunk/t/response/TestDirective/cmdparms.pm
perl/modperl/trunk/t/response/TestDirective/env.pm
perl/modperl/trunk/t/response/TestDirective/perlloadmodule.pm
perl/modperl/trunk/t/response/TestDirective/perlloadmodule2.pm
perl/modperl/trunk/t/response/TestDirective/perlloadmodule3.pm
perl/modperl/trunk/t/response/TestDirective/perlloadmodule4.pm
perl/modperl/trunk/t/response/TestDirective/perlloadmodule5.pm
perl/modperl/trunk/t/response/TestDirective/perlloadmodule6.pm
perl/modperl/trunk/t/response/TestDirective/perlloadmodule7.pm
perl/modperl/trunk/t/response/TestDirective/perlrequire.pm
perl/modperl/trunk/t/response/TestDirective/setupenv.pm
perl/modperl/trunk/t/response/TestError/runtime.pm
perl/modperl/trunk/t/response/TestModperl/cookie.pm
perl/modperl/trunk/t/response/TestModperl/cookie2.pm
perl/modperl/trunk/t/response/TestModperl/method.pm
perl/modperl/trunk/t/response/TestModperl/setupenv2.pm
perl/modperl/trunk/t/response/TestModperl/subenv.pm

Modified: perl/modperl/trunk/t/response/TestAPI/access2.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestAPI/access2.pm?rev=266275&r1=266274&r2=266275&view=diff
==
--- perl/modperl/trunk/t/response/TestAPI/access2.pm (original)
+++ perl/modperl/trunk/t/response/TestAPI/access2.pm Thu Sep  1 21:30:22 2005
@@ -51,12 +51,12 @@
 die "wanted satisfies=" . Apache2::Const::SATISFY_ALL . ", got $satisfies"
 unless $r->satisfies() == Apache2::Const::SATISFY_ALL;
 
-my($rc, $sent_pw) = $r->get_basic_auth_pw;
+my ($rc, $sent_pw) = $r->get_basic_auth_pw;
 return $rc if $rc != Apache2::Const::OK;
 
 # extract just the requirement entries
 my %require = 
-map { my($k, $v) = split /\s+/, $_->{requirement}, 2; ($k, $v||'') }
+map { my ($k, $v) = split /\s+/, $_->{requirement}, 2; ($k, $v||'') }
 @{ $r->requires };
 debug \%require;
 

Modified: perl/modperl/trunk/t/response/TestAPI/aplog.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestAPI/aplog.pm?rev=266275&r1=266274&r2=266275&view=diff
==
--- perl/modperl/trunk/t/response/TestAPI/aplog.pm (original)
+++ perl/modperl/trunk/t/response/TestAPI/aplog.pm Thu Sep  1 21:30:22 2005
@@ -46,7 +46,7 @@
 qr/... TestAPI::aplog test in progress/,
 '$r->log->info';
 
-my($file, $line) = Apache2::Log::LOG_MARK;
+my ($file, $line) = Apache2::Log::LOG_MARK;
 ok $file eq __FILE__;
 ok $line == __LINE__ - 2;
 

Modified: perl/modperl/trunk/t/response/TestAPI/in_out_filters.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestAPI/in_out_filters.pm?rev=266275&r1=266274&r2=266275&view=diff
==
--- perl/modperl/trunk/t/response/TestAPI/in_out_filters.pm (original)
+++ perl/modperl/trunk/t/response/TestAPI/in_out_filters.pm Thu Sep  1 21:30:22 
2005
@@ -34,7 +34,7 @@
 }
 
 sub send_response_body {
-my($r, $data) = @_;
+my ($r, $data) = @_;
 
 my $bb = APR::Brigade->new($r->pool,
$r->connection->bucket_alloc);

Modified: perl/modperl/trunk/t/response/TestAPI/lookup_uri2.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestAPI/lookup_uri2.pm?rev=266275&r1=266274&r2=266275&view=diff
==
--- perl/modperl/trunk/t/response/TestAPI/lookup_uri2.pm (original)
+++ perl/modperl/trunk/t/response/TestAPI/lookup_uri2.pm Thu Sep  1 21:30:22 
2005
@@ -28,7 +28,7 @@
 }
 
 sub subrequest {
-my($r, $sub) = @_;
+my ($r, $sub) = @_;
 (my $uri = join '::', __PACKAGE__, $sub) =~ s!::!__!g;
 $r->lookup_uri($uri)->run;
 }

Modified: per

svn commit: r266276 - in /perl/modperl/trunk/ModPerl-Registry: lib/ModPerl/RegistryCooker.pm lib/ModPerl/RegistryLoader.pm t/304.t

2005-09-01 Thread pgollucci

Author: pgollucci
Date: Thu Sep  1 21:31:53 2005
New Revision: 266276

URL: http://svn.apache.org/viewcvs?rev=266276&view=rev
Log:
s/my(/my (/g

Modified:
perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryLoader.pm
perl/modperl/trunk/ModPerl-Registry/t/304.t

Modified: perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm?rev=266276&r1=266275&r2=266276&view=diff
==
--- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm Thu Sep  
1 21:31:53 2005
@@ -103,7 +103,7 @@
 #
 
 sub new {
-my($class, $r) = @_;
+my ($class, $r) = @_;
 my $self = bless {}, $class;
 $self->init($r);
 return $self;
@@ -575,7 +575,7 @@
 
 sub shebang_to_perl {
 my $self = shift;
-my($line) = ${ $self->{CODE} } =~ /^(.*)$/m;
+my ($line) = ${ $self->{CODE} } =~ /^(.*)$/m;
 my @cmdline = split /\s+/, $line;
 return "" unless @cmdline;
 return "" unless shift(@cmdline) =~ /^\#!/;
@@ -617,7 +617,7 @@
 *chdir_file = \&NOP;
 
 sub chdir_file_normal {
-my($self, $dir) = @_;
+my ($self, $dir) = @_;
 $dir ||= File::Basename::dirname($self->{FILENAME});
 $self->debug("chdir $dir") if DEBUG & D_NOISE;
 chdir $dir or die "Can't chdir to $dir: $!";
@@ -662,7 +662,7 @@
 #
 
 sub compile {
-my($self, $eval) = @_;
+my ($self, $eval) = @_;
 
 $self->debug("compiling $self->{FILENAME}") if DEBUG && D_COMPILE;
 
@@ -711,10 +711,10 @@
 #
 
 sub install_aliases {
-my($class, $rh_aliases) = @_;
+my ($class, $rh_aliases) = @_;
 
 no strict 'refs';
-while (my($k,$v) = each %$rh_aliases) {
+while (my ($k,$v) = each %$rh_aliases) {
 if (my $sub = *{$v}{CODE}){
 *{ $class . "::$k" } = $sub;
 }
@@ -733,7 +733,7 @@
 }
 
 sub log_error {
-my($self, $msg) = @_;
+my ($self, $msg) = @_;
 my $class = ref $self;
 
 $self->{REQ}->log_error($msg);
@@ -763,7 +763,7 @@
 # cache_table() to point to another function, this function will fail.
 sub uncache_myself {
 my $package = scalar caller;
-my($class) = __PACKAGE__->cache_table_common();
+my ($class) = __PACKAGE__->cache_table_common();
 
 unless (defined $class) {
 Apache2->warn("$$: cannot figure out cache symbol table for $package");

Modified: perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryLoader.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryLoader.pm?rev=266276&r1=266275&r2=266276&view=diff
==
--- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryLoader.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryLoader.pm Thu Sep  
1 21:31:53 2005
@@ -39,7 +39,7 @@
 }
 
 sub handler {
-my($self, $uri, $filename, $virthost) = @_;
+my ($self, $uri, $filename, $virthost) = @_;
 
 # set the inheritance rules at run time
 @ISA = $self->{package};
@@ -143,7 +143,7 @@
 }
 
 sub load_package {
-my($self, $package) = @_;
+my ($self, $package) = @_;
 
 croak "package to load wasn't specified" unless defined $package;
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/304.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/304.t?rev=266276&r1=266275&r2=266276&view=diff
==
--- perl/modperl/trunk/ModPerl-Registry/t/304.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/304.t Thu Sep  1 21:31:53 2005
@@ -42,7 +42,7 @@
 'Thu Juk 99 00:00:00  FUK'  => "bogus If-Modified-Since #2",
 );
 my $received = 'Test';
-while ( my($if_modified_since, $debug) = each %dates) {
+while ( my ($if_modified_since, $debug) = each %dates) {
 my $res = GET($url, 'If-Modified-Since' => $if_modified_since);
 t_debug "If-Modified-Since $if_modified_since";
 ok t_cmp(

svn commit: r279210 - in /perl/modperl/trunk: Changes lib/Apache2/SizeLimit.pm

2005-09-06 Thread pgollucci

Author: pgollucci
Date: Tue Sep  6 19:04:55 2005
New Revision: 279210

URL: http://svn.apache.org/viewcvs?rev=279210&view=rev
Log:
enable smaps support on linux systems that support it.

Submitted By: Torsten Foertsch <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>


Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/SizeLimit.pm

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=279210&r1=279209&r2=279210&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Tue Sep  6 19:04:55 2005
@@ -12,6 +12,11 @@
 
 =item 2.0.2-dev
 
+Add support for the newer Smaps (/proc/self/statm) on Linux
+systems that support it (i.e. linux-2.6.13-rc4-mm1)
+to accurately count the amount of shared memory.
+[Torsten Foertsch ]
+
 On cygwin some dlls might happen to be with identical base addresses
 and if you try to load both of them you'll get an error and you'll
 have to use the rebase utility to fix them.  this fix should prevent

Modified: perl/modperl/trunk/lib/Apache2/SizeLimit.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/SizeLimit.pm?rev=279210&r1=279209&r2=279210&view=diff
==
--- perl/modperl/trunk/lib/Apache2/SizeLimit.pm (original)
+++ perl/modperl/trunk/lib/Apache2/SizeLimit.pm Tue Sep  6 19:04:55 2005
@@ -34,13 +34,14 @@
 
 use Apache2::Const -compile => qw(OK DECLINED);
 
-our $VERSION = '0.04';
+our $VERSION = '0.05';
 
 our $CHECK_EVERY_N_REQUESTS = 1;
 our $REQUEST_COUNT  = 1;
 our $MAX_PROCESS_SIZE   = 0;
 our $MIN_SHARE_SIZE = 0;
 our $MAX_UNSHARED_SIZE  = 0;
+our $USE_SMAPS  = 1;
 
 our ($HOW_BIG_IS_IT, $START_TIME);
 
@@ -55,9 +56,12 @@
 $HOW_BIG_IS_IT = \&solaris_2_6_size_check;
 
 } elsif (LINUX) {
-
-$HOW_BIG_IS_IT = \&linux_size_check;
-
+if ( eval { require Linux::Smaps } and Linux::Smaps->new($$) ) {
+$HOW_BIG_IS_IT = \&linux_smaps_size_check_first_time;
+} else {
+$USE_SMAPS = 0;
+$HOW_BIG_IS_IT = \&linux_size_check;
+}
 } elsif (BSD_LIKE) {
 
 # will getrusage work on all BSDs?  I should hope so.
@@ -83,6 +87,23 @@
 die "Apache2::SizeLimit not implemented on $^O";
 
 }
+}
+
+sub linux_smaps_size_check_first_time {
+
+if ($USE_SMAPS) {
+$HOW_BIG_IS_IT = \&linux_smaps_size_check;
+} else {
+$HOW_BIG_IS_IT = \&linux_size_check;
+}
+
+goto &$HOW_BIG_IS_IT;
+}
+
+sub linux_smaps_size_check {
+
+my $s = Linux::Smaps->new($$)->all;
+return ($s->size, $s->shared_cleani + $s->shared_dirty);
 }
 
 # return process size (in KB)

svn commit: r279387 - /perl/modperl/trunk/lib/Apache2/SizeLimit.pm

2005-09-07 Thread pgollucci

Author: pgollucci
Date: Wed Sep  7 10:54:52 2005
New Revision: 279387

URL: http://svn.apache.org/viewcvs?rev=279387&view=rev
Log:
uncuddle the eslif and else to match our style guid

Modified:
perl/modperl/trunk/lib/Apache2/SizeLimit.pm

Modified: perl/modperl/trunk/lib/Apache2/SizeLimit.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/SizeLimit.pm?rev=279387&r1=279386&r2=279387&view=diff
==
--- perl/modperl/trunk/lib/Apache2/SizeLimit.pm (original)
+++ perl/modperl/trunk/lib/Apache2/SizeLimit.pm Wed Sep  7 10:54:52 2005
@@ -55,34 +55,40 @@
 
 $HOW_BIG_IS_IT = \&solaris_2_6_size_check;
 
-} elsif (LINUX) {
+}
+elsif (LINUX) {
 if ( eval { require Linux::Smaps } and Linux::Smaps->new($$) ) {
 $HOW_BIG_IS_IT = \&linux_smaps_size_check_first_time;
 } else {
 $USE_SMAPS = 0;
 $HOW_BIG_IS_IT = \&linux_size_check;
 }
-} elsif (BSD_LIKE) {
+}
+elsif (BSD_LIKE) {
 
 # will getrusage work on all BSDs?  I should hope so.
 if ( eval { require BSD::Resource } ) {
 $HOW_BIG_IS_IT = \&bsd_size_check;
-} else {
+}
+else {
 die "you must install BSD::Resource for Apache2::SizeLimit " .
 "to work on your platform.";
 }
 
 #  Currently unsupported for mp2 because of threads...
-# } elsif (WIN32) {
+# }
+#  elsif (WIN32) {
 # 
 # if ( eval { require Win32::API } ) {
 # $HOW_BIG_IS_IT = \&win32_size_check;
-# } else {
+# }
+#  else {
 # die "you must install Win32::API for Apache2::SizeLimit " .
 # "to work on your platform.";
 # }
 
-} else {
+}
+else {
 
 die "Apache2::SizeLimit not implemented on $^O";
 
@@ -114,7 +120,8 @@
 if (open my $fh, "<$file") {
 ($size, $resident, $share) = split /\s/, scalar <$fh>;
 close $fh;
-} else {
+}
+else {
 error_log("Fatal Error: couldn't access $file");
 }
 
@@ -196,7 +203,8 @@
 error_log($msg);
 
 $r->child_terminate();
-} else {# this is the main httpd, whose parent is init?
+}
+else {# this is the main httpd, whose parent is init?
 my $msg = "main process too big, SIZE=$size KB ";
 $msg .= " SHARE=$share KB" if $share;
 error_log($msg);
@@ -242,7 +250,8 @@
 # we want to operate in a cleanup handler
 if (ModPerl::Util::current_callback() eq 'PerlCleanupHandler') {
 exit_if_too_big($r);
-} else {
+}
+else {
 $r->pool->cleanup_register(\&exit_if_too_big, $r);
 }
 }

svn commit: r279392 - /perl/modperl/trunk/lib/Apache2/SizeLimit.pm

2005-09-07 Thread pgollucci

Author: pgollucci
Date: Wed Sep  7 11:06:27 2005
New Revision: 279392

URL: http://svn.apache.org/viewcvs?rev=279392&view=rev
Log:
missed one else to uncuddle

Modified:
perl/modperl/trunk/lib/Apache2/SizeLimit.pm

Modified: perl/modperl/trunk/lib/Apache2/SizeLimit.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/SizeLimit.pm?rev=279392&r1=279391&r2=279392&view=diff
==
--- perl/modperl/trunk/lib/Apache2/SizeLimit.pm (original)
+++ perl/modperl/trunk/lib/Apache2/SizeLimit.pm Wed Sep  7 11:06:27 2005
@@ -59,7 +59,8 @@
 elsif (LINUX) {
 if ( eval { require Linux::Smaps } and Linux::Smaps->new($$) ) {
 $HOW_BIG_IS_IT = \&linux_smaps_size_check_first_time;
-} else {
+}
+else {
 $USE_SMAPS = 0;
 $HOW_BIG_IS_IT = \&linux_size_check;
 }

svn commit: r279710 - /perl/modperl/trunk/lib/Bundle/Apache2.pm

2005-09-08 Thread pgollucci

Author: pgollucci
Date: Thu Sep  8 22:50:20 2005
New Revision: 279710

URL: http://svn.apache.org/viewcvs?rev=279710&view=rev
Log:
update CGI version

Modified:
perl/modperl/trunk/lib/Bundle/Apache2.pm

Modified: perl/modperl/trunk/lib/Bundle/Apache2.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Bundle/Apache2.pm?rev=279710&r1=279709&r2=279710&view=diff
==
--- perl/modperl/trunk/lib/Bundle/Apache2.pm (original)
+++ perl/modperl/trunk/lib/Bundle/Apache2.pm Thu Sep  8 22:50:20 2005
@@ -36,7 +36,7 @@
 
 Bundle::ApacheTest- Needs for testing
 
-CGI  3.10 - Used in testing (it's in core, but some vendors 
exclude it)
+CGI  3.11 - Used in testing (it's in core, but some vendors 
exclude it)
 
 Chatbot::Eliza- Used in testing

svn commit: r279736 - /perl/modperl/trunk/lib/ModPerl/Config.pm

2005-09-09 Thread pgollucci

Author: pgollucci
Date: Fri Sep  9 01:57:38 2005
New Revision: 279736

URL: http://svn.apache.org/viewcvs?rev=279736&view=rev
Log:
un cuddle else add somewhite space

Modified:
perl/modperl/trunk/lib/ModPerl/Config.pm

Modified: perl/modperl/trunk/lib/ModPerl/Config.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/Config.pm?rev=279736&r1=279735&r2=279736&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/Config.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Config.pm Fri Sep  9 01:57:38 2005
@@ -48,11 +48,13 @@
 
 # httpd opts
 my $test_config = Apache::TestConfig->new({thaw=>1});
+
 if (my $httpd = $test_config->{vars}->{httpd}) {
 $command = "$httpd -V";
 $cfg .= "\n\n*** $command\n";
 $cfg .= qx{$command};
-} else {
+} 
+else {
 $cfg .= "\n\n*** The httpd binary was not found\n";
 }

svn commit: r280242 - in /perl/modperl/trunk: Changes lib/Apache2/Build.pm

2005-09-11 Thread pgollucci

Author: pgollucci
Date: Sun Sep 11 20:28:27 2005
New Revision: 280242

URL: http://svn.apache.org/viewcvs?rev=280242&view=rev
Log:
Improve the detection of whether or not we are in an mp2 build tree

Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=280242&r1=280241&r2=280242&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Sun Sep 11 20:28:27 2005
@@ -12,6 +12,11 @@
 
 =item 2.0.2-dev
 
+Improve the detection of whether or not we are in an mp2 build tree.
+This allows usage of ExtUtils::MakeMaker options such as PREFIX to
+not break the probe of mp2 build trees.
+[Stas, Philip M. Gollucci]
+
 Add support for the newer Smaps (/proc/self/statm) on Linux
 systems that support it (i.e. linux-2.6.13-rc4-mm1)
 to accurately count the amount of shared memory.

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=280242&r1=280241&r2=280242&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Sun Sep 11 20:28:27 2005
@@ -26,7 +26,7 @@
 use ExtUtils::Embed ();
 use File::Copy ();
 
-use constant IS_MOD_PERL_BUILD => grep { -e "$_/lib/mod_perl2.pm" } qw(. ..);
+use constant IS_MOD_PERL_BUILD => grep { -e "$_/Makefile.PL" && -e 
"$_/lib/mod_perl2.pm" } qw(. ..);
 
 use constant AIX => $^O eq 'aix';
 use constant DARWIN  => $^O eq 'darwin';

svn commit: r280243 - in /perl/modperl/trunk: Changes lib/ModPerl/WrapXS.pm

2005-09-11 Thread pgollucci

Author: pgollucci
Date: Sun Sep 11 20:32:05 2005
New Revision: 280243

URL: http://svn.apache.org/viewcvs?rev=280243&view=rev
Log:
Correctly set the version of ModPerl::MethodLookup


Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/ModPerl/WrapXS.pm

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=280243&r1=280242&r2=280243&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Sun Sep 11 20:32:05 2005
@@ -12,6 +12,10 @@
 
 =item 2.0.2-dev
 
+Correctly set the version of ModPerl::MethodLookup, previously,
+it was not set because of the way it was Generating via ModPerl::WrapXS.
+[Philip M. Gollucci]
+
 Improve the detection of whether or not we are in an mp2 build tree.
 This allows usage of ExtUtils::MakeMaker options such as PREFIX to
 not break the probe of mp2 build trees.

Modified: perl/modperl/trunk/lib/ModPerl/WrapXS.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/WrapXS.pm?rev=280243&r1=280242&r2=280243&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/WrapXS.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/WrapXS.pm Sun Sep 11 20:32:05 2005
@@ -766,9 +766,10 @@
 print $fh <<'EOF';
 
 use base qw(Exporter);
+use mod_perl2;
 
 our @EXPORT = qw(print_method print_module print_object);
-
+our $VERSION = $mod_perl2::VERSION;
 use constant MODULE => 0;
 use constant OBJECT  => 1;

svn commit: r280262 - in /perl/modperl/trunk: Changes lib/Apache2/Status.pm lib/mod_perl2.pm

2005-09-11 Thread pgollucci

Author: pgollucci
Date: Sun Sep 11 22:39:27 2005
New Revision: 280262

URL: http://svn.apache.org/viewcvs?rev=280262&view=rev
Log:
Tweak the handling of the backcomat @INC handling for mod_perl.pm to
help tools such as Apache2::Status not display erroneous information.


Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Status.pm
perl/modperl/trunk/lib/mod_perl2.pm

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=280262&r1=280261&r2=280262&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Sun Sep 11 22:39:27 2005
@@ -12,6 +12,10 @@
 
 =item 2.0.2-dev
 
+Prevent tools such as Apache2::Status's Loaded Modules screen
+from displaying erroneous information about mod_perl.pm being loaded.
+[Stas, Philip M. Gollucci]
+
 Correctly set the version of ModPerl::MethodLookup, previously,
 it was not set because of the way it was Generating via ModPerl::WrapXS.
 [Philip M. Gollucci]

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=280262&r1=280261&r2=280262&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Sun Sep 11 22:39:27 2005
@@ -210,6 +210,7 @@
 next if $file =~ m:^/:;
 next unless $file =~ m:\.pm:;
 next unless $INC{$file}; #e.g. fake Apache2/TieHandle.pm
+next if $module eq 'mod_perl';
 
 no strict 'refs';
 (my $module = $file) =~ s,/,::,g;

Modified: perl/modperl/trunk/lib/mod_perl2.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/mod_perl2.pm?rev=280262&r1=280261&r2=280262&view=diff
==
--- perl/modperl/trunk/lib/mod_perl2.pm (original)
+++ perl/modperl/trunk/lib/mod_perl2.pm Sun Sep 11 22:39:27 2005
@@ -16,6 +16,7 @@
 
 use 5.006;
 use strict;
+use File::Spec::Functions;
 
 BEGIN {
 our $VERSION = "2.02";
@@ -48,7 +49,7 @@
 # startup you are protected against loading mod_perl.pm
 # (either 1.0 or 1.99) at a later time by accident.
 $mod_perl::VERSION = $mod_perl2::VERSION;
-$INC{"mod_perl.pm"} = __FILE__;
+$INC{"mod_perl.pm"} = File::Spec::Functions::devnull(); 
 
 1;
 __END__

svn commit: r280263 - /perl/modperl/trunk/lib/Apache2/Build.pm

2005-09-11 Thread pgollucci

Author: pgollucci
Date: Sun Sep 11 22:42:03 2005
New Revision: 280263

URL: http://svn.apache.org/viewcvs?rev=280263&view=rev
Log:
wrap long line, thanks stas

Modified:
perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=280263&r1=280262&r2=280263&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Sun Sep 11 22:42:03 2005
@@ -26,7 +26,8 @@
 use ExtUtils::Embed ();
 use File::Copy ();
 
-use constant IS_MOD_PERL_BUILD => grep { -e "$_/Makefile.PL" && -e 
"$_/lib/mod_perl2.pm" } qw(. ..);
+use constant IS_MOD_PERL_BUILD => grep 
+{ -e "$_/Makefile.PL" && -e "$_/lib/mod_perl2.pm" } qw(. ..);
 
 use constant AIX => $^O eq 'aix';
 use constant DARWIN  => $^O eq 'darwin';

svn commit: r280266 - /perl/modperl/trunk/lib/Apache2/Status.pm

2005-09-11 Thread pgollucci

Author: pgollucci
Date: Sun Sep 11 22:57:10 2005
New Revision: 280266

URL: http://svn.apache.org/viewcvs?rev=280266&view=rev
Log:
oops!, this needs to be after the my $module line.


Modified:
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=280266&r1=280265&r2=280266&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Sun Sep 11 22:57:10 2005
@@ -210,11 +210,11 @@
 next if $file =~ m:^/:;
 next unless $file =~ m:\.pm:;
 next unless $INC{$file}; #e.g. fake Apache2/TieHandle.pm
-next if $module eq 'mod_perl';
 
 no strict 'refs';
 (my $module = $file) =~ s,/,::,g;
 $module =~ s,\.pm$,,;
+next if $module eq 'mod_perl';
 my $v = ${"$module\:\:VERSION"} || '0.00';
 push @retval, (
 "",

svn commit: r280495 - /perl/modperl/trunk/lib/ModPerl/Config.pm

2005-09-12 Thread pgollucci

Author: pgollucci
Date: Mon Sep 12 21:42:31 2005
New Revision: 280495

URL: http://svn.apache.org/viewcvs?rev=280495&view=rev
Log:
Add a DARWIN constant and add ldd/otool -L output to mp2bug reports


Modified:
perl/modperl/trunk/lib/ModPerl/Config.pm

Modified: perl/modperl/trunk/lib/ModPerl/Config.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/Config.pm?rev=280495&r1=280494&r2=280495&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/Config.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Config.pm Mon Sep 12 21:42:31 2005
@@ -21,6 +21,7 @@
 use File::Spec ();
 
 use constant WIN32 => Apache2::Build::WIN32;
+use constant DARWIN => Apache2::Build::DARWIN;
 
 sub as_string {
 my $build = Apache2::Build->build_config;
@@ -53,6 +54,22 @@
 $command = "$httpd -V";
 $cfg .= "\n\n*** $command\n";
 $cfg .= qx{$command};
+
+my $command;
+
+if (DARWIN) {
+my $otool = Apache::TestConfig::which('otool');
+$command = " -L $otool" if $otool;
+}
+elsif (!WIN32) {
+my $ldd = Apache::TestConfig::which('ldd');
+$command = "$ldd $httpd" if $ldd;
+}
+
+if ($command) {
+$cfg .= "\n*** $command\n";
+$cfg .= qx{$command};
+}
 } 
 else {
 $cfg .= "\n\n*** The httpd binary was not found\n";

svn commit: r280497 - /perl/modperl/trunk/lib/ModPerl/Config.pm

2005-09-12 Thread pgollucci

Author: pgollucci
Date: Mon Sep 12 21:48:47 2005
New Revision: 280497

URL: http://svn.apache.org/viewcvs?rev=280497&view=rev
Log:
fix typo for otoool command

Modified:
perl/modperl/trunk/lib/ModPerl/Config.pm

Modified: perl/modperl/trunk/lib/ModPerl/Config.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/Config.pm?rev=280497&r1=280496&r2=280497&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/Config.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Config.pm Mon Sep 12 21:48:47 2005
@@ -59,7 +59,7 @@
 
 if (DARWIN) {
 my $otool = Apache::TestConfig::which('otool');
-$command = " -L $otool" if $otool;
+$command = "$otool -L $httpd" if $otool;
 }
 elsif (!WIN32) {
 my $ldd = Apache::TestConfig::which('ldd');

svn commit: r280500 - /perl/modperl/trunk/Changes

2005-09-12 Thread pgollucci

Author: pgollucci
Date: Mon Sep 12 21:52:10 2005
New Revision: 280500

URL: http://svn.apache.org/viewcvs?rev=280500&view=rev
Log:
Add ldd/otool -L output

Modified:
perl/modperl/trunk/Changes

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=280500&r1=280499&r2=280500&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon Sep 12 21:52:10 2005
@@ -12,6 +12,10 @@
 
 =item 2.0.2-dev
 
+Add the output of ldd(unix/cygwin) and otool -L (darwin)
+for httpd to the mp2bug report script.
+[Philip M. Gollucci]
+
 Prevent tools such as Apache2::Status's Loaded Modules screen
 from displaying erroneous information about mod_perl.pm being loaded.
 [Stas, Philip M. Gollucci]

svn commit: r280501 - /perl/modperl/trunk/todo/bugs_build

2005-09-12 Thread pgollucci

Author: pgollucci
Date: Mon Sep 12 21:52:33 2005
New Revision: 280501

URL: http://svn.apache.org/viewcvs?rev=280501&view=rev
Log:
scratch one more :)

Modified:
perl/modperl/trunk/todo/bugs_build

Modified: perl/modperl/trunk/todo/bugs_build
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/todo/bugs_build?rev=280501&r1=280500&r2=280501&view=diff
==
--- perl/modperl/trunk/todo/bugs_build (original)
+++ perl/modperl/trunk/todo/bugs_build Mon Sep 12 21:52:33 2005
@@ -69,9 +69,6 @@
   Need to put Philippe's smoking test into the core
   -- shouldn't forget to test with perlio enabled and disabled
 
-* mp2bug -- add the output of 'ldd httpd' to the report
-[pgollucci volunteers]
-
 * source_scan won't create Wrap/Foo/Bar.xs if
   xs/maps/modperl_functions.map defines only a boot section:
   MODULE=APR::IO PACKAGE=APR::IO BOOT=1

svn commit: r280748 - /perl/modperl/trunk/lib/ModPerl/Config.pm

2005-09-13 Thread pgollucci

Author: pgollucci
Date: Tue Sep 13 20:03:02 2005
New Revision: 280748

URL: http://svn.apache.org/viewcvs?rev=280748&view=rev
Log:
use the now functionalized ldd_as_string from A-T

Modified:
perl/modperl/trunk/lib/ModPerl/Config.pm

Modified: perl/modperl/trunk/lib/ModPerl/Config.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/Config.pm?rev=280748&r1=280747&r2=280748&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/Config.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Config.pm Tue Sep 13 20:03:02 2005
@@ -21,7 +21,6 @@
 use File::Spec ();
 
 use constant WIN32 => Apache2::Build::WIN32;
-use constant DARWIN => Apache2::Build::DARWIN;
 
 sub as_string {
 my $build = Apache2::Build->build_config;
@@ -55,21 +54,7 @@
 $cfg .= "\n\n*** $command\n";
 $cfg .= qx{$command};
 
-my $command;
-
-if (DARWIN) {
-my $otool = Apache::TestConfig::which('otool');
-$command = "$otool -L $httpd" if $otool;
-}
-elsif (!WIN32) {
-my $ldd = Apache::TestConfig::which('ldd');
-$command = "$ldd $httpd" if $ldd;
-}
-
-if ($command) {
-$cfg .= "\n*** $command\n";
-$cfg .= qx{$command};
-}
+$cfg .= Apache::TestConfig::ldd_as_string($httpd);
 } 
 else {
 $cfg .= "\n\n*** The httpd binary was not found\n";

svn commit: r291347 - /perl/modperl/trunk/Changes

2005-09-24 Thread pgollucci

Author: pgollucci
Date: Sat Sep 24 16:14:00 2005
New Revision: 291347

URL: http://svn.apache.org/viewcvs?rev=291347&view=rev
Log:
One more typo

Modified:
perl/modperl/trunk/Changes

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=291347&r1=291346&r2=291347&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Sat Sep 24 16:14:00 2005
@@ -16,7 +16,7 @@
 - Setting $0 works on Linux again
 - HP-UX and *BSDes show the correct process name instead of '-e'
  
-Fix a cirtical but trivial bug that would cause MP_MAINTAINER=1
+Fix a critical but trivial bug that would cause MP_MAINTAINER=1
 or MP_TRACE=1 builds to fail if not building against a threaded APR.
 Functions such as apr_os_thread_current() would not be linked in,
 but were expected to be.

svn commit: r291348 - /perl/modperl/trunk/RELEASE

2005-09-24 Thread pgollucci

Author: pgollucci
Date: Sat Sep 24 16:19:35 2005
New Revision: 291348

URL: http://svn.apache.org/viewcvs?rev=291348&view=rev
Log:
o s/)/\./g for consistency
o add note about old releases


Modified:
perl/modperl/trunk/RELEASE

Modified: perl/modperl/trunk/RELEASE
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/RELEASE?rev=291348&r1=291347&r2=291348&view=diff
==
--- perl/modperl/trunk/RELEASE (original)
+++ perl/modperl/trunk/RELEASE Sat Sep 24 16:19:35 2005
@@ -6,15 +6,15 @@
configurations as possible on as many platforms as possible,
unpacking the package each time afresh.
 
-  a) nuke any preinstalled mod_perl libs and run 'make test'
+  a. nuke any preinstalled mod_perl libs and run 'make test'
 
-  b) test that you can 'make install' and then run 'make test' again
+  b. test that you can 'make install' and then run 'make test' again
 
-  c) test whether we still 100% OK on systems with no LWP:
+  c. test whether we still 100% OK on systems with no LWP:
 
  % APACHE_TEST_PRETEND_NO_LWP=1 make test
 
-  d) build and test as root. double check that you have started from a
+  d. build and test as root. double check that you have started from a
  fresh source, without having any stale dirs from the previous
  build laying around.
 
@@ -177,3 +177,7 @@
  % svn ci -m "start 2.0.3-dev cycle" Changes lib/mod_perl2.pm \
STATUS RELEASE
 
+10. Old Versions
+ 
+Remind other Developers to delete versions older then the prior release
+from CPAN.  Old releases can always be found on BackPan.

svn commit: r291349 - /perl/modperl/trunk/SVN-MOVE

2005-09-24 Thread pgollucci

Author: pgollucci
Date: Sat Sep 24 16:21:24 2005
New Revision: 291349

URL: http://svn.apache.org/viewcvs?rev=291349&view=rev
Log:
this one is done

Modified:
perl/modperl/trunk/SVN-MOVE

Modified: perl/modperl/trunk/SVN-MOVE
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/SVN-MOVE?rev=291349&r1=291348&r2=291349&view=diff
==
--- perl/modperl/trunk/SVN-MOVE (original)
+++ perl/modperl/trunk/SVN-MOVE Sat Sep 24 16:21:24 2005
@@ -40,10 +40,3 @@
 * cvs2svn [cvs]embperl:
   Move to [svn]/perl/embperl/trunk (with tags/branches there too)
 
-* cvs2svn [cvs]modperl (aka modperl-1.x)
-  Move to [svn]/perl/modperl/branches/1/
-  Tags along with mp2 tags in [svn]/perl/modperl/tags/
-
-  and then update the snapshot (apmail/bin/taritup)
-  make_svn_snapshot "perl/modperl/branches/1" "modperl-1.0" 
-

svn commit: r291189 - in /perl/modperl/trunk: Changes src/modules/perl/modperl_util.h

2005-09-23 Thread pgollucci

Author: pgollucci
Date: Fri Sep 23 11:51:01 2005
New Revision: 291189

URL: http://svn.apache.org/viewcvs?rev=291189&view=rev
Log:
Fix a cirtical but trivial but that would cause MP_MAINTAINER=1
or MP_TRACE=1 builds to fail if not building against a threaded APR.
Functions such as apr_os_thread_current() would not be linked in,
but were expected to be.

The reason being that APR_HAS_THREADS is always "defined" by apr
whether its 0 or 1.



Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/src/modules/perl/modperl_util.h

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=291189&r1=291188&r2=291189&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Sep 23 11:51:01 2005
@@ -12,6 +12,12 @@
 
 =item 2.0.2-dev
 
+Fix a cirtical but trivial but that would cause MP_MAINTAINER=1
+or MP_TRACE=1 builds to fail if not building against a threaded APR.
+Functions such as apr_os_thread_current() would not be linked in,
+but were expected to be.
+[Philip M. Gollucci]
+
 Add the output of ldd(unix/cygwin) and otool -L (darwin)
 for httpd to the mp2bug report script.
 [Philip M. Gollucci]

Modified: perl/modperl/trunk/src/modules/perl/modperl_util.h
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_util.h?rev=291189&r1=291188&r2=291189&view=diff
==
--- perl/modperl/trunk/src/modules/perl/modperl_util.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_util.h Fri Sep 23 11:51:01 2005
@@ -100,7 +100,7 @@
 apr_array_header_t *modperl_avrv2apr_array_header(pTHX_ apr_pool_t *p,
   SV *avrv);
 void modperl_package_unload(pTHX_ const char *package);
-#if defined(MP_TRACE) && defined(APR_HAS_THREADS)
+#if defined(MP_TRACE) && APR_HAS_THREADS
 #define MP_TRACEf_TID   "/tid 0x%lx"
 #define MP_TRACEv_TID   (unsigned long)apr_os_thread_current()
 #define MP_TRACEv_TID_  MP_TRACEv_TID,

svn commit: r291190 - /perl/modperl/trunk/Changes

2005-09-23 Thread pgollucci

Author: pgollucci
Date: Fri Sep 23 11:52:58 2005
New Revision: 291190

URL: http://svn.apache.org/viewcvs?rev=291190&view=rev
Log:
s/but/bug/

Modified:
perl/modperl/trunk/Changes

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=291190&r1=291189&r2=291190&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Sep 23 11:52:58 2005
@@ -12,7 +12,7 @@
 
 =item 2.0.2-dev
 
-Fix a cirtical but trivial but that would cause MP_MAINTAINER=1
+Fix a cirtical bug trivial but that would cause MP_MAINTAINER=1
 or MP_TRACE=1 builds to fail if not building against a threaded APR.
 Functions such as apr_os_thread_current() would not be linked in,
 but were expected to be.

svn commit: r291191 - /perl/modperl/trunk/Changes

2005-09-23 Thread pgollucci

Author: pgollucci
Date: Fri Sep 23 11:54:24 2005
New Revision: 291191

URL: http://svn.apache.org/viewcvs?rev=291191&view=rev
Log:
okay nap time

Modified:
perl/modperl/trunk/Changes

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=291191&r1=291190&r2=291191&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Sep 23 11:54:24 2005
@@ -12,7 +12,7 @@
 
 =item 2.0.2-dev
 
-Fix a cirtical bug trivial but that would cause MP_MAINTAINER=1
+Fix a cirtical but trivial bug that would cause MP_MAINTAINER=1
 or MP_TRACE=1 builds to fail if not building against a threaded APR.
 Functions such as apr_os_thread_current() would not be linked in,
 but were expected to be.

svn commit: r291690 - /perl/modperl/trunk/README

2005-09-26 Thread pgollucci

Author: pgollucci
Date: Mon Sep 26 10:44:50 2005
New Revision: 291690

URL: http://svn.apache.org/viewcvs?rev=291690&view=rev
Log:
s/@/at/ in e-mail address

Modified:
perl/modperl/trunk/README

Modified: perl/modperl/trunk/README
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/README?rev=291690&r1=291689&r2=291690&view=diff
==
--- perl/modperl/trunk/README (original)
+++ perl/modperl/trunk/README Mon Sep 26 10:44:50 2005
@@ -62,7 +62,7 @@
 
 *** Developers ***
 
-Development discussion takes place on dev@perl.apache.org
+Development discussion takes place on dev (at) perl.apache.org
 
 *** Authors ***

svn commit: r293465 - /perl/modperl/trunk/RELEASE

2005-10-03 Thread pgollucci

Author: pgollucci
Date: Mon Oct  3 16:01:49 2005
New Revision: 293465

URL: http://svn.apache.org/viewcvs?rev=293465&view=rev
Log:
add a note to save some more hair on the RM's heads

Modified:
perl/modperl/trunk/RELEASE

Modified: perl/modperl/trunk/RELEASE
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/RELEASE?rev=293465&r1=293464&r2=293465&view=diff
==
--- perl/modperl/trunk/RELEASE (original)
+++ perl/modperl/trunk/RELEASE Mon Oct  3 16:01:49 2005
@@ -4,7 +4,9 @@
etc. Now test this generated package mod_perl-2.0.2.tar.gz (not
the current build) with as many
configurations as possible on as many platforms as possible,
-   unpacking the package each time afresh.
+   unpacking the package each time afresh.  
+   Note, in step 3a, removing the "-dev" line changes the package version
+   name.  i.e. (2.0.2-dev to 2.0.2)
 
   a. nuke any preinstalled mod_perl libs and run 'make test'

svn commit: r293467 - /perl/modperl/trunk/Makefile.PL

2005-10-03 Thread pgollucci

Author: pgollucci
Date: Mon Oct  3 16:17:32 2005
New Revision: 293467

URL: http://svn.apache.org/viewcvs?rev=293467&view=rev
Log:
style

Modified:
perl/modperl/trunk/Makefile.PL

Modified: perl/modperl/trunk/Makefile.PL
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?rev=293467&r1=293466&r2=293467&view=diff
==
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Mon Oct  3 16:17:32 2005
@@ -480,11 +480,11 @@
 
 open my $fh, 'Changes';
 while (<$fh>) {
-   if (/^=item.*-dev/) {
-   $VERSION .= '-dev';
-   last;
-   }
-   last if /^=item/;
+   if (/^=item.*-dev/) {
+   $VERSION .= '-dev';
+   last;
+   }
+   last if /^=item/;
 }
 close $fh;

svn commit: r319405 - /perl/modperl/trunk/t/response/TestDirective/perldo.pm

2005-10-12 Thread pgollucci

Author: pgollucci
Date: Wed Oct 12 17:49:53 2005
New Revision: 319405

URL: http://svn.apache.org/viewcvs?rev=319405&view=rev
Log:
Fix the regex against executable names.
Submitted by: Stas

Modified:
perl/modperl/trunk/t/response/TestDirective/perldo.pm

Modified: perl/modperl/trunk/t/response/TestDirective/perldo.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestDirective/perldo.pm?rev=319405&r1=319404&r2=319405&view=diff
==
--- perl/modperl/trunk/t/response/TestDirective/perldo.pm (original)
+++ perl/modperl/trunk/t/response/TestDirective/perldo.pm Wed Oct 12 17:49:53 
2005
@@ -40,7 +40,8 @@
 ok $TestDirective::perl::line > 3;
 
 ok !t_cmp($0, '-e', '$0');
-ok t_cmp($0, qr/httpd|apache\.exe/i, '$0');
+my $target = Apache::Test::vars('target');
+ok t_cmp($0, qr/$target/i, '$0');
 
 ok t_cmp($TestDirective::perl::Included, 1, "Include");

svn commit: r327052 - /perl/modperl/trunk/README

2005-10-20 Thread pgollucci

Author: pgollucci
Date: Thu Oct 20 17:32:47 2005
New Revision: 327052

URL: http://svn.apache.org/viewcvs?rev=327052&view=rev
Log:
include 2.0.55 in the versions

Modified:
perl/modperl/trunk/README

Modified: perl/modperl/trunk/README
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/README?rev=327052&r1=327051&r2=327052&view=diff
==
--- perl/modperl/trunk/README (original)
+++ perl/modperl/trunk/README Thu Oct 20 17:32:47 2005
@@ -3,8 +3,8 @@
 *** Prerequisites ***
 
 Apache:
-  Dynamic mod_perl (DSO):Apache 2.0.47 - 2.0.54.
-  Static mod_perl:   Apache 2.0.51 - 2.0.54.
+  Dynamic mod_perl (DSO):Apache 2.0.47 - 2.0.55.
+  Static mod_perl:   Apache 2.0.51 - 2.0.55.
 
   Newer Apache versions may work with this version of mod_perl.  If
   not, the svn version likely will, which can be obtained from:

svn commit: r327053 - /perl/modperl/trunk/Changes

2005-10-20 Thread pgollucci

Author: pgollucci
Date: Thu Oct 20 17:35:46 2005
New Revision: 327053

URL: http://svn.apache.org/viewcvs?rev=327053&view=rev
Log:
removed, -dev, added release date


Modified:
perl/modperl/trunk/Changes

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=327053&r1=327052&r2=327053&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Thu Oct 20 17:35:46 2005
@@ -10,7 +10,7 @@
 
 =over 3
 
-=item 2.0.2-dev
+=item 2.0.2 - October 20, 2005
 
 add :proxy import tag to Apache2::Const which exposes new
 constants PROXYREQ_NONE, PROXYREQ_PROXY, and PROXYREQ_REVERSE

svn commit: r327054 - /perl/modperl/tags/2_0_2/

2005-10-20 Thread pgollucci

Author: pgollucci
Date: Thu Oct 20 17:36:38 2005
New Revision: 327054

URL: http://svn.apache.org/viewcvs?rev=327054&view=rev
Log:
Tag 2.0.2

Added:
perl/modperl/tags/2_0_2/
  - copied from r327053, perl/modperl/trunk/

svn commit: r327069 - in /perl/modperl/trunk: Changes RELEASE STATUS lib/mod_perl2.pm

2005-10-20 Thread pgollucci

Author: pgollucci
Date: Thu Oct 20 18:43:55 2005
New Revision: 327069

URL: http://svn.apache.org/viewcvs?rev=327069&view=rev
Log:
start 2.0.3-dev cycle

Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/RELEASE
perl/modperl/trunk/STATUS
perl/modperl/trunk/lib/mod_perl2.pm

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=327069&r1=327068&r2=327069&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Thu Oct 20 18:43:55 2005
@@ -10,6 +10,9 @@
 
 =over 3
 
+=item 2.0.3-dev
+
+
 =item 2.0.2 - October 20, 2005
 
 add :proxy import tag to Apache2::Const which exposes new

Modified: perl/modperl/trunk/RELEASE
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/RELEASE?rev=327069&r1=327068&r2=327069&view=diff
==
--- perl/modperl/trunk/RELEASE (original)
+++ perl/modperl/trunk/RELEASE Thu Oct 20 18:43:55 2005
@@ -14,12 +14,12 @@
   http://people.apache.org/~geoff/gpghowto.html
 
 1. 'make dist' - to make sure nothing is missing from the manifest,
-   etc. Now test this generated package mod_perl-2.0.2.tar.gz (not
+   etc. Now test this generated package mod_perl-2.0.3.tar.gz (not
the current build) with as many
configurations as possible on as many platforms as possible,
unpacking the package each time afresh.  
Note, in step 3a, removing the "-dev" line changes the package version
-   name.  i.e. (2.0.2-dev to 2.0.2)
+   name.  i.e. (2.0.3-dev to 2.0.3)
 
   a. nuke any preinstalled mod_perl libs and run 'make test'
 
@@ -66,21 +66,21 @@
 
   g. test the final package again at least once
 
-4. Release the package and update links (e.g. mod_perl-2.0.2.tar.gz)
+4. Release the package and update links (e.g. mod_perl-2.0.3.tar.gz)
 
   a. upload to www.apache.org:/www/perl.apache.org/dist/
 
-%  scp mod_perl-2.0.2.tar.gz perl.apache.org:/www/perl.apache.org/dist/
+%  scp mod_perl-2.0.3.tar.gz perl.apache.org:/www/perl.apache.org/dist/
 
   b. ssh to perl.apache.org, unpack the package, update symlinks to the
  tar ball and unpacked distro:
 
 % ssh perl.apache.org
 % cd /www/perl.apache.org/dist/
-% ln -sf mod_perl-2.0.2.tar.gz mod_perl-2.0-current.tar.gz
-% tar -xzvf mod_perl-2.0.2.tar.gz
+% ln -sf mod_perl-2.0.3.tar.gz mod_perl-2.0-current.tar.gz
+% tar -xzvf mod_perl-2.0.3.tar.gz
 % rm /www/perl.apache.org/dist/mod_perl-2.0-current
-% ln -sf  mod_perl-2.0.2 mod_perl-2.0-current
+% ln -sf  mod_perl-2.0.3 mod_perl-2.0-current
 
   c. archive older releases (keep current + one prior release)
 
@@ -106,27 +106,27 @@
 
   a. sign your local copy of the tarball:
 
-% gpg --detach-sign --armor mod_perl-2.0.2.tar.gz
+% gpg --detach-sign --armor mod_perl-2.0.3.tar.gz
 
-% pgps -b --armor mod_perl-2.0.2.tar.gz
+% pgps -b --armor mod_perl-2.0.3.tar.gz
 
   b. upload the generated sig file to www.apache.org:
 
-% scp mod_perl-2.0.2.tar.gz.asc perl.apache.org:/www/perl.apache.org/dist/
+% scp mod_perl-2.0.3.tar.gz.asc perl.apache.org:/www/perl.apache.org/dist/
 % ssh www.apache.org
 % cd /www/perl.apache.org/dist/
-% chmod 0664 mod_perl-2.0.2.tar.gz.asc
-% ln -sf mod_perl-2.0.2.tar.gz.asc mod_perl-2.0-current.tar.gz.asc
+% chmod 0664 mod_perl-2.0.3.tar.gz.asc
+% ln -sf mod_perl-2.0.3.tar.gz.asc mod_perl-2.0-current.tar.gz.asc
 
   c. ask one of the other developers to double check the signature file
  and tarball: download both files and verify the signature:
 
-http://perl.apache.org/dist/mod_perl-2.0.2.tar.gz.asc
-http://perl.apache.org/dist/mod_perl-2.0.2.tar.gz
+http://perl.apache.org/dist/mod_perl-2.0.3.tar.gz.asc
+http://perl.apache.org/dist/mod_perl-2.0.3.tar.gz
 
-% gpg --verify mod_perl-2.0.2.tar.gz.asc
+% gpg --verify mod_perl-2.0.3.tar.gz.asc
 
-% pgpv mod_perl-2.0.2.tar.gz.asc
+% pgpv mod_perl-2.0.3.tar.gz.asc
 
   d. make sure that the files you just created are group rw so
  all the dist admins can make changes:
@@ -140,8 +140,8 @@
   a. unpack the package, update symlinks to the tarball and unpacked distro:
 
% cd /www/www.apache.org/dist/perl/
-   % cp /www/perl.apache.org/dist/mod_perl-2.0.2.tar.gz* .
-   % tar -xzvf mod_perl-2.0.2.tar.gz
+   % cp /www/perl.apache.org/dist/mod_perl-2.0.3.tar.gz* .
+   % tar -xzvf mod_perl-2.0.3.tar.gz
% mv mod_perl-2.0.0.tar.gz* /www/archive.apache.org/dist/perl/
% rm -rf mod_perl-2.0.0
 
@@ -155,11 +155,11 @@
 8. Announce the package
 
   a. post ... to the modperl, announce lists
-  Subject: [ANNOUNCE] mod_perl 2.0.2 
+  Subject: [ANNOUNCE] mod_perl 2.0.3 
  include 
   - link at perl.apache.org:
-http://apache.org/dist/perl/mod_perl-2.0.2.tar.gz
-http://apache.org/dist/perl/

svn commit: r327073 - /perl/modperl/trunk/RELEASE

2005-10-20 Thread pgollucci

Author: pgollucci
Date: Thu Oct 20 18:54:00 2005
New Revision: 327073

URL: http://svn.apache.org/viewcvs?rev=327073&view=rev
Log:
add note about the announce list

Modified:
perl/modperl/trunk/RELEASE

Modified: perl/modperl/trunk/RELEASE
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/RELEASE?rev=327073&r1=327072&r2=327073&view=diff
==
--- perl/modperl/trunk/RELEASE (original)
+++ perl/modperl/trunk/RELEASE Thu Oct 20 18:54:00 2005
@@ -155,6 +155,7 @@
 8. Announce the package
 
   a. post ... to the modperl, announce lists
+  Note, to post to announce@, you must be sending for an apache.org address.
   Subject: [ANNOUNCE] mod_perl 2.0.3 
  include 
   - link at perl.apache.org:

svn commit: r327733 - /perl/modperl/trunk/RELEASE

2005-10-22 Thread pgollucci

Author: pgollucci
Date: Sat Oct 22 20:00:20 2005
New Revision: 327733

URL: http://svn.apache.org/viewcvs?rev=327733&view=rev
Log:
add another note about KEYS

Modified:
perl/modperl/trunk/RELEASE

Modified: perl/modperl/trunk/RELEASE
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/RELEASE?rev=327733&r1=327732&r2=327733&view=diff
==
--- perl/modperl/trunk/RELEASE (original)
+++ perl/modperl/trunk/RELEASE Sat Oct 22 20:00:20 2005
@@ -13,6 +13,11 @@
 
   http://people.apache.org/~geoff/gpghowto.html
 
+Double check that  
+http://perl.apache.org/dist/KEYS 
+http://www.apache.org/dist/perl/KEYS
+are symlinks in the filesystem.  If not, contact [EMAIL PROTECTED]
+
 1. 'make dist' - to make sure nothing is missing from the manifest,
etc. Now test this generated package mod_perl-2.0.3.tar.gz (not
the current build) with as many

svn commit: r327745 - /perl/modperl/trunk/lib/Apache2/PerlSections.pm

2005-10-22 Thread pgollucci

Author: pgollucci
Date: Sat Oct 22 21:21:36 2005
New Revision: 327745

URL: http://svn.apache.org/viewcvs?rev=327745&view=rev
Log:
When using Apache2::PerlSections->dump, the configuration 
would print out in the correct order, but when the configuration was 
passed off to Apache the ordering was lost.

Submitted By: Scott Wessels <[EMAIL PROTECTED]>
Reviewed By: Geoff


Modified:
perl/modperl/trunk/lib/Apache2/PerlSections.pm

Modified: perl/modperl/trunk/lib/Apache2/PerlSections.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/PerlSections.pm?rev=327745&r1=327744&r2=327745&view=diff
==
--- perl/modperl/trunk/lib/Apache2/PerlSections.pm (original)
+++ perl/modperl/trunk/lib/Apache2/PerlSections.pm Sat Oct 22 21:21:36 2005
@@ -129,7 +129,7 @@
 sub dump_hash {
 my ($self, $name, $hash) = @_;
 
-for my $entry (sort keys %{ $hash || {} }) {
+for my $entry (keys %{ $hash || {} }) {
 my $item = $hash->{$entry};
 my $type = ref($item);
 
@@ -149,7 +149,7 @@
 
 $self->add_config("<$name $loc>\n");
 
-for my $entry (sort keys %{ $hash || {} }) {
+for my $entry (keys %{ $hash || {} }) {
 $self->dump_entry($entry, $hash->{$entry});
 }

svn commit: r327746 - /perl/modperl/trunk/Changes

2005-10-22 Thread pgollucci

Author: pgollucci
Date: Sat Oct 22 21:23:41 2005
New Revision: 327746

URL: http://svn.apache.org/viewcvs?rev=327746&view=rev
Log:
When using Apache2::PerlSections->dump, the configuration 
would print out in the correct order, but when the configuration was 
passed off to Apache the ordering was lost.


Modified:
perl/modperl/trunk/Changes

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=327746&r1=327745&r2=327746&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Sat Oct 22 21:23:41 2005
@@ -12,6 +12,10 @@
 
 =item 2.0.3-dev
 
+When using Apache2::PerlSections->dump, the configuration 
+would print out in the correct order, but when the configuration was 
+passed off to Apache the ordering was lost.
+[Scott Wessels <[EMAIL PROTECTED]>]
 
 =item 2.0.2 - October 20, 2005

svn commit: r327747 - /perl/modperl/trunk/README

2005-10-22 Thread pgollucci

Author: pgollucci
Date: Sat Oct 22 21:48:19 2005
New Revision: 327747

URL: http://svn.apache.org/viewcvs?rev=327747&view=rev
Log:
CREDITS file doesn't exist 

Modified:
perl/modperl/trunk/README

Modified: perl/modperl/trunk/README
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/README?rev=327747&r1=327746&r2=327747&view=diff
==
--- perl/modperl/trunk/README (original)
+++ perl/modperl/trunk/README Sat Oct 22 21:48:19 2005
@@ -67,4 +67,4 @@
 *** Authors ***
 
 mod_perl-2.0 was designed and written by Doug MacEachern, with
-contributions from many others (see the CREDITS and Changes files).
+contributions from many others (see Changes files).

svn commit: r327806 - /perl/modperl/trunk/RELEASE

2005-10-23 Thread pgollucci

Author: pgollucci
Date: Sun Oct 23 09:22:18 2005
New Revision: 327806

URL: http://svn.apache.org/viewcvs?rev=327806&view=rev
Log:
take 2, mirrors don't have /x1, so copy the KEYS file


Modified:
perl/modperl/trunk/RELEASE

Modified: perl/modperl/trunk/RELEASE
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/RELEASE?rev=327806&r1=327805&r2=327806&view=diff
==
--- perl/modperl/trunk/RELEASE (original)
+++ perl/modperl/trunk/RELEASE Sun Oct 23 09:22:18 2005
@@ -13,10 +13,8 @@
 
   http://people.apache.org/~geoff/gpghowto.html
 
-Double check that  
-http://perl.apache.org/dist/KEYS 
-http://www.apache.org/dist/perl/KEYS
-are symlinks in the filesystem.  If not, contact [EMAIL PROTECTED]
+Copy the KEYS file into place:
+% scp KEYS www.apache.org:/www/www.apache.org/dist/perl/KEYS
 
 1. 'make dist' - to make sure nothing is missing from the manifest,
etc. Now test this generated package mod_perl-2.0.3.tar.gz (not

svn commit: r327809 - /perl/modperl/trunk/todo/bugs_mp

2005-10-23 Thread pgollucci

Author: pgollucci
Date: Sun Oct 23 09:51:38 2005
New Revision: 327809

URL: http://svn.apache.org/viewcvs?rev=327809&view=rev
Log:
lets not forget this one

Modified:
perl/modperl/trunk/todo/bugs_mp

Modified: perl/modperl/trunk/todo/bugs_mp
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/todo/bugs_mp?rev=327809&r1=327808&r2=327809&view=diff
==
--- perl/modperl/trunk/todo/bugs_mp (original)
+++ perl/modperl/trunk/todo/bugs_mp Sun Oct 23 09:51:38 2005
@@ -54,6 +54,10 @@
   they all seem to fall through the data, thus not really flushing
   anything. this can be easily reproduced with MyApache::FilterSnoop.
 
+  See also
+  
http://www.gossamer-threads.com/lists/modperl/dev/84744?search_string=%23%7C%2C%20flushing%2C%20etc;#84743
+  for a related $| but not the same issue.
+
 * Apache::Log compat issues:
 
   Apache->warn, Apache::warn, Apache::Server->warn and

svn commit: r327877 - in /perl/modperl/trunk: Makefile.PL RELEASE build/make_rpm_spec

2005-10-23 Thread pgollucci

Author: pgollucci
Date: Sun Oct 23 16:21:40 2005
New Revision: 327877

URL: http://svn.apache.org/viewcvs?rev=327877&view=rev
Log:
make rolling release candiates slightly easier.
-dev can now be replaced with -rc\d+ in the ./Changes file as needed


Modified:
perl/modperl/trunk/Makefile.PL
perl/modperl/trunk/RELEASE
perl/modperl/trunk/build/make_rpm_spec

Modified: perl/modperl/trunk/Makefile.PL
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?rev=327877&r1=327876&r2=327877&view=diff
==
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Sun Oct 23 16:21:40 2005
@@ -480,8 +480,8 @@
 
 open my $fh, 'Changes';
 while (<$fh>) {
-if (/^=item.*-dev/) {
-$VERSION .= '-dev';
+if (/^=item.*-(dev|rc\d+)/) {
+$VERSION .= "-$1";
 last;
 }
 last if /^=item/;

Modified: perl/modperl/trunk/RELEASE
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/RELEASE?rev=327877&r1=327876&r2=327877&view=diff
==
--- perl/modperl/trunk/RELEASE (original)
+++ perl/modperl/trunk/RELEASE Sun Oct 23 16:21:40 2005
@@ -21,18 +21,19 @@
the current build) with as many
configurations as possible on as many platforms as possible,
unpacking the package each time afresh.  
-   Note, in step 3a, removing the "-dev" line changes the package version
-   name.  i.e. (2.0.3-dev to 2.0.3)
 
-  a. nuke any preinstalled mod_perl libs and run 'make test'
+  a. edit ./Changes 
+ - change -dev to -rc\d+  starting with -rc1
 
-  b. test that you can 'make install' and then run 'make test' again
+  b. nuke any preinstalled mod_perl libs and run 'make test'
 
-  c. test whether we still 100% OK on systems with no LWP:
+  c. test that you can 'make install' and then run 'make test' again
+
+  d. test whether we still 100% OK on systems with no LWP:
 
  % APACHE_TEST_PRETEND_NO_LWP=1 make test
 
-  d. build and test as root. double check that you have started from a
+  e. build and test as root. double check that you have started from a
  fresh source, without having any stale dirs from the previous
  build laying around.
 
@@ -47,7 +48,7 @@
package to be released
 
   a. edit ./Changes:
- - remove '-dev' 
+ - remove -rc\d+
  - add release date
 
   b. check ./README and ./Makefile.PL

Modified: perl/modperl/trunk/build/make_rpm_spec
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/build/make_rpm_spec?rev=327877&r1=327876&r2=327877&view=diff
==
--- perl/modperl/trunk/build/make_rpm_spec (original)
+++ perl/modperl/trunk/build/make_rpm_spec Sun Oct 23 16:21:40 2005
@@ -6,7 +6,7 @@
 my $dev_build = is_dev_build();
 my $release   = $dev_build ? svn_release() : 1;
 my $version   = $mod_perl2::VERSION_TRIPLET;
-my $path  = $dev_build ? "mod_perl-$version-dev" : "mod_perl-$version";
+my $path  = $dev_build ? "mod_perl-$version-$dev_build" : 
"mod_perl-$version";
 my $tarname   = "$path.tar.gz";
 
 my $httpd_ver = min_httpd_ver();
@@ -135,8 +135,8 @@
 my $dev;
 open my $fh, 'Changes';
 while (<$fh>) {
-if (/^=item.*-dev/) {
-$dev = 1;
+if (/^=item.*-(dev|rc\d+)/) {
+$dev = $1;
 last;
 }
 last if /^=item/;

svn commit: r328697 - /perl/modperl/trunk/RELEASE

2005-10-26 Thread pgollucci

Author: pgollucci
Date: Wed Oct 26 11:11:58 2005
New Revision: 328697

URL: http://svn.apache.org/viewcvs?rev=328697&view=rev
Log:
add note about CPAN permissions

Modified:
perl/modperl/trunk/RELEASE

Modified: perl/modperl/trunk/RELEASE
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/RELEASE?rev=328697&r1=328696&r2=328697&view=diff
==
--- perl/modperl/trunk/RELEASE (original)
+++ perl/modperl/trunk/RELEASE Wed Oct 26 11:11:58 2005
@@ -16,6 +16,9 @@
 Copy the KEYS file into place:
 % scp KEYS www.apache.org:/www/www.apache.org/dist/perl/KEYS
 
+Ask the PMC to verify that you have the appropriate CPAN permissions
+on [EMAIL PROTECTED]
+
 1. 'make dist' - to make sure nothing is missing from the manifest,
etc. Now test this generated package mod_perl-2.0.3.tar.gz (not
the current build) with as many

svn commit: r329498 - /perl/modperl/trunk/RELEASE

2005-10-29 Thread pgollucci

Author: pgollucci
Date: Sat Oct 29 17:32:22 2005
New Revision: 329498

URL: http://svn.apache.org/viewcvs?rev=329498&view=rev
Log:
add notes from my recent CPAN indexing woos


Modified:
perl/modperl/trunk/RELEASE

Modified: perl/modperl/trunk/RELEASE
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/RELEASE?rev=329498&r1=329497&r2=329498&view=diff
==
--- perl/modperl/trunk/RELEASE (original)
+++ perl/modperl/trunk/RELEASE Sat Oct 29 17:32:22 2005
@@ -16,8 +16,18 @@
 Copy the KEYS file into place:
 % scp KEYS www.apache.org:/www/www.apache.org/dist/perl/KEYS
 
-Ask the PMC to verify that you have the appropriate CPAN permissions
-on [EMAIL PROTECTED]
+If this is your first release, ask someone with APML karma on PAUSE 
+to verify you have the appropriate permissions.  Likely someone on 
+the PMC can do this.
+
+a. login into https://pause.perl.org
+b. menu click: Select Mailinglist/Action
+c. choose APML and share_perms and click go
+d. click 3.1 Make somebody else co-maintainer
+e. choose the modules to give the perms to
+   type the username of the new co-maintainer
+f. if you happen to know that packages were added this release,
+   make sure you give the correct permissions to them.
 
 1. 'make dist' - to make sure nothing is missing from the manifest,
etc. Now test this generated package mod_perl-2.0.3.tar.gz (not

svn commit: r331892 - in /perl/modperl/trunk: Changes lib/Apache2/Status.pm

2005-11-08 Thread pgollucci

Author: pgollucci
Date: Tue Nov  8 13:21:35 2005
New Revision: 331892

URL: http://svn.apache.org/viewcvs?rev=331892&view=rev
Log:
Require B::Size and B::TerseSize v0.06 for Apache2::Status
options StatusTerse and StatusTerseSize which has now been 
updated to support the new mod_perl2 api post RC5


Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=331892&r1=331891&r2=331892&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Tue Nov  8 13:21:35 2005
@@ -12,6 +12,11 @@
 
 =item 2.0.3-dev
 
+Require B::Size and B::TerseSize v0.06 for Apache2::Status
+options StatusTerse and StatusTerseSize which has now been 
+updated to support the new mod_perl2 api post RC5.
+[Philip M. Gollucci]
+
 When using Apache2::PerlSections->dump, the configuration 
 would print out in the correct order, but when the configuration was 
 passed off to Apache the ordering was lost.

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=331892&r1=331891&r2=331892&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Tue Nov  8 13:21:35 2005
@@ -59,8 +59,8 @@
 lexinfo => ["StatusLexInfo", "B::LexInfo", 0,],
 xref=> ["StatusXref","B::Xref",1.01, ],
 terse   => ["StatusTerse",   "B::Terse",   0,],
-tersesize   => ["StatusTerseSize",   "B::TerseSize",   0,],
-packagesize => ["StatusPackageSize", "B::TerseSize",   0,],
+tersesize   => ["StatusTerseSize",   "B::TerseSize",   0.06, ],
+packagesize => ["StatusPackageSize", "B::TerseSize",   0.06, ],
 peek=> ["StatusPeek","Apache::Peek",   1.03, ],
 );

svn commit: r351903 - in /perl/modperl/trunk: Changes lib/mod_perl2.pm

2005-12-02 Thread pgollucci

Author: pgollucci
Date: Fri Dec  2 23:29:17 2005
New Revision: 351903

URL: http://svn.apache.org/viewcvs?rev=351903&view=rev
Log:
Back out r280262 which as causing Apache2::Reload
to have issues (internal server error - can't find mod_perl.pm)

Reported by: JT Smith <[EMAIL PROTECTED]>
Reviewed by: pgollucci
Pointy Hat: geoff




Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/mod_perl2.pm

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=351903&r1=351902&r2=351903&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Dec  2 23:29:17 2005
@@ -12,6 +12,9 @@
 
 =item 2.0.3-dev
 
+Back out r280262 which was causing Apache2::Reload to misbehave.
+[JT Smith <[EMAIL PROTECTED]>]
+
 Perl_do_open/close fixes to make mod_perl 2.0 compile with
 [EMAIL PROTECTED] (5.9.3+) [Stas]
 

Modified: perl/modperl/trunk/lib/mod_perl2.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/mod_perl2.pm?rev=351903&r1=351902&r2=351903&view=diff
==
--- perl/modperl/trunk/lib/mod_perl2.pm (original)
+++ perl/modperl/trunk/lib/mod_perl2.pm Fri Dec  2 23:29:17 2005
@@ -16,7 +16,6 @@
 
 use 5.006;
 use strict;
-use File::Spec::Functions;
 
 BEGIN {
 our $VERSION = "2.03";
@@ -49,7 +48,7 @@
 # startup you are protected against loading mod_perl.pm
 # (either 1.0 or 1.99) at a later time by accident.
 $mod_perl::VERSION = $mod_perl2::VERSION;
-$INC{"mod_perl.pm"} = File::Spec::Functions::devnull(); 
+$INC{"mod_perl.pm"} = __FILE__;
 
 1;
 __END__

svn commit: r357159 - /perl/modperl/trunk/t/apache/content_length_header.t

2005-12-16 Thread pgollucci

Author: pgollucci
Date: Fri Dec 16 06:04:59 2005
New Revision: 357159

URL: http://svn.apache.org/viewcvs?rev=357159&view=rev
Log:
let the head content-length test pass in current httpd svn trunk


Modified:
perl/modperl/trunk/t/apache/content_length_header.t

Modified: perl/modperl/trunk/t/apache/content_length_header.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/content_length_header.t?rev=357159&r1=357158&r2=357159&view=diff
==
--- perl/modperl/trunk/t/apache/content_length_header.t (original)
+++ perl/modperl/trunk/t/apache/content_length_header.t Fri Dec 16 06:04:59 2005
@@ -65,7 +65,7 @@
 my $res = $method->($uri);
 
 my $cl  = 0;
-my $head_cl = undef;
+my $head_cl = have_min_apache_version(2.3) ? 25 : undef;

 ok t_cmp $res->code, 200, "$method $uri code";
 ok t_cmp ($res->header('Content-Length'),

svn commit: r357303 - /perl/modperl/trunk/t/modperl/local_env.t

2005-12-16 Thread pgollucci

Author: pgollucci
Date: Fri Dec 16 21:48:18 2005
New Revision: 357303

URL: http://svn.apache.org/viewcvs?rev=357303&view=rev
Log:
make use of module2url()


Modified:
perl/modperl/trunk/t/modperl/local_env.t

Modified: perl/modperl/trunk/t/modperl/local_env.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/modperl/local_env.t?rev=357303&r1=357302&r2=357303&view=diff
==
--- perl/modperl/trunk/t/modperl/local_env.t (original)
+++ perl/modperl/trunk/t/modperl/local_env.t Fri Dec 16 21:48:18 2005
@@ -6,7 +6,8 @@
 
 plan tests => 1;
 
-my $url = '/TestModperl__local_env';
+my $module = 'TestModperl::local_env';
+my $url = Apache::TestRequest::module2url($module);
 
 my $failed;
 foreach (1..25) {

svn commit: r357331 - /perl/modperl/trunk/lib/Apache2/Build.pm

2005-12-17 Thread pgollucci

Author: pgollucci
Date: Sat Dec 17 01:35:37 2005
New Revision: 357331

URL: http://svn.apache.org/viewcvs?rev=357331&view=rev
Log:
opebsd 3.7 with gcc 3.3.5 doesn't support this flag
Noticed By: stas

For now, its easier just to disable it on OpenBsd period.


Modified:
perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=357331&r1=357330&r2=357331&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Sat Dec 17 01:35:37 2005
@@ -528,7 +528,8 @@
 $ccopts .= " $Wall";
 }
 
-if ($self->has_gcc_version('3.3.2') && 
+if (!OPENBSD &&
+$self->has_gcc_version('3.3.2') && 
 $ccopts !~ /declaration-after-statement/) {
 debug "Adding -Wdeclaration-after-statement to ccopts";
 $ccopts .= " -Wdeclaration-after-statement";

svn commit: r358421 - /perl/modperl/trunk/todo/bugs_mp

2005-12-21 Thread pgollucci

Author: pgollucci
Date: Wed Dec 21 15:29:03 2005
New Revision: 358421

URL: http://svn.apache.org/viewcvs?rev=358421&view=rev
Log:
claim ownership of 2

move related flush issues next to each other


Modified:
perl/modperl/trunk/todo/bugs_mp

Modified: perl/modperl/trunk/todo/bugs_mp
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/todo/bugs_mp?rev=358421&r1=358420&r2=358421&view=diff
==
--- perl/modperl/trunk/todo/bugs_mp (original)
+++ perl/modperl/trunk/todo/bugs_mp Wed Dec 21 15:29:03 2005
@@ -2,6 +2,24 @@
 # mod_perl bugs #
 #
 
+* PerlIOApache_flush() 
+  Setting local $| = 0 doesn't work with regular print statements under 
ModPerl::*
+  
+  http://p6m7g8.net/MP2/84625
+  http://www.gossamer-threads.com/lists/modperl/dev/85365
+  [pgollucci volunteers]
+
+* $r->rflush doesn't work. see:
+  http://marc.theaimsgroup.com/?l=apache-modperl&m=103847990813285&w=2
+  I also see a weird behavior where it does sends FLUSH buckets but
+  they all seem to fall through the data, thus not really flushing
+  anything. this can be easily reproduced with MyApache::FilterSnoop.
+
+  See also
+  
http://www.gossamer-threads.com/lists/modperl/dev/84744?search_string=%23%7C%2C%20flushing%2C%20etc;#84743
+  for a related $| but not the same issue.
+  [pgollucci volunteers]
+
 * early pool destruction issues
   http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=108872944815382&w=2
 
@@ -29,7 +47,6 @@
   possible solution: add a new field to the map files, which will be
   used as a usage message whenever an argument error occurs.
 
-
 * 'SetHandler modperl' doesn't reset $|, so if anything turns it on
   anywhere, it's going to stay that way. Meaning excessive flushing
   probably causing a performance hit. I've tried to add the code to
@@ -48,15 +65,6 @@
   tied objects.
 
 
-* $r->rflush doesn't work. see:
-  http://marc.theaimsgroup.com/?l=apache-modperl&m=103847990813285&w=2
-  I also see a weird behavior where it does sends FLUSH buckets but
-  they all seem to fall through the data, thus not really flushing
-  anything. this can be easily reproduced with MyApache::FilterSnoop.
-
-  See also
-  
http://www.gossamer-threads.com/lists/modperl/dev/84744?search_string=%23%7C%2C%20flushing%2C%20etc;#84743
-  for a related $| but not the same issue.
 
 * Apache::Log compat issues:

svn commit: r365520 [2/2] - in /perl/modperl/trunk: ModPerl-Registry/lib/ModPerl/ bin/ lib/ lib/APR/ lib/Apache2/ lib/Bundle/ lib/ModPerl/ src/modules/perl/ xs/ xs/APR/APR/ xs/APR/Base64/ xs/APR/Briga

2006-01-02 Thread pgollucci

Modified: perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h?rev=365520&r1=365519&r2=365520&view=diff
==
--- perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h (original)
+++ perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h Mon Jan  2 18:20:27 2006
@@ -1,4 +1,4 @@
-/* Copyright 2001-2005 The Apache Software Foundation
+/* Copyright 2001-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: perl/modperl/trunk/xs/APR/Lock/APR__Lock.h
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/Lock/APR__Lock.h?rev=365520&r1=365519&r2=365520&view=diff
==
--- perl/modperl/trunk/xs/APR/Lock/APR__Lock.h (original)
+++ perl/modperl/trunk/xs/APR/Lock/APR__Lock.h Mon Jan  2 18:20:27 2006
@@ -1,4 +1,4 @@
-/* Copyright 2001-2005 The Apache Software Foundation
+/* Copyright 2001-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: perl/modperl/trunk/xs/APR/OS/APR__OS.h
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/OS/APR__OS.h?rev=365520&r1=365519&r2=365520&view=diff
==
--- perl/modperl/trunk/xs/APR/OS/APR__OS.h (original)
+++ perl/modperl/trunk/xs/APR/OS/APR__OS.h Mon Jan  2 18:20:27 2006
@@ -1,4 +1,4 @@
-/* Copyright 2002-2005 The Apache Software Foundation
+/* Copyright 2002-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm?rev=365520&r1=365519&r2=365520&view=diff
==
--- perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm (original)
+++ perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm Mon Jan  2 18:20:27 2006
@@ -1,4 +1,4 @@
-# Copyright 2001-2005 The Apache Software Foundation
+# Copyright 2001-2006 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: perl/modperl/trunk/xs/APR/PerlIO/PerlIO.xs
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/PerlIO/PerlIO.xs?rev=365520&r1=365519&r2=365520&view=diff
==
--- perl/modperl/trunk/xs/APR/PerlIO/PerlIO.xs (original)
+++ perl/modperl/trunk/xs/APR/PerlIO/PerlIO.xs Mon Jan  2 18:20:27 2006
@@ -1,4 +1,4 @@
-/* Copyright 2001-2005 The Apache Software Foundation
+/* Copyright 2001-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c?rev=365520&r1=365519&r2=365520&view=diff
==
--- perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c (original)
+++ perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c Mon Jan  2 18:20:27 
2006
@@ -1,4 +1,4 @@
-/* Copyright 2001-2005 The Apache Software Foundation
+/* Copyright 2001-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.h
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.h?rev=365520&r1=365519&r2=365520&view=diff
==
--- perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.h (original)
+++ perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.h Mon Jan  2 18:20:27 
2006
@@ -1,4 +1,4 @@
-/* Copyright 2001-2005 The Apache Software Foundation
+/* Copyright 2001-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: perl/modperl/trunk/xs/APR/Pool/APR__Pool.h
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/Pool/APR__Pool.h?rev=365520&r1=365519&r2=365520&view=diff
==
--- perl/modperl/trunk/xs/APR/Pool/APR__Pool.h (original)
+++ perl/modperl/trunk/xs/APR/Pool/APR

svn commit: r365800 - /perl/modperl/trunk/lib/Apache2/SizeLimit.pm

2006-01-03 Thread pgollucci

Author: pgollucci
Date: Tue Jan  3 18:17:49 2006
New Revision: 365800

URL: http://svn.apache.org/viewcvs?rev=365800&view=rev
Log:
minor changes
 o add unshared to the output if set
 o add display of value/(config value)


Modified:
perl/modperl/trunk/lib/Apache2/SizeLimit.pm

Modified: perl/modperl/trunk/lib/Apache2/SizeLimit.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/SizeLimit.pm?rev=365800&r1=365799&r2=365800&view=diff
==
--- perl/modperl/trunk/lib/Apache2/SizeLimit.pm (original)
+++ perl/modperl/trunk/lib/Apache2/SizeLimit.pm Tue Jan  3 18:17:49 2006
@@ -189,25 +189,29 @@
 $START_TIME ||= time;
 
 my ($size, $share) = $HOW_BIG_IS_IT->();
+my $unshared = $size - $share;
 
-if (($MAX_PROCESS_SIZE  && $size > $MAX_PROCESS_SIZE) ||
-($MIN_SHARE_SIZE&& $share < $MIN_SHARE_SIZE)  ||
-($MAX_UNSHARED_SIZE && ($size - $share) > $MAX_UNSHARED_SIZE)) {
+my $kill_size = $MAX_PROCESS_SIZE  && $size > $MAX_PROCESS_SIZE;
+my $kill_share= $MIN_SHARE_SIZE&& $share < $MIN_SHARE_SIZE;
+my $kill_unshared = $MAX_UNSHARED_SIZE && $unshared > $MAX_UNSHARED_SIZE;
 
+if ($kill_size || $kill_share || $kill_unshared) {
 # wake up! time to die.
 if (WIN32 || ( getppid > 1 )) {
 # this is a child httpd
 my $e   = time - $START_TIME;
-my $msg = "httpd process too big, exiting at SIZE=$size KB ";
-$msg .= " SHARE=$share KB " if $share;
+my $msg = "httpd process too big, exiting at 
SIZE=$size/$MAX_PROCESS_SIZE KB ";
+$msg .= " SHARE=$share/$MIN_SHARE_SIZE KB " if $share;
+$msg .= " UNSHARED=$unshared/$MAX_UNSHARED_SIZE KB " if $unshared;
 $msg .= " REQUESTS=$REQUEST_COUNT LIFETIME=$e seconds";
 error_log($msg);
 
 $r->child_terminate();
 }
 else {# this is the main httpd, whose parent is init?
-my $msg = "main process too big, SIZE=$size KB ";
-$msg .= " SHARE=$share KB" if $share;
+my $msg = "main process too big, SIZE=$size/$MAX_PROCESS_SIZE KB ";
+$msg .= " SHARE=$share/$MIN_SHARE_SIZE KB" if $share;
+$msg .= " UNSHARED=$unshared/$MAX_UNSHARED_SIZE KB" if $unshared;
 error_log($msg);
 }
 }

svn commit: r366940 - /perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t

2006-01-07 Thread pgollucci

Author: pgollucci
Date: Sat Jan  7 15:19:07 2006
New Revision: 366940

URL: http://svn.apache.org/viewcvs?rev=366940&view=rev
Log:
add missing t_client_log_error_is_expected()


Modified:
perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t

Modified: perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t?rev=366940&r1=366939&r2=366940&view=diff
==
--- perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t Sat Jan  7 15:19:07 
2006
@@ -2,13 +2,16 @@
 use warnings FATAL => 'all';
 
 use Apache::Test;
-use Apache::TestUtil qw(t_cmp t_write_perl_script);
+use Apache::TestUtil qw(
+t_cmp t_write_perl_script 
+t_client_log_error_is_expected
+   );
 use Apache::TestRequest qw(GET);
 
 use File::Spec::Functions qw(catfile);
 
 plan tests => 4, need need_module(qw(alias)),
-  need_cgi,
+  need_cgi;
   need_min_module_version CGI => 3.16,
   skip_reason('fatalsToBrowser known not to work');
 
@@ -25,6 +28,8 @@
 ok t_cmp($res->code,
  200,
  "error intercepted");
+
+t_client_log_error_is_expected();
 
 ok t_cmp($res->content,
  qr/uninitiated_scalar/,

svn commit: r366941 - /perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t

2006-01-07 Thread pgollucci

Author: pgollucci
Date: Sat Jan  7 15:20:21 2006
New Revision: 366941

URL: http://svn.apache.org/viewcvs?rev=366941&view=rev
Log:
fix fat fingers

Modified:
perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t

Modified: perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t?rev=366941&r1=366940&r2=366941&view=diff
==
--- perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t Sat Jan  7 15:20:21 
2006
@@ -11,7 +11,7 @@
 use File::Spec::Functions qw(catfile);
 
 plan tests => 4, need need_module(qw(alias)),
-  need_cgi;
+  need_cgi,
   need_min_module_version CGI => 3.16,
   skip_reason('fatalsToBrowser known not to work');

svn commit: r367475 - /perl/modperl/trunk/lib/ModPerl/BuildMM.pm

2006-01-09 Thread pgollucci

Author: pgollucci
Date: Mon Jan  9 19:54:39 2006
New Revision: 367475

URL: http://svn.apache.org/viewcvs?rev=367475&view=rev
Log:
fix this Makefile.PL warning
 
Writing Makefile for X
Argument "6.30_01" isn't numeric in numeric ge (>=) at lib/ModPerl/BuildMM.pm 
line 196.

snatched from Apache2::Status

bleed perl ~26758  includes a dev version of MakeMaker


Modified:
perl/modperl/trunk/lib/ModPerl/BuildMM.pm

Modified: perl/modperl/trunk/lib/ModPerl/BuildMM.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/BuildMM.pm?rev=367475&r1=367474&r2=367475&view=diff
==
--- perl/modperl/trunk/lib/ModPerl/BuildMM.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/BuildMM.pm Mon Jan  9 19:54:39 2006
@@ -193,6 +193,7 @@
 # allow 'make -j'
 require ExtUtils::MakeMaker;
 my $mm_ver = $ExtUtils::MakeMaker::VERSION;
+$mm_ver =~ s/_.*//; # handle dev versions like 6.30_01
 my $pm_to_blib = ($mm_ver >= 6.22 && $mm_ver <= 6.25)
 ? "pm_to_blib.ts"
 : "pm_to_blib";

svn commit: r387662 - in /perl/modperl/trunk: Changes lib/Apache2/Build.pm

2006-03-21 Thread pgollucci

Author: pgollucci
Date: Tue Mar 21 15:03:42 2006
New Revision: 387662

URL: http://svn.apache.org/viewcvs?rev=387662&view=rev
Log:
Make sure that additional library paths are included in the build flags i
so that mod_perl will use the same versions of libraries that APR does.

Submited by: Mike Smith <[EMAIL PROTECTED]>
Reviewed by: pgollucci, stas


Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=387662&r1=387661&r2=387662&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Tue Mar 21 15:03:42 2006
@@ -12,6 +12,10 @@
 
 =item 2.0.3-dev
 
+Make sure that additional library paths are included in the build flags
+so that mod_perl will use the same versions of libraries that APR does.
+[Mike Smith <[EMAIL PROTECTED]>]
+
 Added $r->connection->pnotes, identical to $r->pnotes, but
 for the entire lifetime of the connection
 [Geoffrey Young, Gozer]

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=387662&r1=387661&r2=387662&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Tue Mar 21 15:03:42 2006
@@ -1117,7 +1117,7 @@
 # first use apu_config_path and then apr_config_path in order to
 # resolve the symbols right during linking
 for ($self->apu_config_path, $self->apr_config_path) {
-if (my $link = $_ && -x $_ && qx{$_ --link-ld --libs}) {
+if (my $link = $_ && -x $_ && qx{$_ --link-ld --ldflags --libs}) {
 chomp $link;
 
 # Change '/path/to/libanything.la' to '-L/path/to -lanything'

svn commit: r410065 - in /perl/modperl/trunk: Changes lib/Apache2/Status.pm

2006-05-29 Thread pgollucci

Author: pgollucci
Date: Mon May 29 02:37:41 2006
New Revision: 410065

URL: http://svn.apache.org/viewvc?rev=410065&view=rev
Log:
Fix:
 Use of uninitialized value in length at lib/Apache2/Status.pm line 554


Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Status.pm

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=410065&r1=410064&r2=410065&view=diff
==
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon May 29 02:37:41 2006
@@ -12,6 +12,12 @@
 
 =item 2.0.3-dev
 
+Apache2::Status was expecting B::TerseSize to return
+an op count for things that it didn't causing
+requests like http://localhost/perl-status/main?noh_b_package_size
+to cause 405s
+[Philip M. Gollucci]
+
 Updates for Win32 to allow building and testing on Apache/2.2:
 - use httpd.exe as the Apache binary name when installing apxs
 - use new apr library names (libapr-1.lib and libaprutil-1.lib)

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Status.pm?rev=410065&r1=410064&r2=410065&view=diff
==
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Mon May 29 02:37:41 2006
@@ -548,7 +548,8 @@
 $_;
 } (sort { $subs->{$b}->{size} <=> $subs->{$a}->{size} } keys %$subs);
 
-my $clen = length $subs->{$keys[0]}->{count};
+my $clen = $subs->{$keys[0]}->{count} ?
+length $subs->{$keys[0]}->{count} : 0;
 my $slen = length $subs->{$keys[0]}->{size};
 
 for my $name (@keys) {

1 2 3 4 >

1 - 100 of 371 matches

Mail list logo