perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r170652 - in /perl/modperl/branches/clone-skip-unstable: ./ ModPerl-Registry/lib/ModPerl/ ModPerl-Registry/t/ ModPerl-Registry/t/cgi-bin/ ModPerl-Registry/t/conf/ lib/ lib/Apache2/ lib/Bundle/ lib/ModPerl/ src/modules/perl/ t/apr/ t/filter/ t/filter/TestFilter/ t/lib/TestCommon/ t/modperl/ t/protocol/TestProtocol/ t/response/TestModperl/ todo/ xs/APR/Status/ xs/ModPerl/Util/ xs/maps/ xs/tables/current/ModPerl/
Date Tue, 17 May 2005 20:23:29 GMT
Author: stas
Date: Tue May 17 13:23:27 2005
New Revision: 170652

URL: http://svn.apache.org/viewcvs?rev=170652&view=rev
Log:
sync with trunk @165380

Added:
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm   (props changed)
      - copied unchanged from r170392, perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm   (props changed)
      - copied unchanged from r170392, perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi-bin/prefork.pl   (props changed)
      - copied unchanged from r170392, perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/prefork.pl
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/prefork.t   (props changed)
      - copied unchanged from r170392, perl/modperl/trunk/ModPerl-Registry/t/prefork.t
    perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_buffer.pm   (props changed)
      - copied unchanged from r170392, perl/modperl/trunk/t/filter/TestFilter/out_str_buffer.pm
    perl/modperl/branches/clone-skip-unstable/t/filter/out_str_buffer.t   (props changed)
      - copied unchanged from r170392, perl/modperl/trunk/t/filter/out_str_buffer.t
    perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/Util_pm
      - copied unchanged from r170392, perl/modperl/trunk/xs/ModPerl/Util/Util_pm
Modified:
    perl/modperl/branches/clone-skip-unstable/   (props changed)
    perl/modperl/branches/clone-skip-unstable/Changes
    perl/modperl/branches/clone-skip-unstable/META.yml
    perl/modperl/branches/clone-skip-unstable/Makefile.PL
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/PerlRun.pm
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/Registry.pm
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/basic.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/conf/extra.conf.in
    perl/modperl/branches/clone-skip-unstable/README
    perl/modperl/branches/clone-skip-unstable/RELEASE
    perl/modperl/branches/clone-skip-unstable/STATUS
    perl/modperl/branches/clone-skip-unstable/lib/Apache2/Build.pm
    perl/modperl/branches/clone-skip-unstable/lib/Bundle/Apache2.pm
    perl/modperl/branches/clone-skip-unstable/lib/ModPerl/BuildOptions.pm
    perl/modperl/branches/clone-skip-unstable/lib/ModPerl/TestReport.pm
    perl/modperl/branches/clone-skip-unstable/lib/mod_perl2.pm
    perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.c
    perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.h
    perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_util.c
    perl/modperl/branches/clone-skip-unstable/t/apr/   (props changed)
    perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/both_str_native_remove.pm
    perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/both_str_req_mix.pm
    perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/in_bbs_underrun.pm
    perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/in_str_consume.pm
    perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_ctx.pm
    perl/modperl/branches/clone-skip-unstable/t/lib/TestCommon/FilterDebug.pm
    perl/modperl/branches/clone-skip-unstable/t/modperl/setupenv.t
    perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_bbs.pm
    perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_bbs2.pm
    perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_filter.pm
    perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_nonblock.pm
    perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_timeout.pm
    perl/modperl/branches/clone-skip-unstable/t/response/TestModperl/setupenv.pm
    perl/modperl/branches/clone-skip-unstable/todo/bugs_mp
    perl/modperl/branches/clone-skip-unstable/todo/release
    perl/modperl/branches/clone-skip-unstable/xs/APR/Status/APR__Status.h
    perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/ModPerl__Util.h
    perl/modperl/branches/clone-skip-unstable/xs/maps/apr_functions.map
    perl/modperl/branches/clone-skip-unstable/xs/maps/modperl_functions.map
    perl/modperl/branches/clone-skip-unstable/xs/tables/current/ModPerl/FunctionTable.pm

Propchange: perl/modperl/branches/clone-skip-unstable/
------------------------------------------------------------------------------
    merge-point = 170620

Modified: perl/modperl/branches/clone-skip-unstable/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/Changes?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/Changes (original)
+++ perl/modperl/branches/clone-skip-unstable/Changes Tue May 17 13:23:27 2005
@@ -10,7 +10,93 @@
 
 =over 3
 
-=item 1.999_23-dev
+=item 2.000_00-dev
+
+fix the ap_install target in the top-level Makefile (used for static
+build) [Stas]
+
+Reintroduce a pure-Perl version of ModPerl::Util::unload_package()
+The problematic XS version is now called unload_package_xs() and
+not used by default [Gozer]
+
+More APR::Status wrappers:  [Stas, Randy Kobes]
+- is_EOF
+- is_ECONNABORTED
+- is_ECONNRESET
+- is_TIMEUP
+
+make sure that the build picks up the include directories based on the
+apxs queries and only search the httpd source if $self->{MP_AP_PREFIX}
+was set. Earlier it was always picking the headers from the httpd
+source if it was available, which was resulting in the wrong headers
+if the installed httpd was different than the source that was found
+[Stas]
+
+introduce ModPerl::RegistryPrefork and ModPerl::PerlRunPrefork, which
+behave the same as ModPerl::Registry and ModPerl::PerlRun,
+respectively, but chdir to the script's directory like mod_cgi
+does. These two new handlers will refuse to load under threaded MPMs
+where chdir can't be used as it will affect all running threads [Stas]
+
+ModPerl::RegistryCooker::chdir_file_normal() now chdirs to the current
+script's directory or the specified directory as an argument, as it
+was planned in first place. Therefore switch ModPerl::Registry and
+ModPerl::PerlRun to us NOP for this method call. If chdir_file is
+mapped to chdir_file_normal(), then run() and
+convert_script_to_compiled_handler() now call chdir to the script's
+directory and at before returning go back to the server root. [Stas]
+
+prevent undef warnings in catfile() calls in Apache2::Build when
+called from the ModPerl-Registry tree [Stas]
+
+fix modperl_brigade_dump to use apr_file_printf() instead of
+fprintf(), which doesn't work everywhere [Stas]
+
+Fix a warning triggered by `ln` on Cygwin, when running perl
+Makefile.PL for a second time without previously running make
+clean. [Nick *** <doink123@abv.bg>]
+
+When compiling a static mod_perl and
+MP_AP_CONFIGURE="--with-apr=/some/path" argument is given, Apache will
+use the apr-config at the given path, but mod_perl was using the
+default at "srclib/apr/.libs". Fix that [Nick *** <doink123@abv.bg>]
+
+Show MP_APU_CONFIG as an argument to Makefile.PL in the Usage
+menu. [Nick *** <doink123@abv.bg>]
+
+Makefile.PL: fix the pre-rename mp2 install diagnostics code, to use
+the mp version of 1.999xx and not 1.999_xx, as the latter is
+unsuitable for numerical comparison, also fix the name of the reported
+conflicting directory [Stas].
+
+add APR::Status::is_(EACCES|ENOENT), and use in ModPerl::RegistryCooker
+to return, as appropriate, Apache2::Const::(FORBIDDEN|NOT_FOUND),
+based on $@. Also remove a check in modperl_slurp_filename
+of src/modules/perl/modperl_util.c to enable $@ to be set when
+opening or reading a file fails. This fixes a bug on Win32, revealed
+in 404.t and redirect.t of the ModPerl-Registry tests, as reported
+by Steve Hay and Markus Wichitill [Stas, Randy Kobes]
+
+link Apache2::* and ModPerl::* to mod_perl.a and DynaLoader.a, but
+-lmod_perl and -lDynaLoader don't work, and we can't supply the full
+paths, because MakeMaker doesn't allow this. I workaround this by
+making a symlink to mod_perl.a (called libmod_perl.a) and copy
+DynaLoader.a to libDynaLoader.a (I don't create a symlink, because,
+when running make clean, the real DynaLoader.a may get deleted).  The
+APR::* extensions are not affected, because in both cases we link them
+against aprext.  Also other small fixes are added. [Nick ***
+<doink123@abv.bg>]
+
+
+
+
+=item 1.999_23 - May 3, 2005
+
+fix Apache2::Build::dynamic_link_MSWin32 to generate a new line after
+dynamic_link code in Makefile [Nick *** <doink123@abv.bg>]
+
+fix a warning in Apache2::Build::build_config() when building
+with MP_STATIC_EXTS=1 [Nick *** <doink123@abv.bg>]
 
 improving DSO support on cygwin. The problem with cygwin is that it
 behaves like windows (it's a posix layer over windows after
@@ -41,7 +127,7 @@
 instead of POD2MAN Makefile macro) [Stas]
 
 
-=item 1.999_22
+=item 1.999_22 - April 14, 2005
 
     ******************** IMPORTANT ********************
     this version of mod_perl is completely incompatible

Modified: perl/modperl/branches/clone-skip-unstable/META.yml
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/META.yml?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/META.yml (original)
+++ perl/modperl/branches/clone-skip-unstable/META.yml Tue May 17 13:23:27 2005
@@ -9,6 +9,9 @@
     package:
           # Internally redefined module
         - C::Preprocessed   
+          # Fake packages
+        - Apache::Status::_version
+        - perlrun_decl
           # Apache::compat redefines
         - Apache
         - Apache::Constants

Modified: perl/modperl/branches/clone-skip-unstable/Makefile.PL
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/Makefile.PL?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/Makefile.PL (original)
+++ perl/modperl/branches/clone-skip-unstable/Makefile.PL Tue May 17 13:23:27 2005
@@ -30,7 +30,7 @@
 use File::Spec;
 use DirHandle ();
 use File::Copy 'cp';
-use File::Basename 'basename';
+use File::Basename qw(basename dirname);
 use File::Find ();
 
 use Apache2::Build ();
@@ -67,7 +67,7 @@
 
 ModPerl::BuildMM::WriteMakefile(
     NAME          => 'mod_perl2',
-    VERSION       => '2.0.0-RC5',
+    VERSION       => $VERSION,
     DISTNAME      => 'mod_perl',
     NO_META       => 1,
     ABSTRACT_FROM => 'lib/mod_perl2.pm',
@@ -126,8 +126,9 @@
     set_modperl_version();
 
     if ($old_modperl_version) {
-        $old_modperl_version =~ s/(\d\d\d?)(\d\d)/$1_$2/;
-        my $vstring = "mod_perl/$old_modperl_version";
+        (my $old_modperl_version_str = $old_modperl_version)
+            =~ s/(\d\d\d?)(\d\d)/$1_$2/;
+        my $vstring = "mod_perl/$old_modperl_version_str";
         print "$vstring installation detected...";
 
         my $prefix;
@@ -143,17 +144,15 @@
                 "no collision)\n";
         }
         else {
-            my @files = ();
-            my @dirs = ();
-            push @files, $old_Apache2_pm if $old_Apache2_pm;
-            push @dirs, $path
-                if $path =~ /Apache2/ or $old_modperl_version > 1.99;
-
             my $note = '';
-            if (@files || @dirs) {
-                $note  = "Problematic\n";
-                $note .= "files: @files\n" if @files;
-                $note .= "dirs: @dirs\n"   if @dirs;
+            if ($old_Apache2_pm) {
+                $note .= "Conflicting file: $old_Apache2_pm\n";
+            }
+            if ($path =~ /Apache2/ or $old_modperl_version > 1.99) {
+                my $dir = dirname $path;
+                # was it installed into the top-level?
+                $dir = catdir $dir, 'Apache' unless $path =~ /Apache2/;
+                $note .= "Conflicting dir: $dir\n" if -d $dir;
             }
 
             print " not ok\n\n";
@@ -164,7 +163,7 @@
 $note
 Please nuke the prior mod_perl installation from your site_lib,
 use a different perl to run the installation process, or use the
-PREFIX option when creating your Makefile.  see
+PREFIX option when creating your Makefile.  See:
 
   http://perl.apache.org/docs/2.0/rename.html
 
@@ -642,12 +641,12 @@
         $string .= <<"EOF";
 ap_build: modperl_lib
 	cd "$build->{MP_AP_PREFIX}" && make
-    
+
 ap_install: ap_build
-	cd "$build->{MP_AP_PREFIX}" && make DESTDIR=$(DESTDIR) install
+	cd "$build->{MP_AP_PREFIX}" && make DESTDIR=\$(DESTDIR) install
 EOF
     }
-    
+
     ModPerl::MM::add_dep(\$string, pure_all => 'modperl_lib');
 
     $string .= <<'EOF';

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/PerlRun.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/PerlRun.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/PerlRun.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/PerlRun.pm Tue May 17 13:23:27 2005
@@ -52,7 +52,7 @@
     read_script     => 'read_script',
     shebang_to_perl => 'shebang_to_perl',
     get_script_name => 'get_script_name',
-    chdir_file      => 'chdir_file_normal',
+    chdir_file      => 'NOP',
     get_mark_line   => 'get_mark_line',
     compile         => 'compile',
     error_check     => 'error_check',

Copied: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm (from r170392, perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm?p2=perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm&p1=perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm&r1=170392&r2=170652&rev=170652&view=diff
==============================================================================
    (empty)

Propchange: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/Registry.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/Registry.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/Registry.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/Registry.pm Tue May 17 13:23:27 2005
@@ -52,7 +52,7 @@
     read_script     => 'read_script',
     shebang_to_perl => 'shebang_to_perl',
     get_script_name => 'get_script_name',
-    chdir_file      => 'chdir_file_normal',
+    chdir_file      => 'NOP',
     get_mark_line   => 'get_mark_line',
     compile         => 'compile',
     error_check     => 'error_check',

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm Tue May 17 13:23:27 2005
@@ -26,6 +26,7 @@
 
 our $VERSION = '1.99';
 
+use Apache2::ServerUtil ();
 use Apache2::Response ();
 use Apache2::RequestRec ();
 use Apache2::RequestUtil ();
@@ -34,15 +35,15 @@
 use Apache2::Access ();
 
 use APR::Table ();
+use APR::Status ();
 
 use ModPerl::Util ();
 use ModPerl::Global ();
 
 use File::Spec::Functions ();
-use File::Basename;
+use File::Basename ();
 
-use APR::Const     -compile => qw(EACCES ENOENT);
-use Apache2::Const  -compile => qw(:common &OPT_EXECCGI);
+use Apache2::Const -compile => qw(:common &OPT_EXECCGI);
 use ModPerl::Const -compile => 'EXIT';
 
 unless (defined $ModPerl::Registry::MarkLine) {
@@ -62,7 +63,6 @@
 # the debug level can be overriden on the main server level of
 # httpd.conf with:
 #   PerlSetVar ModPerl::RegistryCooker::DEBUG 4
-use Apache2::ServerUtil ();
 use constant DEBUG => 0;
 #XXX: below currently crashes the server on win32
 #    defined Apache2->server->dir_config('ModPerl::RegistryCooker::DEBUG')
@@ -235,7 +235,7 @@
 
     $self->flush_namespace;
 
-    #XXX: $self->chdir_file("$Apache2::Server::CWD/");
+    $self->chdir_file(Apache2::ServerUtil::server_root());
 
     return $rc;
 }
@@ -406,7 +406,7 @@
     return $rc unless $rc == Apache2::Const::OK;
     $self->debug(qq{compiled package \"$self->{PACKAGE}\"}) if DEBUG & D_NOISE;
 
-    #$self->chdir_file("$Apache2::Server::CWD/");
+    $self->chdir_file(Apache2::ServerUtil::server_root());
 
 #    if(my $opt = $r->dir_config("PerlRunOnce")) {
 #        $r->child_terminate if lc($opt) eq "on";
@@ -542,8 +542,8 @@
         $self->log_error("$@");
 
         if (ref $@ eq 'APR::Error') {
-            return Apache2::Const::FORBIDDEN if $@ == APR::Const::EACCES;
-            return Apache2::Const::NOT_FOUND if $@ == APR::Const::ENOENT;
+            return Apache2::Const::FORBIDDEN if APR::Status::is_EACCES($@);
+            return Apache2::Const::NOT_FOUND if APR::Status::is_ENOENT($@);
         }
         else {
             return Apache2::Const::SERVER_ERROR;
@@ -618,7 +618,9 @@
 
 sub chdir_file_normal {
     my($self, $dir) = @_;
-    # $self->{REQ}->chdir_file($dir ? $dir : $self->{FILENAME});
+    $dir ||= File::Basename::dirname($self->{FILENAME});
+    $self->debug("chdir $dir") if DEBUG & D_NOISE;
+    chdir $dir or die "Can't chdir to $dir: $!";
 }
 
 #########################################################################

Copied: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm (from r170392, perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm?p2=perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm&p1=perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm&r1=170392&r2=170652&rev=170652&view=diff
==============================================================================
    (empty)

Propchange: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/basic.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/basic.t?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/basic.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/basic.t Tue May 17 13:23:27 2005
@@ -2,11 +2,9 @@
 use warnings FATAL => 'all';
 
 use Apache::Test;
-use Apache::TestUtil;
+use Apache::TestUtil qw(t_cmp t_catfile_apache t_client_log_error_is_expected);
 use Apache::TestRequest;
 use Apache::TestConfig ();
-
-use Apache::TestUtil qw(t_catfile_apache);
 
 my %modules = (
     registry    => 'ModPerl::Registry',

Copied: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi-bin/prefork.pl (from r170392, perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/prefork.pl)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi-bin/prefork.pl?p2=perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi-bin/prefork.pl&p1=perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/prefork.pl&r1=170392&r2=170652&rev=170652&view=diff
==============================================================================
    (empty)

Propchange: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi-bin/prefork.pl
------------------------------------------------------------------------------
    svn:executable = *

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/conf/extra.conf.in
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/conf/extra.conf.in?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/conf/extra.conf.in (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/conf/extra.conf.in Tue May 17 13:23:27 2005
@@ -38,7 +38,9 @@
 Alias /registry/         @ServerRoot@/cgi-bin/
 Alias /registry_bb/      @ServerRoot@/cgi-bin/
 Alias /registry_oo_conf/ @ServerRoot@/cgi-bin/
+Alias /registry_prefork/ @ServerRoot@/cgi-bin/
 Alias /perlrun/          @ServerRoot@/cgi-bin/
+Alias /perlrun_prefork/  @ServerRoot@/cgi-bin/
 Alias /nph/              @ServerRoot@/cgi-bin/
 Alias /registry_modperl_handler/  @ServerRoot@/cgi-bin/
 
@@ -79,6 +81,24 @@
     SetHandler perl-script
     Options +ExecCGI
     PerlResponseHandler ModPerl::Registry
+</Location>
+
+# don't preload ModPerl::RegistryPrefork as it won't load under
+# threaded MPMs
+<Location /registry_prefork>
+    SetHandler perl-script
+    Options +ExecCGI
+    PerlResponseHandler ModPerl::RegistryPrefork
+    PerlOptions +ParseHeaders
+</Location>
+
+# don't preload ModPerl::PerlRunPrefork as it won't load under
+# threaded MPMs
+<Location /perlrun_prefork>
+    SetHandler perl-script
+    Options +ExecCGI
+    PerlResponseHandler ModPerl::PerlRunPrefork
+    PerlOptions +ParseHeaders
 </Location>
 
 PerlModule ModPerl::PerlRun

Copied: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/prefork.t (from r170392, perl/modperl/trunk/ModPerl-Registry/t/prefork.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/prefork.t?p2=perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/prefork.t&p1=perl/modperl/trunk/ModPerl-Registry/t/prefork.t&r1=170392&r2=170652&rev=170652&view=diff
==============================================================================
    (empty)

Propchange: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/prefork.t
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: perl/modperl/branches/clone-skip-unstable/README
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/README?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/README (original)
+++ perl/modperl/branches/clone-skip-unstable/README Tue May 17 13:23:27 2005
@@ -3,8 +3,8 @@
 *** Prerequisites ***
 
 Apache:
-  Dynamic mod_perl (DSO):    Apache 2.0.47 - 2.0.53.
-  Static mod_perl:           Apache 2.0.51 - 2.0.53.
+  Dynamic mod_perl (DSO):    Apache 2.0.47 - 2.0.54.
+  Static mod_perl:           Apache 2.0.51 - 2.0.54.
 
   Newer Apache versions may work with this version of mod_perl.  If
   not, the svn version likely will, which can be obtained from:

Modified: perl/modperl/branches/clone-skip-unstable/RELEASE
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/RELEASE?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/RELEASE (original)
+++ perl/modperl/branches/clone-skip-unstable/RELEASE Tue May 17 13:23:27 2005
@@ -31,6 +31,7 @@
   a. edit ./Changes:
      - remove '-dev' 
      - add release date
+     - temp: change VERSION in Makefile.PL to RC7 (while doing RC series)
 
   b. check ./README and ./Makefile.PL
      - make sure supported httpd versions (dso & static) are current
@@ -51,29 +52,29 @@
 
   g. test the final package again at least once
 
-4. Release the package and update links (e.g. mod_perl-2.0.0-RC6.tar.gz)
+4. Release the package and update links (e.g. mod_perl-2.0.0-RC7.tar.gz)
 
   a. upload to www.apache.org:/www/perl.apache.org/dist/
 
-    %  scp mod_perl-2.0.0-RC6.tar.gz perl.apache.org:/www/perl.apache.org/dist/
+    %  scp mod_perl-2.0.0.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.0-RC6.tar.gz mod_perl-2.0-current.tar.gz
-    % tar -xzvf mod_perl-2.0.0-RC6.tar.gz
+    % ln -sf mod_perl-2.0.0.tar.gz mod_perl-2.0-current.tar.gz
+    % tar -xzvf mod_perl-2.0.0.tar.gz
     % rm /www/perl.apache.org/dist/mod_perl-2.0-current
-    % ln -sf  mod_perl-2.0.0-RC6 mod_perl-2.0-current
+    % ln -sf  mod_perl-2.0.0 mod_perl-2.0-current
 
   c. archive older releases (keep current + one prior release)
 
-    % mv /www/perl.apache.org/dist/mod_perl-2.0.0-RC4.tar.gz \
+    % mv /www/perl.apache.org/dist/mod_perl-2.0.0-RC5.tar.gz \
          /www/perl.apache.org/dist/old
-    % mv /www/perl.apache.org/dist/mod_perl-2.0.0-RC4.tar.gz.asc \
+    % mv /www/perl.apache.org/dist/mod_perl-2.0.0-RC5.tar.gz.asc \
          /www/perl.apache.org/dist/old
-    % rm -rf /www/perl.apache.org/dist/mod_perl-2.0.0-RC4
+    % rm -rf /www/perl.apache.org/dist/mod_perl-2.0.0-RC5
 
   d. update the version and release date
      modperl-docs/src/download/index_top.html and commit. It'll be
@@ -91,27 +92,27 @@
 
   a. sign your local copy of the tarball:
 
-    % gpg --detach-sign --armor mod_perl-2.0.0-RC6.tar.gz
+    % gpg --detach-sign --armor mod_perl-2.0.0.tar.gz
 
-    % pgps -b --armor mod_perl-2.0.0-RC6.tar.gz
+    % pgps -b --armor mod_perl-2.0.0.tar.gz
 
   b. upload the generated sig file to www.apache.org:
 
-    % scp mod_perl-2.0.0-RC6.tar.gz.asc perl.apache.org:/www/perl.apache.org/dist/
-    % perl www.apache.org
+    % scp mod_perl-2.0.0.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.0-RC6.tar.gz.asc
-    % ln -sf mod_perl-2.0.0-RC6.tar.gz.asc mod_perl-2.0-current.tar.gz.asc
+    % chmod 0664 mod_perl-2.0.0.tar.gz.asc
+    % ln -sf mod_perl-2.0.0.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.0-RC6.tar.gz.asc
-    http://perl.apache.org/dist/mod_perl-2.0.0-RC6.tar.gz
+    http://perl.apache.org/dist/mod_perl-2.0.0.tar.gz.asc
+    http://perl.apache.org/dist/mod_perl-2.0.0.tar.gz
 
-    % gpg --verify mod_perl-2.0.0-RC6.tar.gz.asc
+    % gpg --verify mod_perl-2.0.0.tar.gz.asc
 
-    % pgpv mod_perl-2.0.0-RC6.tar.gz.asc
+    % pgpv mod_perl-2.0.0.tar.gz.asc
 
   d. make sure that the files you just created are group rw so
      all the dist admins can make changes:
@@ -125,10 +126,11 @@
   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.0-RC6.tar.gz* .
-   % tar -xzvf mod_perl-2.0.0-RC6.tar.gz
-   % mv mod_perl-2.0.0-RC4.tar.gz* /www/archive.apache.org/dist/perl/
-   % rm -rf mod_perl-2.0.0-RC4
+   % cp /www/perl.apache.org/dist/mod_perl-2.0.0.tar.gz* .
+   % tar -xzvf mod_perl-2.0.0.tar.gz
+   % mv mod_perl-2.0.0-RC5.tar.gz* /www/archive.apache.org/dist/perl/
+   % rm -rf mod_perl-2.0.0-RC5
+
   b. make sure that the files you just created are group rw so
 
      all the dist admins can make changes:
@@ -139,11 +141,11 @@
 8. Announce the package
 
   a. post ... to the modperl, announce lists
-  Subject: [ANNOUNCE] mod_perl 2.0.0-RC6 
+  Subject: [ANNOUNCE] mod_perl 2.0.0 
      include 
   - link at perl.apache.org:
-    http://apache.org/dist/perl/mod_perl-2.0.0-RC6.tar.gz
-    http://apache.org/dist/perl/mod_perl-2.0.0-RC6.tar.gz.asc (pgp sig)
+    http://apache.org/dist/perl/mod_perl-2.0.0.tar.gz
+    http://apache.org/dist/perl/mod_perl-2.0.0.tar.gz.asc (pgp sig)
   - MD5 sig (as it comes from CPAN upload announce).
   - the latest Changes
 
@@ -154,23 +156,24 @@
   b. edit ./Changes:
      - start a new item with incremented version + '-dev'
 
-  =item 1.99_24-dev
+  =item 2.000_00-dev
 
   c. add a release entry in STATUS
 
   d. update this file versions to make it easy to copy-n-paste things
      on the next release:
 
-   perl -pi -e 's/_24/_25/g' RELEASE
+   perl -pi -e 's/_25/_26/g' RELEASE
+   perl -pi -e 's/RC7/RC8/g' RELEASE
    perl -pi -e 's/RC6/RC7/g' RELEASE
    perl -pi -e 's/RC5/RC6/g' RELEASE
    perl -pi -e 's/RC4/RC5/g' RELEASE
-   perl -pi -e 's/RC3/RC4/g' RELEASE
 
      now reload this file and bump up the last number of the first
      two commands.
 
   e. commit the changed files
 
-     % svn ci Changes lib/mod_perl2.pm STATUS RELEASE
+     % svn ci -m "start 2.000_00-dev cycle" Changes lib/mod_perl2.pm \
+       STATUS RELEASE
 

Modified: perl/modperl/branches/clone-skip-unstable/STATUS
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/STATUS?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/STATUS (original)
+++ perl/modperl/branches/clone-skip-unstable/STATUS Tue May 17 13:23:27 2005
@@ -4,6 +4,7 @@
 Release:
 --------
 
+   1.999.23   : Released May 03, 2005
    1.999.22   : Released Apr 14, 2005
    1.999.21   : Released Jan 22, 2005
    1.999.20   : Released Jan 05, 2005

Modified: perl/modperl/branches/clone-skip-unstable/lib/Apache2/Build.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/lib/Apache2/Build.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/Apache2/Build.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/Apache2/Build.pm Tue May 17 13:23:27 2005
@@ -24,6 +24,7 @@
                              catpath splitpath);
 use File::Basename;
 use ExtUtils::Embed ();
+use File::Copy ();
 
 use constant IS_MOD_PERL_BUILD => grep { -e "$_/lib/mod_perl2.pm" } qw(. ..);
 
@@ -109,11 +110,12 @@
     my $self = shift;
 
     $apxs = ''; # not found
-
     my @trys = ($Apache2::Build::APXS,
                 $self->{MP_APXS},
-                $ENV{MP_APXS},
-                catfile $self->{MP_AP_PREFIX}, 'bin', 'apxs');
+                $ENV{MP_APXS});
+
+    push @trys, catfile $self->{MP_AP_PREFIX}, 'bin', 'apxs' 
+        if exists $self->{MP_AP_PREFIX};
 
     if (WIN32) {
         my $ext = '.bat';
@@ -234,12 +236,12 @@
     return ($arg and ref($arg) eq __PACKAGE__) ? $arg : __PACKAGE__;
 }
 
-my %threaded_mpms = map { $_ => 1}
+my %threaded_mpms = map { $_ => 1 }
         qw(worker winnt beos mpmt_os2 netware leader perchild threadpool);
 sub mpm_is_threaded {
     my $self = shift;
     my $mpm_name = $self->mpm_name();
-    return $threaded_mpms{$mpm_name};
+    return $threaded_mpms{$mpm_name} || 0;
 }
 
 sub mpm_name {
@@ -253,16 +255,19 @@
     my $mpm_name = $self->apxs('-q' => 'MPM_NAME');
 
     # building against the httpd source dir
-    unless ($mpm_name and $self->httpd_is_source_tree) {
-        my $config_vars_file = catfile $self->dir, "build", "config_vars.mk";
-        if (open my $fh, $config_vars_file) {
-            while (<$fh>) {
-                if (/MPM_NAME = (\w+)/) {
-                    $mpm_name = $1;
-                    last;
+    unless (($mpm_name and $self->httpd_is_source_tree)) {
+        if ($self->dir) {
+            my $config_vars_file = catfile $self->dir,
+                "build", "config_vars.mk";
+            if (open my $fh, $config_vars_file) {
+                while (<$fh>) {
+                    if (/MPM_NAME = (\w+)/) {
+                        $mpm_name = $1;
+                        last;
+                    }
                 }
+                close $fh;
             }
-            close $fh;
         }
     }
 
@@ -783,7 +788,7 @@
     my $self = shift;
     my $bpm_mtime = 0;
 
-    $bpm_mtime = (stat $INC{$bpm})[9] if $INC{$bpm};
+    $bpm_mtime = (stat _)[9] if $INC{$bpm} && -e $INC{$bpm};
 
     if (-e "lib/$bpm" and (stat _)[9] > $bpm_mtime) {
         #reload if Makefile.PL has regenerated
@@ -935,7 +940,8 @@
 
     return $self->{dir} if $self->{dir};
 
-    if (IS_MOD_PERL_BUILD) {
+    # be careful with the guesswork, or may pick up some wrong headers
+    if (IS_MOD_PERL_BUILD && $self->{MP_AP_PREFIX}) {
         my $build = $self->build_config;
 
         if (my $bdir = $build->{'dir'}) {
@@ -1000,14 +1006,14 @@
 # difference between where the apache headers are (to build
 # against) and where they will be installed (to install our
 # own headers alongside)
-# 
+#
 # ap_exp_includedir is where apache is going to install its
 # headers to
 sub ap_exp_includedir {
     my ($self) = @_;
-    
+
     return $self->{ap_exp_includedir} if $self->{ap_exp_includedir};
-    
+
     my $build_vars = File::Spec->catfile($self->{MP_AP_PREFIX}, 
                                          qw(build config_vars.mk));
     open my $vars, "<$build_vars" or die "Couldn't open $build_vars $!";
@@ -1018,7 +1024,7 @@
             last;
         }
     }
-    
+
     $self->{ap_exp_includedir} = $ap_exp_includedir;
 }
 
@@ -1059,6 +1065,12 @@
     for ($self->apu_config_path, $self->apr_config_path) {
         if (my $link = $_ && -x $_ && qx{$_ --link-ld --libs}) {
             chomp $link;
+
+            # Change '/path/to/libanything.la' to '-L/path/to -lanything'
+            if (CYGWIN) {
+                $link =~ s|(\S*)/lib([^.\s]+)\.\S+|-L$1 -l$2|g;
+            }
+
             if ($self->httpd_is_source_tree) {
                 my @libs;
                 while ($link =~ m/-L(\S+)/g) {
@@ -1104,6 +1116,15 @@
                 push @tries, grep -d $_,
                     map catdir($base, "srclib", $_), qw(apr apr-util);
             }
+
+            # Check for MP_AP_CONFIGURE="--with-apr[-util]=DIR|FILE"
+            my $what_long = ($what eq 'apu') ? 'apr-util' : 'apr';
+            if ($self->{MP_AP_CONFIGURE} &&
+                $self->{MP_AP_CONFIGURE} =~ /--with-${what_long}=(\S+)/) {
+                my $dir = $1;
+                $dir =~ s/$config$// unless -d $dir;
+                push @tries, grep -d $_, $dir, catdir $dir, 'bin';
+            }
         }
         else {
             push @tries, grep length,
@@ -1505,7 +1526,7 @@
     return $self->dynamic_link_header_default .
         "\t$defs" .
         ($symbols ? ' \\' . "\n\t-pdb:$symbols" : '') .
-        ' -out:$@';
+        ' -out:$@' . "\n\n";
 }
 
 sub dynamic_link_aix {
@@ -1546,7 +1567,9 @@
 
 sub modperl_libs_cygwin {
      my $self = shift;
-     "-L$self->{cwd}/src/modules/perl -l$self->{MP_LIBNAME}";
+     return $self->is_dynamic
+         ? "-L$self->{cwd}/src/modules/perl -l$self->{MP_LIBNAME}"
+         : $self->modperl_static_libs_cygwin;
 }
 
 sub modperl_libs {
@@ -1556,6 +1579,37 @@
     $libs->($self);
 }
 
+my $modperl_static_libs_cygwin = '';
+sub modperl_static_libs_cygwin {
+    my $self = shift;
+
+    return $modperl_static_libs_cygwin if $modperl_static_libs_cygwin;
+
+    my $dyna_filepath = catdir $self->perl_config('archlibexp'),
+        'auto/DynaLoader/DynaLoader.a';
+    my $modperl_path  = "$self->{cwd}/src/modules/perl";
+    # Create symlink to mod_perl.a, but copy DynaLoader.a, because
+    # when running make clean the real DynaLoader.a may get deleted.
+    my $src = catfile $modperl_path, "$self->{MP_LIBNAME}.a";
+    my $dst = catfile $modperl_path, "lib$self->{MP_LIBNAME}.a";
+    # perl's link() on Cygwin seems to copy mod_perl.a to
+    # libmod_perl.a, but at this stage mod_perl.a is still a dummy lib
+    # and at the end we get nothing. whereas `ln -s` seems to create
+    # something like the shortcut on windows and it works.
+    qx{ln -s $src $dst} unless -e $dst;
+    File::Copy::copy($dyna_filepath, "$modperl_path/libDynaLoader.a");
+
+    $modperl_static_libs_cygwin = join ' ',
+        "-L$modperl_path",
+        "-l$self->{MP_LIBNAME}",
+        '-lDynaLoader',
+        $self->apru_link_flags,
+        '-L' . catdir($self->perl_config('archlibexp'), 'CORE'),
+        '-lperl';
+
+    $modperl_static_libs_cygwin;
+}
+
 # returns the directory and name of the aprext lib built under blib/ 
 sub mp_apr_blib {
     my $self = shift;
@@ -1831,7 +1885,7 @@
     my $flags = $self->otherldflags_default;
 
     unless ($self->{MP_STATIC_EXTS}) {
-        $flags .= join ' ', $self->apru_link_flags;
+        $flags .= join ' ', '', $self->apru_link_flags;
     }
 
     $flags;
@@ -1874,7 +1928,6 @@
         die "Can't find the mod_perl include dir (reason: $reason)";
     }
 
-    my $src = $self->dir;
     my $os = WIN32 ? 'win32' : 'unix';
     push @inc, $self->file_path("src/modules/perl", "xs");
 
@@ -1898,13 +1951,16 @@
         }
     }
 
-    for ("$src/modules/perl", "$src/include",
-         "$src/srclib/apr/include",
-         "$src/srclib/apr-util/include",
-         "$src/os/$os")
-      {
-          push @inc, $_ if -d $_;
-      }
+    if ($self->{MP_AP_PREFIX}) {
+        my $src = $self->dir;
+        for ("$src/modules/perl", "$src/include",
+             "$src/srclib/apr/include",
+             "$src/srclib/apr-util/include",
+             "$src/os/$os")
+            {
+                push @inc, $_ if -d $_;
+            }
+    }
 
     return \@inc;
 }

Modified: perl/modperl/branches/clone-skip-unstable/lib/Bundle/Apache2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/lib/Bundle/Apache2.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/Bundle/Apache2.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/Bundle/Apache2.pm Tue May 17 13:23:27 2005
@@ -36,7 +36,7 @@
 
 Bundle::ApacheTest    - Needs for testing
 
-CGI  3.08             - Used in testing (it's in core, but some vendors exclude it)
+CGI  3.10             - Used in testing (it's in core, but some vendors exclude it)
 
 Chatbot::Eliza        - Used in testing
 

Modified: perl/modperl/branches/clone-skip-unstable/lib/ModPerl/BuildOptions.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/lib/ModPerl/BuildOptions.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/ModPerl/BuildOptions.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/ModPerl/BuildOptions.pm Tue May 17 13:23:27 2005
@@ -106,7 +106,7 @@
 
             if (!$table->{$key} and $opts & UNKNOWN_FATAL) {
                 my $usage = usage();
-                die "Unknown Option: $key\nUsage:\n$usage";
+                die "Unknown Option: $key\nUsage:\n$usage\n";
             }
 
             if ($key eq 'MP_APXS') {
@@ -233,6 +233,7 @@
 AP_PREFIX      0    Apache installation or source tree prefix
 AP_CONFIGURE   0    Apache ./configure arguments
 APR_CONFIG     0    Path to apr-config
+APU_CONFIG     0    Path to apu-config
 XS_GLUE_DIR    1    Directories containing extension glue
 INCLUDE_DIR    1    Add directories to search for header files
 GENERATE_XS    0    Generate XS code based on httpd version

Modified: perl/modperl/branches/clone-skip-unstable/lib/ModPerl/TestReport.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/lib/ModPerl/TestReport.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/ModPerl/TestReport.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/ModPerl/TestReport.pm Tue May 17 13:23:27 2005
@@ -21,6 +21,7 @@
 
 my @interesting_packages = qw(
     CGI
+    ExtUtils::MakeMaker
     Apache2::Request
     mod_perl2
     LWP

Modified: perl/modperl/branches/clone-skip-unstable/lib/mod_perl2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/lib/mod_perl2.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/mod_perl2.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/mod_perl2.pm Tue May 17 13:23:27 2005
@@ -18,7 +18,7 @@
 use strict;
 
 BEGIN {
-    our $VERSION = "1.999023";
+    our $VERSION = "2.000000";
     our $VERSION_TRIPLET;
 
     if ($VERSION =~ /(\d+)\.(\d\d\d)(\d+)/) {
@@ -31,9 +31,10 @@
         die "bad version: $VERSION";
     }
 
-    # $VERSION        : "1.099020"
-    # int $VERSION    : 1.09902
-    # $VERSION_TRIPLET: 1.99.20
+    # for example this gives us:
+    # $VERSION        : "2.000020"
+    # int $VERSION    : 2.00002
+    # $VERSION_TRIPLET: 2.0.20
 
     # easy to parse request time  API version - use
     # $mod_perl2::VERSION for more granularity

Modified: perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.c?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.c (original)
+++ perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.c Tue May 17 13:23:27 2005
@@ -642,7 +642,7 @@
         return 0;
     }
 
-    /*modperl_brigade_dump(filter->bb_in, stderr);*/
+    /* modperl_brigade_dump(filter->bb_in, NULL); */
 
     MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
                "wanted: %db\n",
@@ -850,7 +850,7 @@
                MP_FILTER_NAME(filter->f), *len,
                MP_TRACE_STR_TRUNC(filter->pool, copy, *len));
     APR_BRIGADE_INSERT_TAIL(filter->bb_out, bucket);
-    /* modperl_brigade_dump(filter->bb_out, stderr); */
+    /* modperl_brigade_dump(filter->bb_out, NULL); */
     return APR_SUCCESS;
 }
 
@@ -1241,28 +1241,28 @@
                (unsigned long)callback);
 }
 
-void modperl_brigade_dump(apr_bucket_brigade *bb, FILE *fp)
+void modperl_brigade_dump(apr_bucket_brigade *bb, apr_file_t *file)
 {
     apr_bucket *bucket;
     int i = 0;
 #ifndef WIN32
-    if (fp == NULL) {
-        fp = stderr;
+    if (file == NULL) {
+        file = modperl_global_get_server_rec()->error_log;
     }
 
-    fprintf(fp, "dump of brigade 0x%lx\n",
-            (unsigned long)bb);
+    apr_file_printf(file, "dump of brigade 0x%lx\n", (unsigned long)bb);
 
     for (bucket = APR_BRIGADE_FIRST(bb);
          bucket != APR_BRIGADE_SENTINEL(bb);
          bucket = APR_BUCKET_NEXT(bucket))
     {
-        fprintf(fp, "   %d: bucket=%s(0x%lx), length=%ld, data=0x%lx\n",
-                i, bucket->type->name,
-                (unsigned long)bucket,
-                (long)bucket->length,
-                (unsigned long)bucket->data);
-        /* fprintf(fp, "       : %s\n", (char *)bucket->data); */
+        apr_file_printf(file,
+                        "   %d: bucket=%s(0x%lx), length=%ld, data=0x%lx\n",
+                        i, bucket->type->name,
+                        (unsigned long)bucket,
+                        (long)bucket->length,
+                        (unsigned long)bucket->data);
+        /* apr_file_printf(file, "       : %s\n", (char *)bucket->data); */
 
         i++;
     }

Modified: perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.h
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.h?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.h (original)
+++ perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.h Tue May 17 13:23:27 2005
@@ -83,7 +83,7 @@
                                                    const char *buf,
                                                    apr_size_t *len);
 
-void modperl_brigade_dump(apr_bucket_brigade *bb, FILE *fp);
+void modperl_brigade_dump(apr_bucket_brigade *bb, apr_file_t *file);
 
 /* input filters */
 apr_status_t modperl_input_filter_handler(ap_filter_t *f,

Modified: perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_util.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_util.c?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_util.c (original)
+++ perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_util.c Tue May 17 13:23:27 2005
@@ -616,11 +616,6 @@
     size = r->finfo.size;
     sv = newSV(size);
 
-    if (!size) {
-        sv_setpvn(sv, "", 0);
-        return newRV_noinc(sv);
-    }
-
     /* XXX: could have checked whether r->finfo.filehand is valid and
      * save the apr_file_open call, but apache gives us no API to
      * check whether filehand is valid. we can't test whether it's

Propchange: perl/modperl/branches/clone-skip-unstable/t/apr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 17 13:23:27 2005
@@ -10,6 +10,7 @@
 os.t
 perlio.t
 pool.t
+status.t
 sockaddr.t
 socket.t
 string.t

Modified: perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/both_str_native_remove.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/both_str_native_remove.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/both_str_native_remove.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/both_str_native_remove.pm Tue May 17 13:23:27 2005
@@ -12,6 +12,8 @@
 use Apache2::Filter ();
 use Apache2::FilterRec ();
 
+use APR::Table ();
+
 use TestCommon::Utils ();
 
 use Apache2::Const -compile => qw(OK DECLINED M_POST);

Modified: perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/both_str_req_mix.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/both_str_req_mix.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/both_str_req_mix.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/both_str_req_mix.pm Tue May 17 13:23:27 2005
@@ -138,7 +138,7 @@
         # PerlSetInputFilter is only useful for preserving the
         # insertion order of filters with the same priority
         SetInputFilter     DEFLATE
-        #PerlInputFilterHandler ModPerl::TestFilterDebug::snoop_request
+        #PerlInputFilterHandler TestCommon::FilterDebug::snoop_request
         PerlInputFilterHandler TestFilter::both_str_req_mix::in_adjust
         PerlInputFilterHandler TestFilter::both_str_req_mix::transparent
 
@@ -147,7 +147,7 @@
         PerlOutputFilterHandler TestFilter::both_str_req_mix::out_adjust_before_ssi
         PerlSetOutputFilter INCLUDES
         PerlOutputFilterHandler TestFilter::both_str_req_mix::out_adjust_after_ssi
-        #PerlOutputFilterHandler ModPerl::TestFilterDebug::snoop_request
+        #PerlOutputFilterHandler TestCommon::FilterDebug::snoop_request
         PerlSetOutputFilter DEFLATE
 
         SetHandler modperl

Modified: perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/in_bbs_underrun.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/in_bbs_underrun.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/in_bbs_underrun.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/in_bbs_underrun.pm Tue May 17 13:23:27 2005
@@ -150,4 +150,4 @@
 PerlModule          TestFilter::in_bbs_underrun
 PerlResponseHandler TestFilter::in_bbs_underrun::response
 PerlInputFilterHandler TestFilter::in_bbs_underrun::handler
-#PerlInputFilterHandler ModPerl::TestFilterDebug::snoop_request
+#PerlInputFilterHandler TestCommon::FilterDebug::snoop_request

Modified: perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/in_str_consume.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/in_str_consume.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/in_str_consume.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/in_str_consume.pm Tue May 17 13:23:27 2005
@@ -143,6 +143,6 @@
 SetHandler modperl
 PerlModule          TestFilter::in_str_consume
 PerlResponseHandler TestFilter::in_str_consume::response
-#PerlInputFilterHandler  ModPerl::TestFilterDebug::snoop_request
+#PerlInputFilterHandler  TestCommon::FilterDebug::snoop_request
 PerlInputFilterHandler  TestFilter::in_str_consume::handler
-#PerlInputFilterHandler  ModPerl::TestFilterDebug::snoop_request
+#PerlInputFilterHandler  TestCommon::FilterDebug::snoop_request

Copied: perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_buffer.pm (from r170392, perl/modperl/trunk/t/filter/TestFilter/out_str_buffer.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_buffer.pm?p2=perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_buffer.pm&p1=perl/modperl/trunk/t/filter/TestFilter/out_str_buffer.pm&r1=170392&r2=170652&rev=170652&view=diff
==============================================================================
    (empty)

Propchange: perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_buffer.pm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_ctx.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_ctx.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_ctx.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_ctx.pm Tue May 17 13:23:27 2005
@@ -9,9 +9,6 @@
 use Apache2::RequestRec ();
 use Apache2::RequestIO ();
 
-use APR::Brigade ();
-use APR::Bucket ();
-
 use base qw(Apache2::Filter);
 
 use Apache2::Const -compile => qw(OK M_POST);

Copied: perl/modperl/branches/clone-skip-unstable/t/filter/out_str_buffer.t (from r170392, perl/modperl/trunk/t/filter/out_str_buffer.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/out_str_buffer.t?p2=perl/modperl/branches/clone-skip-unstable/t/filter/out_str_buffer.t&p1=perl/modperl/trunk/t/filter/out_str_buffer.t&r1=170392&r2=170652&rev=170652&view=diff
==============================================================================
    (empty)

Propchange: perl/modperl/branches/clone-skip-unstable/t/filter/out_str_buffer.t
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: perl/modperl/branches/clone-skip-unstable/t/lib/TestCommon/FilterDebug.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/lib/TestCommon/FilterDebug.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/lib/TestCommon/FilterDebug.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/lib/TestCommon/FilterDebug.pm Tue May 17 13:23:27 2005
@@ -1,4 +1,4 @@
-package ModPerl::TestFilterDebug;
+package TestCommon::FilterDebug;
 
 use strict;
 use warnings FATAL => 'all';
@@ -12,10 +12,11 @@
 use APR::Const -compile => ':common';
 
 # to use these functions add any or all of these filter handlers
-# PerlInputFilterHandler  ModPerl::TestFilterDebug::snoop_request
-# PerlInputFilterHandler  ModPerl::TestFilterDebug::snoop_connection
-# PerlOutputFilterHandler ModPerl::TestFilterDebug::snoop_request
-# PerlOutputFilterHandler ModPerl::TestFilterDebug::snoop_connection
+# PerlModule              TestCommon::FilterDebug
+# PerlInputFilterHandler  TestCommon::FilterDebug::snoop_request
+# PerlInputFilterHandler  TestCommon::FilterDebug::snoop_connection
+# PerlOutputFilterHandler TestCommon::FilterDebug::snoop_request
+# PerlOutputFilterHandler TestCommon::FilterDebug::snoop_connection
 #
 
 sub snoop_connection : FilterConnectionHandler { snoop("connection", @_) }

Modified: perl/modperl/branches/clone-skip-unstable/t/modperl/setupenv.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/modperl/setupenv.t?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/modperl/setupenv.t (original)
+++ perl/modperl/branches/clone-skip-unstable/t/modperl/setupenv.t Tue May 17 13:23:27 2005
@@ -26,7 +26,7 @@
 # this requires keepalives and a per-connection interpreter
 # to make certain we can plan in one request and test in another
 # which requires LWP
-unless (need_lwp()) {
+unless (need_lwp() && need_module('mod_env')) {
     plan tests => 63, 0;
 }
 

Modified: perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_bbs.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_bbs.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_bbs.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_bbs.pm Tue May 17 13:23:27 2005
@@ -19,7 +19,8 @@
 use Apache::TestTrace;
 
 use Apache2::Const -compile => qw(OK MODE_GETLINE);
-use APR::Const    -compile => qw(SUCCESS EOF SO_NONBLOCK);
+use APR::Const    -compile => qw(SUCCESS SO_NONBLOCK);
+use APR::Status ();
 
 sub handler {
     my $c = shift;
@@ -33,7 +34,7 @@
     while (1) {
         debug "asking new line";
         my $rc = $c->input_filters->get_brigade($bb, Apache2::Const::MODE_GETLINE);
-        last if $rc == APR::Const::EOF;
+        last if APR::Status::is_EOF($rc);
         die APR::Error::strerror($rc) unless $rc == APR::Const::SUCCESS;
 
         for (my $b = $bb->first; $b; $b = $bb->next($b)) {

Modified: perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_bbs2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_bbs2.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_bbs2.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_bbs2.pm Tue May 17 13:23:27 2005
@@ -14,7 +14,8 @@
 use APR::Error ();
 
 use Apache2::Const -compile => qw(OK MODE_GETLINE);
-use APR::Const    -compile => qw(SUCCESS EOF SO_NONBLOCK);
+use APR::Const    -compile => qw(SUCCESS SO_NONBLOCK);
+use APR::Status ();
 
 sub handler {
     my $c = shift;
@@ -30,7 +31,7 @@
     while (1) {
         my $rc = $c->input_filters->get_brigade($bb_in,
                                                 Apache2::Const::MODE_GETLINE);
-        last if $rc == APR::Const::EOF;
+        last if APR::Status::is_EOF($rc);
         die APR::Error::strerror($rc) unless $rc == APR::Const::SUCCESS;
 
         next unless $bb_in->flatten(my $data);

Modified: perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_filter.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_filter.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_filter.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_filter.pm Tue May 17 13:23:27 2005
@@ -13,7 +13,8 @@
 
 use base qw(Apache2::Filter);
 
-use APR::Const    -compile => qw(SUCCESS EOF SO_NONBLOCK);
+use APR::Const    -compile => qw(SUCCESS SO_NONBLOCK);
+use APR::Status ();
 use Apache2::Const -compile => qw(OK MODE_GETLINE);
 
 use constant BUFF_LEN => 1024;
@@ -39,7 +40,7 @@
 
     while (1) {
         my $rc = $c->input_filters->get_brigade($bb, Apache2::Const::MODE_GETLINE);
-        last if $rc == APR::Const::EOF;
+        last if APR::Status::is_EOF($rc);
         die APR::Error::strerror($rc) unless $rc == APR::Const::SUCCESS;
 
         # fflush is the equivalent of the following 3 lines of code:

Modified: perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_nonblock.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_nonblock.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_nonblock.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_nonblock.pm Tue May 17 13:23:27 2005
@@ -12,8 +12,8 @@
 use Apache::TestTrace;
 
 use Apache2::Const -compile => 'OK';
-use APR::Const    -compile => qw(SO_NONBLOCK TIMEUP SUCCESS POLLIN
-                                 ECONNABORTED);
+use APR::Const    -compile => qw(SO_NONBLOCK SUCCESS POLLIN);
+use APR::Status ();
 
 use constant BUFF_LEN => 1024;
 
@@ -42,8 +42,12 @@
             my $buf;
             my $len = eval { $socket->recv($buf, BUFF_LEN) };
             if ($@) {
+                # rethrow
                 die $@ unless ref $@ eq 'APR::Error'
-                    && $@ == APR::Const::ECONNABORTED; # rethrow
+                    && (APR::Status::is_ECONNABORTED($@) ||
+                        APR::Status::is_ECONNRESET($@));
+                # ECONNABORTED == 103
+                # ECONNRESET   == 104
                 # ECONNABORTED is not an application error
                 # XXX: we don't really test that we always get this
                 # condition, since it depends on the timing of the
@@ -60,7 +64,7 @@
             debug "sending: $buf";
             $socket->send($buf);
         }
-        elsif ($rc == APR::Const::TIMEUP) {
+        elsif (APR::Status::is_TIMEUP($rc)) {
             debug "timeout";
             $socket->send("TIMEUP\n");
         }

Modified: perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_timeout.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_timeout.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_timeout.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/protocol/TestProtocol/echo_timeout.pm Tue May 17 13:23:27 2005
@@ -10,10 +10,10 @@
 
 use Apache2::Connection ();
 use APR::Socket ();
-use APR::Status ();
 
 use Apache2::Const -compile => 'OK';
 use APR::Const     -compile => qw(SO_NONBLOCK);
+use APR::Status ();
 
 use constant BUFF_LEN => 1024;
 
@@ -33,7 +33,7 @@
         my $buff;
         my $rlen = eval { $socket->recv($buff, BUFF_LEN) };
         if ($@) {
-            die "timed out, giving up: $@" if APR::Status::is_EAGAIN($@);
+            die "timed out, giving up: $@" if APR::Status::is_TIMEUP($@);
             die $@;
         }
 
@@ -41,7 +41,7 @@
 
         my $wlen = eval { $socket->send($buff) };
         if ($@) {
-            die "timed out, giving up: $@" if APR::Status::is_EAGAIN($@);
+            die "timed out, giving up: $@" if APR::Status::is_TIMEUP($@);
             die $@;
         }
     }

Modified: perl/modperl/branches/clone-skip-unstable/t/response/TestModperl/setupenv.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/response/TestModperl/setupenv.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/response/TestModperl/setupenv.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/response/TestModperl/setupenv.pm Tue May 17 13:23:27 2005
@@ -190,7 +190,9 @@
     PerlPostReadRequestHandler TestModperl::setupenv::subenv_one
 
     # SetEnv is affected by +SetupEnv
-    SetEnv SRV_SETENV server
+    <IfModule mod_env.c>
+        SetEnv SRV_SETENV server
+    </IfModule>
 
     # PerlSetEnv is not affected by +SetupEnv or -SetupEnv
     # it is entirely separate and always set if configured
@@ -210,8 +212,9 @@
         PerlResponseHandler TestModperl::setupenv::noenv
 
         PerlFixupHandler TestModperl::setupenv::subenv_two
-
-        SetEnv DIR_SETENV mpdefault
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV mpdefault
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV mpdefault
     </Location>
 
@@ -226,7 +229,9 @@
 
         PerlFixupHandler TestModperl::setupenv::subenv_two
 
-        SetEnv DIR_SETENV mpsetup
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV mpsetup
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV mpsetup
     </Location>
 
@@ -242,7 +247,9 @@
         PerlHeaderParserHandler TestModperl::setupenv::subenv_void
         PerlFixupHandler TestModperl::setupenv::subenv_two
 
-        SetEnv DIR_SETENV mpvoid
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV mpvoid
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV mpvoid
     </Location>
 
@@ -260,7 +267,9 @@
         PerlHeaderParserHandler TestModperl::setupenv::subenv_void
         PerlFixupHandler TestModperl::setupenv::subenv_two
 
-        SetEnv DIR_SETENV mpsetupvoid
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV mpsetupvoid
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV mpsetupvoid
     </Location>
 
@@ -272,7 +281,9 @@
 
         PerlFixupHandler TestModperl::setupenv::subenv_two
 
-        SetEnv DIR_SETENV psdefault
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV psdefault
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV psdefault
     </Location>
 
@@ -286,7 +297,9 @@
 
         PerlFixupHandler TestModperl::setupenv::subenv_two
 
-        SetEnv DIR_SETENV psnosetup
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV psnosetup
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV psnosetup
     </Location>
 
@@ -302,7 +315,9 @@
         PerlHeaderParserHandler TestModperl::setupenv::subenv_void
         PerlFixupHandler TestModperl::setupenv::subenv_two
 
-        SetEnv DIR_SETENV psvoid
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV psvoid
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV psvoid
     </Location>
 
@@ -318,7 +333,9 @@
         PerlHeaderParserHandler TestModperl::setupenv::subenv_void
         PerlFixupHandler TestModperl::setupenv::subenv_two
 
-        SetEnv DIR_SETENV psnosetupvoid
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV psnosetupvoid
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV psnosetupvoid
     </Location>
 </VirtualHost>

Modified: perl/modperl/branches/clone-skip-unstable/todo/bugs_mp
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/todo/bugs_mp?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/todo/bugs_mp (original)
+++ perl/modperl/branches/clone-skip-unstable/todo/bugs_mp Tue May 17 13:23:27 2005
@@ -113,3 +113,8 @@
 * mpxs_Apache2__RequestRec_GETC in Apache_RequestIO.h is out to be
   reimplemented similar to read() w/o using the deprecated
   client_block interface
+
+* Segfaults under Apache::Reload (could be uncovering a bug in mp):
+  http://marc.theaimsgroup.com/?t=111145169900002&r=1&w=2
+  owner: gozer
+-                           

Modified: perl/modperl/branches/clone-skip-unstable/todo/release
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/todo/release?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/todo/release (original)
+++ perl/modperl/branches/clone-skip-unstable/todo/release Tue May 17 13:23:27 2005
@@ -5,12 +5,6 @@
 -- see also todo/api_status
 -- see also todo/release-checklist
 
-Segfaults under Apache::Reload (could be uncovering a bug in mp):
-http://marc.theaimsgroup.com/?t=111145169900002&r=1&w=2
-owner: gozer
-
--------------
-
 someone has asked to make $r->request_time settable
 
 -------------

Modified: perl/modperl/branches/clone-skip-unstable/xs/APR/Status/APR__Status.h
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/xs/APR/Status/APR__Status.h?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/xs/APR/Status/APR__Status.h (original)
+++ perl/modperl/branches/clone-skip-unstable/xs/APR/Status/APR__Status.h Tue May 17 13:23:27 2005
@@ -15,4 +15,10 @@
 
 #include "apr_errno.h"
 
-#define mpxs_APR__Status_is_EAGAIN APR_STATUS_IS_EAGAIN
+#define mpxs_APR__Status_is_EAGAIN       APR_STATUS_IS_EAGAIN
+#define mpxs_APR__Status_is_EACCES       APR_STATUS_IS_EACCES
+#define mpxs_APR__Status_is_ENOENT       APR_STATUS_IS_ENOENT
+#define mpxs_APR__Status_is_EOF          APR_STATUS_IS_EOF
+#define mpxs_APR__Status_is_ECONNABORTED APR_STATUS_IS_ECONNABORTED
+#define mpxs_APR__Status_is_ECONNRESET   APR_STATUS_IS_ECONNRESET
+#define mpxs_APR__Status_is_TIMEUP       APR_STATUS_IS_TIMEUP

Modified: perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/ModPerl__Util.h
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/ModPerl__Util.h?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/ModPerl__Util.h (original)
+++ perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/ModPerl__Util.h Tue May 17 13:23:27 2005
@@ -35,7 +35,7 @@
 #define mpxs_ModPerl__Util_current_callback \
     modperl_callback_current_callback_get
 
-#define mpxs_ModPerl__Util_unload_package(pkg) \
+#define mpxs_ModPerl__Util_unload_package_xs(pkg) \
     modperl_package_unload(aTHX_ pkg)
 
 /* ModPerl::Util::exit lives in mod_perl.so, see modperl_perl.c */

Modified: perl/modperl/branches/clone-skip-unstable/xs/maps/apr_functions.map
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/xs/maps/apr_functions.map?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/xs/maps/apr_functions.map (original)
+++ perl/modperl/branches/clone-skip-unstable/xs/maps/apr_functions.map Tue May 17 13:23:27 2005
@@ -648,4 +648,10 @@
 -apr_os_shm_put
 
 MODULE=APR::Status      PREFIX=mpxs_APR__STATUS_
- int:DEFINE_is_EAGAIN | | apr_status_t:rc
+ int:DEFINE_is_EAGAIN       | | apr_status_t:rc
+ int:DEFINE_is_EACCES       | | apr_status_t:rc
+ int:DEFINE_is_ENOENT       | | apr_status_t:rc
+ int:DEFINE_is_EOF          | | apr_status_t:rc
+ int:DEFINE_is_ECONNABORTED | | apr_status_t:rc
+ int:DEFINE_is_ECONNRESET   | | apr_status_t:rc
+ int:DEFINE_is_TIMEUP       | | apr_status_t:rc

Modified: perl/modperl/branches/clone-skip-unstable/xs/maps/modperl_functions.map
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/xs/maps/modperl_functions.map?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/xs/maps/modperl_functions.map (original)
+++ perl/modperl/branches/clone-skip-unstable/xs/maps/modperl_functions.map Tue May 17 13:23:27 2005
@@ -7,7 +7,7 @@
  mpxs_ModPerl__Util_untaint | | ...
  SV *:DEFINE_current_perl_id
  char *:DEFINE_current_callback 
- DEFINE_unload_package | | const char *:package
+ DEFINE_unload_package_xs | | const char *:package
 
 MODULE=ModPerl::Global
  mpxs_ModPerl__Global_special_list_call

Modified: perl/modperl/branches/clone-skip-unstable/xs/tables/current/ModPerl/FunctionTable.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/xs/tables/current/ModPerl/FunctionTable.pm?rev=170652&r1=170651&r2=170652&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/xs/tables/current/ModPerl/FunctionTable.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/xs/tables/current/ModPerl/FunctionTable.pm Tue May 17 13:23:27 2005
@@ -78,8 +78,8 @@
         'name' => 'bb'
       },
       {
-        'type' => 'FILE *',
-        'name' => 'fp'
+        'type' => 'apr_file_t *',
+        'name' => 'file'
       }
     ]
   },



Mime
View raw message