perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r209869 - in /perl/modperl/branches/clone-skip-unstable: ./ ModPerl-Registry/lib/ModPerl/ ModPerl-Registry/t/ ModPerl-Registry/t/cgi-bin/ ModPerl-Registry/t/conf/ build/ lib/ lib/Apache2/ lib/ModPerl/ src/modules/perl/ t/apache/ t/conf/ t/d...
Date Fri, 08 Jul 2005 19:30:44 GMT
Author: stas
Date: Fri Jul  8 12:30:40 2005
New Revision: 209869

URL: http://svn.apache.org/viewcvs?rev=209869&view=rev
Log:
more syncing and work in progress


Added:
    perl/modperl/branches/clone-skip-unstable/BRANCHING
      - copied unchanged from r202272, perl/modperl/trunk/BRANCHING
    perl/modperl/branches/clone-skip-unstable/build/make_rpm_spec   (props changed)
      - copied unchanged from r202272, perl/modperl/trunk/build/make_rpm_spec
    perl/modperl/branches/clone-skip-unstable/build/svn.remerge   (props changed)
      - copied unchanged from r202272, perl/modperl/trunk/build/svn.remerge
    perl/modperl/branches/clone-skip-unstable/t/response/TestDirective/perlloadmodule7.pm   (props changed)
      - copied unchanged from r202272, perl/modperl/trunk/t/response/TestDirective/perlloadmodule7.pm
Modified:
    perl/modperl/branches/clone-skip-unstable/   (props changed)
    perl/modperl/branches/clone-skip-unstable/Changes
    perl/modperl/branches/clone-skip-unstable/Makefile.PL
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/206.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/304.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/404.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/500.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/bad_scripts.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/basic.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/bin_resp.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi-bin/basic.pl
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/closure.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/conf/extra.conf.in
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/flush.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/ithreads.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/nph.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/perlrun_extload.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/prefork.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/redirect.t
    perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/special_blocks.t
    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/Apache2/ParseSource.pm
    perl/modperl/branches/clone-skip-unstable/lib/Apache2/Status.pm
    perl/modperl/branches/clone-skip-unstable/lib/ModPerl/Manifest.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/mod_perl.h
    perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_callback.c
    perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_filter.c
    perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_handler.c
    perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_module.c
    perl/modperl/branches/clone-skip-unstable/t/apache/content_length_header.t
    perl/modperl/branches/clone-skip-unstable/t/conf/extra.conf.in
    perl/modperl/branches/clone-skip-unstable/t/conf/extra.last.conf.in
    perl/modperl/branches/clone-skip-unstable/t/directive/   (props changed)
    perl/modperl/branches/clone-skip-unstable/t/directive/perl.t
    perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_lc.pm
    perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_subreq_default.pm
    perl/modperl/branches/clone-skip-unstable/t/filter/out_str_lc.t
    perl/modperl/branches/clone-skip-unstable/t/filter/out_str_subreq_default.t
    perl/modperl/branches/clone-skip-unstable/t/lib/TestAPRlib/base64.pm
    perl/modperl/branches/clone-skip-unstable/t/lib/TestAPRlib/finfo.pm
    perl/modperl/branches/clone-skip-unstable/t/modules/apache_status.t
    perl/modperl/branches/clone-skip-unstable/t/modules/include.t
    perl/modperl/branches/clone-skip-unstable/t/modules/include2.t
    perl/modperl/branches/clone-skip-unstable/t/modules/reload.t
    perl/modperl/branches/clone-skip-unstable/t/protocol/pseudo_http.t
    perl/modperl/branches/clone-skip-unstable/t/response/TestAPI/request_rec.pm
    perl/modperl/branches/clone-skip-unstable/t/response/TestAPI/slurp_filename.pm
    perl/modperl/branches/clone-skip-unstable/t/response/TestModules/reload.pm
    perl/modperl/branches/clone-skip-unstable/xs/APR/Base64/APR__Base64.h
    perl/modperl/branches/clone-skip-unstable/xs/APR/Bucket/APR__Bucket.h
    perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/Util_pm
    perl/modperl/branches/clone-skip-unstable/xs/maps/apr_functions.map
    perl/modperl/branches/clone-skip-unstable/xs/tables/current/Apache2/ConstantsTable.pm
    perl/modperl/branches/clone-skip-unstable/xs/tables/current/Apache2/FunctionTable.pm
    perl/modperl/branches/clone-skip-unstable/xs/tables/current/ModPerl/FunctionTable.pm

Propchange: perl/modperl/branches/clone-skip-unstable/
------------------------------------------------------------------------------
--- merge-point (original)
+++ merge-point Fri Jul  8 12:30:40 2005
@@ -1 +1 @@
-170620
+209863

Propchange: perl/modperl/branches/clone-skip-unstable/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul  8 12:30:40 2005
@@ -4,8 +4,10 @@
 blib
 blibdirs
 blibdirs.ts
+mod_perl.spec
 pm_to_blib
 pm_to_blib.ts
+rpm
 scraps
 diff.txt
 smoke-report-*.txt

Modified: perl/modperl/branches/clone-skip-unstable/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/Changes?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/Changes (original)
+++ perl/modperl/branches/clone-skip-unstable/Changes Fri Jul  8 12:30:40 2005
@@ -10,7 +10,73 @@
 
 =over 3
 
-=item 2.000_00-dev
+=item 2.0.2-dev
+
+t/modules/reload.t would fail if run more than 3 times, breaking
+smokes [Gozer]
+
+filter flushing now doesn't croak on connection reset
+(ECONNRESET/ECONNABORTED), but just logs the event on the 'info'
+level. [Stas]
+
+RPM Friendly builds : [Gozer]
+- make dist tarballs can now be built directly into RPMs with rpmbuild
+- Added a new target 'make rpm' to directly build rpms from a checkout
+
+
+
+=item 2.0.1 - June 17, 2005
+
+B::Terse has problems with XS code, so adjust Apache::Status to eval
+{} the code doing Syntax Tree Dump: syntax and execution order options
+[Stas]
+
+Fix a broken regexp in Apache2::Build::dir() on win32 that would
+incorrectly attempt to fully-qualify paths like c:/some/path
+[Nick *** <doink123@abv.bg>]
+
+Fix the "No library found" warnings when building on win32 without
+apxs and MP_AP_PREFIX [Nick *** <doink123@abv.bg>]
+
+The pure-perl ModPerl::Util::unload_package implementation was
+accidently deleting sub-stashes [Gozer]
+
+If running Makefile.PL unnatended (STDIN isn't a terminal or
+MP_PROMPT_DEFAULT=1), break out of potentially infinite prompt
+loops [Gozer]
+
+fix ModPerl::TestReport used by t/REPORT and mp2bug to use
+ExtUtils::MakeMaker's MM->parse_version to get the interesting
+packages version number, w/o trying to load them (which may fail if
+the environment is not right) [Stas]
+
+fix a bug in ModPerl::RegistryCooker: now stripping __(END|DATA)__
+only at the beginning of the line [Stas]
+
+APR::Base64 : [Torsten Foertsch <torsten.foertsch@gmx.net>]
+- fix encode_len() to return the length without accounting for the
+terminating '\0' as the C API does. 
+- fix encode() to create the string of the correct length (previously
+was creating one too many)
+
+in mod_perl callbacks merge error-notes entries rather than store just
+the newest error [Mark <mark@immermail.com>]
+
+Expose Apache2::Const::EXEC_ON_READ (added to the :override group)
+[Stas]
+
+Fix a bug in custom directive implementation, where the code called
+from modperl_module_config_merge() was setting the global context
+after selecting the new interpreter which was leading to a segfault in
+any handler called thereafter, whose context was different
+beforehand. [Stas]
+
+
+
+=item 2.0.0 - May 20, 2005
+
+fix global anon_cnt double-initialization bug that was causing
+startup segfaults on OSX. [Gozer]
 
 fix the ap_install target in the top-level Makefile (used for static
 build) [Stas]

Modified: perl/modperl/branches/clone-skip-unstable/Makefile.PL
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/Makefile.PL?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/Makefile.PL (original)
+++ perl/modperl/branches/clone-skip-unstable/Makefile.PL Fri Jul  8 12:30:40 2005
@@ -49,6 +49,8 @@
 my $build = Apache2::Build->new(init => 1);
 my $code  = ModPerl::Code->new;
 
+sub UNATTENDED() { $build->{MP_PROMPT_DEFAULT} || ! -t STDIN }
+
 win32_fetch_apxs() if WIN32;
 
 configure();
@@ -251,7 +253,7 @@
         }
         until ($ok) {
             my $ask = "Please provide the location of the Apache directory:";
-            my $ans = $build->prompt($ask);
+            my $ans = $build->prompt($ask) || "";
             # strip leading/closing spaces
             $ans =~ s/^\s*|\s*$//g;
             if (defined $ans and -d $ans) {
@@ -259,7 +261,9 @@
                 $ok++;
             }
             else {
-                error "Can't find dir '$ans'";            }
+                error "Can't find dir '$ans'";
+                last if UNATTENDED;
+            }
         }
     }
 
@@ -344,7 +348,7 @@
     my $prompt = "\nPlease provide a full path to 'apxs' executable\n" .
         "(press Enter if you don't have it installed):";
     while (1) {
-        my $ans = $build->prompt($prompt);
+        my $ans = $build->prompt($prompt) || "";
 
         print "\n\n";
 
@@ -785,13 +789,24 @@
     my $string = $self->ModPerl::BuildMM::MY::postamble;
 
     $string .= <<'EOF';
-mydist : Apache-Test/META.yml manifest tardist
+mydist : Apache-Test/META.yml mod_perl.spec manifest tardist
+
+rpm: dist
+	@[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm
+	rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \
+                 --define "_srcrpmdir $(PWD)/rpm" \
+                 $(DISTVNAME).tar.gz
+	@mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/
+	@rm -rf $(PWD)/rpm/*/
+    
+mod_perl.spec: build/make_rpm_spec
+	$(PERL) build/make_rpm_spec
 
 Apache-Test/META.yml:
 	cd Apache-Test && make metafile
 
 tag :
-	svn copy . https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
+	svn copy  https://svn.apache.org/repos/asf/perl/modperl/trunk  https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
 	@$(ECHO) update mod_perl2.pm VERSION now
 EOF
 

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=209869&r1=209868&r2=209869&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 Fri Jul  8 12:30:40 2005
@@ -645,7 +645,7 @@
 #########################################################################
 
 sub strip_end_data_segment {
-    ${ +shift->{CODE} } =~ s/__(END|DATA)__(.*)//s;
+    ${ +shift->{CODE} } =~ s/^__(END|DATA)__(.*)//ms;
 }
 
 

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/206.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/206.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/206.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/206.t Fri Jul  8 12:30:40 2005
@@ -5,7 +5,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest qw(GET);
 
-plan tests => 2;
+plan tests => 2, need 'mod_alias.c';
 
 my $url = "/registry/206.pl";
 my $res = GET($url);

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/304.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/304.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/304.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/304.t Fri Jul  8 12:30:40 2005
@@ -5,7 +5,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest qw(GET);
 
-plan tests => 10;
+plan tests => 10, need 'mod_alias.c';
 
 my $url = "/registry/304.pl";
 

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/404.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/404.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/404.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/404.t Fri Jul  8 12:30:40 2005
@@ -5,7 +5,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest qw(GET_BODY GET);
 
-plan tests => 2;
+plan tests => 2, need 'mod_alias.c';
 
 {
     t_client_log_error_is_expected();

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/500.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/500.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/500.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/500.t Fri Jul  8 12:30:40 2005
@@ -5,7 +5,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest qw(GET);
 
-plan tests => 7;
+plan tests => 7, need 'mod_alias.c';
 
 {
     # the script changes the status before the run-time error happens,

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/bad_scripts.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/bad_scripts.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/bad_scripts.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/bad_scripts.t Fri Jul  8 12:30:40 2005
@@ -5,7 +5,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest qw(GET);
 
-plan tests => 1;
+plan tests => 1, need 'mod_alias.c';
 
 {
     t_client_log_error_is_expected();

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=209869&r1=209868&r2=209869&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 Fri Jul  8 12:30:40 2005
@@ -14,7 +14,7 @@
 
 my @aliases = sort keys %modules;
 
-plan tests => @aliases * 5 + 3;
+plan tests => @aliases * 5 + 3, need 'mod_alias.c';
 
 my $vars = Apache::Test::config()->{vars};
 my $script_file = t_catfile_apache $vars->{serverroot}, 'cgi-bin', 'basic.pl';

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/bin_resp.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/bin_resp.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/bin_resp.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/bin_resp.t Fri Jul  8 12:30:40 2005
@@ -7,7 +7,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest;
 
-plan tests => 2;
+plan tests => 2, need 'mod_alias.c';
 
 # 2 sub-tests
 {

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi-bin/basic.pl
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi-bin/basic.pl?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi-bin/basic.pl (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi-bin/basic.pl Fri Jul  8 12:30:40 2005
@@ -3,8 +3,13 @@
 # test all the basic functionality
 
 print "Content-type: text/plain\n\n";
+
+# test that __END__ can appear in a comment w/o cutting data after it
+
 print "ok $0";
 
+# test that __END__ starting at the beginning of the line makes
+# everything following it, stripped
 __END__
 
 this is some irrelevant data

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/cgi.t Fri Jul  8 12:30:40 2005
@@ -5,7 +5,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest qw(GET);
 
-plan tests => 2, need_min_module_version CGI => 3.08;
+plan tests => 2, need 'mod_alias.c', need_min_module_version CGI => 3.08;
 
 my $url = "/registry/cgi.pl";
 my $res = GET $url;

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/closure.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/closure.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/closure.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/closure.t Fri Jul  8 12:30:40 2005
@@ -17,7 +17,7 @@
 
 my @modules = qw(registry registry_bb perlrun);
 
-plan tests => 6;
+plan tests => 6, need 'mod_alias.c';
 
 my $cfg = Apache::Test::config();
 

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=209869&r1=209868&r2=209869&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 Fri Jul  8 12:30:40 2005
@@ -35,16 +35,18 @@
 #############################
 ### Normal registry setup ###
 #############################
-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/
+<IfModule mod_alias.c>
+    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/
 
-ScriptAlias /cgi-bin/ @ServerRoot@/cgi-bin/
+    ScriptAlias /cgi-bin/ @ServerRoot@/cgi-bin/
+</IfModule>
 
 PerlModule ModPerl::RegistryBB
 <Location /registry_bb>
@@ -112,11 +114,12 @@
 #######################################
 ### Same interpreter registry setup ###
 #######################################
-
-Alias /same_interp/registry/         @ServerRoot@/cgi-bin/
-Alias /same_interp/registry_bb/      @ServerRoot@/cgi-bin/
-Alias /same_interp/registry_oo_conf/ @ServerRoot@/cgi-bin/
-Alias /same_interp/perlrun/          @ServerRoot@/cgi-bin/
+<IfModule mod_alias.c>
+    Alias /same_interp/registry/         @ServerRoot@/cgi-bin/
+    Alias /same_interp/registry_bb/      @ServerRoot@/cgi-bin/
+    Alias /same_interp/registry_oo_conf/ @ServerRoot@/cgi-bin/
+    Alias /same_interp/perlrun/          @ServerRoot@/cgi-bin/
+</IfModule>
 
 PerlModule Apache::TestHandler
 
@@ -157,8 +160,10 @@
 </Location>
 
 ### the 404 test ###
+<IfModule mod_alias.c>
+    Alias /error_document/ @ServerRoot@/cgi-bin/
+</IfModule>
 
-Alias /error_document/ @ServerRoot@/cgi-bin/
 <Location /error_document>
     ErrorDocument 404 /error_document/404.pl
     SetHandler perl-script
@@ -167,8 +172,9 @@
 </Location>
 
 ### deflate tests ###
-
-Alias /registry_bb_deflate/ @ServerRoot@/cgi-bin/
+<IfModule mod_alias.c>
+    Alias /registry_bb_deflate/ @ServerRoot@/cgi-bin/
+</IfModule>
 
 #PerlOutputFilterHandler ModPerl::TestFilterDebug::snoop_connection
 PerlModule ModPerl::RegistryBB
@@ -197,7 +203,9 @@
 # XXX: would be nice to have Apache-Test support a new 'tmp' token
 # (similar to t_logs) which will map onto t/tmp by default and provide
 # a new -tmp option to override this default
-SetEnv TMPDIR @t_logs@
+<IfModule mod_env.c>
+    SetEnv TMPDIR @t_logs@
+</IfModule>
 # </sandbox-friendly>
 
 

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/flush.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/flush.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/flush.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/flush.t Fri Jul  8 12:30:40 2005
@@ -5,7 +5,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest qw(GET_BODY);
 
-plan tests => 1, need 'deflate',
+plan tests => 1, need 'deflate', 'mod_alias.c',
     need_min_module_version("Compress::Zlib", "1.09"),
     need_min_apache_version("2.0.48");
 # it requires httpd 2.0.48 because of the bug in mod_deflate:

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/ithreads.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/ithreads.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/ithreads.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/ithreads.t Fri Jul  8 12:30:40 2005
@@ -9,7 +9,7 @@
 
 use constant HAS_ITHREADS => ($] >= 5.008001 && $Config{useithreads});
 
-#plan tests => 1, need
+#plan tests => 1, need 'mod_alias.c',
 #    {"perl 5.8.1 or higher w/ithreads enabled is required" => HAS_ITHREADS};
 
 # XXX: this test can not be run as it is, since $r is no longer

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/nph.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/nph.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/nph.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/nph.t Fri Jul  8 12:30:40 2005
@@ -5,7 +5,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest;
 
-plan tests => 6;
+plan tests => 6, need 'mod_alias.c';
 
 my $url = "/nph/nph-foo.pl";
 

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/perlrun_extload.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/perlrun_extload.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/perlrun_extload.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/perlrun_extload.t Fri Jul  8 12:30:40 2005
@@ -6,7 +6,7 @@
 use Apache::TestRequest qw(GET);
 use TestCommon::SameInterp;
 
-plan tests => 2;
+plan tests => 2, need 'mod_alias.c';
 
 my $url = "/same_interp/perlrun/perlrun_extload.pl";
 my $same_interp = Apache::TestRequest::same_interp_tie($url);

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/prefork.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/prefork.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/prefork.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/prefork.t Fri Jul  8 12:30:40 2005
@@ -19,8 +19,8 @@
 
 my @aliases = sort keys %modules;
 
-plan tests => 1*@aliases, need {
-    "can't run under threaded MPMs" => !$mpm_is_threaded };
+plan tests => 1*@aliases, need 'mod_alias.c',
+    { "can't run under threaded MPMs" => !$mpm_is_threaded };
 
 my $script = "prefork.pl";
 

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/redirect.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/redirect.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/redirect.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/redirect.t Fri Jul  8 12:30:40 2005
@@ -7,7 +7,7 @@
 
 use Apache::TestUtil qw(t_catfile_apache);
 
-plan tests => 4, need_lwp;
+plan tests => 4, need 'mod_alias.c', need_lwp;
 
 # need LWP to handle redirects
 my $base_url = "/registry/redirect.pl";

Modified: perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/special_blocks.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/special_blocks.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/special_blocks.t (original)
+++ perl/modperl/branches/clone-skip-unstable/ModPerl-Registry/t/special_blocks.t Fri Jul  8 12:30:40 2005
@@ -16,7 +16,7 @@
 
 my @aliases = sort keys %modules;
 
-plan tests => @aliases * 4;
+plan tests => @aliases * 4, need 'mod_alias.c';
 
 {
     # PerlRun always run BEGIN/END since it's never cached

Modified: perl/modperl/branches/clone-skip-unstable/RELEASE
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/RELEASE?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/RELEASE (original)
+++ perl/modperl/branches/clone-skip-unstable/RELEASE Fri Jul  8 12:30:40 2005
@@ -1,7 +1,7 @@
 Instructions for mod_perl 2.0 Release Manager
 
 1. 'make dist' - to make sure nothing is missing from the manifest,
-   etc. Now test this generated package mod_perl-2.0.0-RC6.tar.gz (not
+   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.
@@ -31,13 +31,12 @@
   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
 
   c. rerun:
-     % perl Makefile.PL MP_INST_APACHE2=1
+     % perl Makefile.PL
      make sure tag looks right
      % make -n tag
 
@@ -52,29 +51,29 @@
 
   g. test the final package again at least once
 
-4. Release the package and update links (e.g. mod_perl-2.0.0-RC7.tar.gz)
+4. Release the package and update links (e.g. mod_perl-2.0.2.tar.gz)
 
   a. upload to www.apache.org:/www/perl.apache.org/dist/
 
-    %  scp mod_perl-2.0.0.tar.gz perl.apache.org:/www/perl.apache.org/dist/
+    %  scp mod_perl-2.0.2.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.tar.gz mod_perl-2.0-current.tar.gz
-    % tar -xzvf mod_perl-2.0.0.tar.gz
+    % 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
     % rm /www/perl.apache.org/dist/mod_perl-2.0-current
-    % ln -sf  mod_perl-2.0.0 mod_perl-2.0-current
+    % ln -sf  mod_perl-2.0.2 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-RC5.tar.gz \
+    % mv /www/perl.apache.org/dist/mod_perl-2.0.0.tar.gz \
          /www/perl.apache.org/dist/old
-    % mv /www/perl.apache.org/dist/mod_perl-2.0.0-RC5.tar.gz.asc \
+    % mv /www/perl.apache.org/dist/mod_perl-2.0.0.tar.gz.asc \
          /www/perl.apache.org/dist/old
-    % rm -rf /www/perl.apache.org/dist/mod_perl-2.0.0-RC5
+    % rm -rf /www/perl.apache.org/dist/mod_perl-2.0.0
 
   d. update the version and release date
      modperl-docs/src/download/index_top.html and commit. It'll be
@@ -92,27 +91,27 @@
 
   a. sign your local copy of the tarball:
 
-    % gpg --detach-sign --armor mod_perl-2.0.0.tar.gz
+    % gpg --detach-sign --armor mod_perl-2.0.2.tar.gz
 
-    % pgps -b --armor mod_perl-2.0.0.tar.gz
+    % pgps -b --armor mod_perl-2.0.2.tar.gz
 
   b. upload the generated sig file to www.apache.org:
 
-    % scp mod_perl-2.0.0.tar.gz.asc perl.apache.org:/www/perl.apache.org/dist/
+    % scp mod_perl-2.0.2.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.tar.gz.asc
-    % ln -sf mod_perl-2.0.0.tar.gz.asc mod_perl-2.0-current.tar.gz.asc
+    % 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
 
   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.tar.gz.asc
-    http://perl.apache.org/dist/mod_perl-2.0.0.tar.gz
+    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
 
-    % gpg --verify mod_perl-2.0.0.tar.gz.asc
+    % gpg --verify mod_perl-2.0.2.tar.gz.asc
 
-    % pgpv mod_perl-2.0.0.tar.gz.asc
+    % pgpv mod_perl-2.0.2.tar.gz.asc
 
   d. make sure that the files you just created are group rw so
      all the dist admins can make changes:
@@ -126,10 +125,10 @@
   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.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
+   % cp /www/perl.apache.org/dist/mod_perl-2.0.2.tar.gz* .
+   % tar -xzvf mod_perl-2.0.2.tar.gz
+   % mv mod_perl-2.0.0.tar.gz* /www/archive.apache.org/dist/perl/
+   % rm -rf mod_perl-2.0.0
 
   b. make sure that the files you just created are group rw so
 
@@ -141,11 +140,11 @@
 8. Announce the package
 
   a. post ... to the modperl, announce lists
-  Subject: [ANNOUNCE] mod_perl 2.0.0 
+  Subject: [ANNOUNCE] mod_perl 2.0.2 
      include 
   - link at perl.apache.org:
-    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)
+    http://apache.org/dist/perl/mod_perl-2.0.2.tar.gz
+    http://apache.org/dist/perl/mod_perl-2.0.2.tar.gz.asc (pgp sig)
   - MD5 sig (as it comes from CPAN upload announce).
   - the latest Changes
 
@@ -156,24 +155,25 @@
   b. edit ./Changes:
      - start a new item with incremented version + '-dev'
 
-  =item 2.000_00-dev
+  =item 2.0.3-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/_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/2.0.0/2.0.0/g' RELEASE
+   perl -pi -e 's/2.0.3/2.0.3/g' RELEASE
+   perl -pi -e 's/2.0.2/2.0.3/g' RELEASE
+   perl -pi -e 's/2.0.1/2.0.2/g' RELEASE
+   perl -pi -e 's/2.0.0/2.0.1/g' RELEASE
+   perl -ni -e 'print unless /2.0.0/' RELEASE
+   
      now reload this file and bump up the last number of the first
      two commands.
 
   e. commit the changed files
 
-     % svn ci -m "start 2.000_00-dev cycle" Changes lib/mod_perl2.pm \
+     % svn ci -m "start 2.0.3-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=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/STATUS (original)
+++ perl/modperl/branches/clone-skip-unstable/STATUS Fri Jul  8 12:30:40 2005
@@ -3,7 +3,8 @@
 
 Release:
 --------
-
+   2.000.01   : Released Jun 17, 2005
+   2.000.00   : Released May 20, 2005
    1.999.23   : Released May 03, 2005
    1.999.22   : Released Apr 14, 2005
    1.999.21   : Released Jan 22, 2005

Propchange: perl/modperl/branches/clone-skip-unstable/build/make_rpm_spec
------------------------------------------------------------------------------
    svn:executable = *

Propchange: perl/modperl/branches/clone-skip-unstable/build/svn.remerge
------------------------------------------------------------------------------
    svn:executable = *

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=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/Apache2/Build.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/Apache2/Build.pm Fri Jul  8 12:30:40 2005
@@ -932,7 +932,7 @@
         for (qw(ap_includedir)) {
             delete $self->{$_};
         }
-        if ($dir =~ m:^../:) {
+        if ($dir =~ m:^\.\.[/\\]:) {
             $dir = "$self->{cwd}/$dir";
         }
         $self->{dir} = $dir;
@@ -1546,7 +1546,7 @@
 
 sub apache_libs_MSWin32 {
     my $self = shift;
-    my $prefix = $self->apxs(-q => 'PREFIX');
+    my $prefix = $self->apxs(-q => 'PREFIX') || $self->dir;
     my @libs = map { "$prefix/lib/lib$_.lib" } qw(apr aprutil httpd);
     "@libs";
 }

Modified: perl/modperl/branches/clone-skip-unstable/lib/Apache2/ParseSource.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/lib/Apache2/ParseSource.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/Apache2/ParseSource.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/Apache2/ParseSource.pm Fri Jul  8 12:30:40 2005
@@ -236,7 +236,7 @@
         methods    => [qw{M_ METHODS}],
         mpmq       => [qw{AP_MPMQ_}],
         options    => [qw{OPT_}],
-        override   => [qw{OR_ ACCESS_CONF RSRC_CONF}],
+        override   => [qw{OR_ EXEC_ON_READ ACCESS_CONF RSRC_CONF}],
         platform   => [qw{CRLF CR LF}],
         remotehost => [qw{REMOTE_}],
         satisfy    => [qw{SATISFY_}],

Modified: perl/modperl/branches/clone-skip-unstable/lib/Apache2/Status.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/lib/Apache2/Status.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/Apache2/Status.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/Apache2/Status.pm Fri Jul  8 12:30:40 2005
@@ -497,7 +497,11 @@
 
     # XXX: blead perl dumps things to STDERR, though the same version
     # works fine with 1.27
-    B::Terse::compile($arg, $name)->();
+    # B::Concise couldn't parse XS code before perl patch 24681 (perl 5.9.3)
+    eval { B::Terse::compile($arg, $name)->() };
+    if ($@) {
+        $r->print("B::Terse has failed: $@");
+    }
 }
 
 sub b_terse_size_link {

Modified: perl/modperl/branches/clone-skip-unstable/lib/ModPerl/Manifest.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/lib/ModPerl/Manifest.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/ModPerl/Manifest.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/ModPerl/Manifest.pm Fri Jul  8 12:30:40 2005
@@ -31,6 +31,7 @@
 #anything else to be added should go here:
 my @add_files = qw{
     MANIFEST
+    mod_perl.spec
     Apache-Test/META.yml
 };
 

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=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/ModPerl/TestReport.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/ModPerl/TestReport.pm Fri Jul  8 12:30:40 2005
@@ -19,6 +19,8 @@
 
 use base qw(Apache::TestReportPerl);
 
+use ExtUtils::MakeMaker ();
+
 my @interesting_packages = qw(
     CGI
     ExtUtils::MakeMaker
@@ -33,9 +35,7 @@
 # modules that are about to be installed
 my @skip_dirs = qw(
     blib/lib
-    blib/lib/Apache2
     blib/arch
-    blib/arch/Apache2
     lib
 );
 my $skip_dir_str = join '|', map { s|/|[/\\\\]|g; $_ } @skip_dirs;
@@ -43,8 +43,6 @@
 
 sub packages {
 
-    # search in Apache2/ subdirs too
-    eval { require Apache2 };
     my @inc = grep !/$skip_dir_pat/, @INC;
 
     my %packages = ();
@@ -56,11 +54,7 @@
         for my $dir (@inc) {
             my $path = "$dir/$filename";
             if (-e $path) {
-                no warnings 'redefine';
-                my $ver = eval { require $path;
-                                 delete $INC{$path};
-                                 $package->VERSION;
-                         };
+                my $ver = MM->parse_version($path);
                 # two versions could be installed (one under Apache2/)
                 push @{ $packages{$package} }, $ver if $ver;
             }

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=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/lib/mod_perl2.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/lib/mod_perl2.pm Fri Jul  8 12:30:40 2005
@@ -18,7 +18,7 @@
 use strict;
 
 BEGIN {
-    our $VERSION = "2.000000";
+    our $VERSION = "2.000002";
     our $VERSION_TRIPLET;
 
     if ($VERSION =~ /(\d+)\.(\d\d\d)(\d+)/) {

Modified: perl/modperl/branches/clone-skip-unstable/src/modules/perl/mod_perl.h
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/src/modules/perl/mod_perl.h?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/src/modules/perl/mod_perl.h (original)
+++ perl/modperl/branches/clone-skip-unstable/src/modules/perl/mod_perl.h Fri Jul  8 12:30:40 2005
@@ -169,7 +169,7 @@
 #ifdef USE_ITHREADS
 
 #define MP_PERL_CONTEXT_DECLARE                 \
-    PerlInterpreter *orig_perl;                 \
+    PerlInterpreter *orig_perl = NULL;          \
     pTHX;
 
 #define MP_PERL_CONTEXT_STORE                   \
@@ -184,7 +184,9 @@
     MP_PERL_CONTEXT_OVERRIDE(new_perl)
 
 #define MP_PERL_CONTEXT_RESTORE                 \
-    PERL_SET_CONTEXT(orig_perl);
+    if (orig_perl) {                            \
+        PERL_SET_CONTEXT(orig_perl);            \
+    }
 
 #else /* #ifdef USE_ITHREADS */
 

Modified: perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_callback.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_callback.c?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_callback.c (original)
+++ perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_callback.c Fri Jul  8 12:30:40 2005
@@ -130,7 +130,7 @@
 
     if (status == HTTP_INTERNAL_SERVER_ERROR) {
         if (r && r->notes) {
-            apr_table_set(r->notes, "error-notes", SvPV_nolen(ERRSV));
+            apr_table_mergen(r->notes, "error-notes", SvPV_nolen(ERRSV));
         }
     }
 

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=209869&r1=209868&r2=209869&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 Fri Jul  8 12:30:40 2005
@@ -470,6 +470,23 @@
 }
 
 
+#define MP_RUN_CROAK_RESET_OK(func)                                     \
+    {                                                                   \
+        apr_status_t rc = func(filter);                                 \
+        if (rc != APR_SUCCESS) {                                        \
+            if (APR_STATUS_IS_ECONNRESET(rc) ||                         \
+                APR_STATUS_IS_ECONNABORTED(rc)) {                       \
+                ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,              \
+                             "Apache2::Filter internal flush got: %s",  \
+                             modperl_error_strerror(aTHX_ rc));         \
+            }                                                           \
+            else {                                                      \
+                modperl_croak(aTHX_ rc,                                 \
+                              "Apache2::Filter internal flush");        \
+            }                                                           \
+        }                                                               \
+    }
+
 int modperl_run_filter(modperl_filter_t *filter)
 {
     AV *args = Nullav;
@@ -534,12 +551,10 @@
             apr_brigade_destroy(filter->bb_in);
             filter->bb_in = NULL;
         }
-        MP_RUN_CROAK(modperl_input_filter_flush(filter),
-                     "Apache2::Filter");
+        MP_RUN_CROAK_RESET_OK(modperl_input_filter_flush);
     }
     else {
-        MP_RUN_CROAK(modperl_output_filter_flush(filter),
-                     "Apache2::Filter");
+        MP_RUN_CROAK_RESET_OK(modperl_output_filter_flush);
     }
 
     MP_FILTER_RESTORE_ERRSV(errsv);
@@ -551,7 +566,6 @@
 
     return status;
 }
-
 
 /* unrolled APR_BRIGADE_FOREACH loop */
 

Modified: perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_handler.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_handler.c?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_handler.c (original)
+++ perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_handler.c Fri Jul  8 12:30:40 2005
@@ -89,9 +89,6 @@
         modperl_modglobal_lookup(aTHX_ "ANONSUB");
     MP_TRACE_h(MP_FUNC, "init $PL_modglobal{ANONSUB} = []");
     MP_MODGLOBAL_STORE_HV(gkey);
-
-    /* init the counter to 0 */
-    modperl_global_anon_cnt_init(p);
 }
 
 /* allocate and populate the anon handler sub-struct */

Modified: perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_module.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_module.c?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_module.c (original)
+++ perl/modperl/branches/clone-skip-unstable/src/modules/perl/modperl_module.c Fri Jul  8 12:30:40 2005
@@ -165,10 +165,9 @@
     int is_startup;
     PTR_TBL_t *table;
     SV *mrg_obj = Nullsv, *base_obj, *add_obj;
-
 #ifdef USE_ITHREADS
     modperl_interp_t *interp;
-    pTHX;
+    MP_PERL_CONTEXT_DECLARE;
 #endif
 
     /* if the module is loaded in vhost, base==NULL */
@@ -184,7 +183,7 @@
 
 #ifdef USE_ITHREADS
     interp = modperl_interp_pool_select(p, s);
-    aTHX = interp->perl;
+    MP_PERL_CONTEXT_STORE_OVERRIDE(interp->perl);
 #endif
 
     table = modperl_module_config_table_get(aTHX_ TRUE);
@@ -192,6 +191,11 @@
     add_obj  = modperl_svptr_table_fetch(aTHX_ table, add);
 
     if (!base_obj || (base_obj == add_obj)) {
+#ifdef USE_ITHREADS
+        /* XXX: breaks prefork
+           modperl_interp_unselect(interp); */
+        MP_PERL_CONTEXT_RESTORE;
+#endif
         return addv;
     }
 
@@ -240,6 +244,12 @@
         modperl_module_config_obj_cleanup_register(aTHX_ p, table, mrg);
     }
 
+#ifdef USE_ITHREADS
+    /* XXX: breaks prefork
+       modperl_interp_unselect(interp); */
+    MP_PERL_CONTEXT_RESTORE;
+#endif
+    
     return (void *)mrg;
 }
 

Modified: perl/modperl/branches/clone-skip-unstable/t/apache/content_length_header.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/apache/content_length_header.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/apache/content_length_header.t (original)
+++ perl/modperl/branches/clone-skip-unstable/t/apache/content_length_header.t Fri Jul  8 12:30:40 2005
@@ -5,7 +5,10 @@
 use Apache::TestUtil;
 use Apache::TestRequest;
 
-plan tests => 12 * 2 + 3;
+my $skip = skip_reason('investigating 2.1 C-L behaviors')
+    if have_min_apache_version(2.1);
+
+plan tests => 12 * 2 + 3, $skip;
 
 my $location = "/TestApache__content_length_header";
 

Modified: perl/modperl/branches/clone-skip-unstable/t/conf/extra.conf.in
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/conf/extra.conf.in?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/conf/extra.conf.in (original)
+++ perl/modperl/branches/clone-skip-unstable/t/conf/extra.conf.in Fri Jul  8 12:30:40 2005
@@ -26,9 +26,9 @@
 # Adjust PerlInterpMax and PerlInterpMaxSpare if the requirements change
 <IfDefine PERL_USEITHREADS>
     PerlInterpStart         1
-    PerlInterpMax           2
+    PerlInterpMax           30
     PerlInterpMinSpare      1
-    PerlInterpMaxSpare      2
+    PerlInterpMaxSpare      30
 </IfDefine>
 
 # make sure that we test under Taint and warnings mode enabled
@@ -39,7 +39,9 @@
 
 #for t/modules/include.t
 <Directory @ServerRoot@/htdocs/includes>
-    AddOutputFilter INCLUDES .shtml
+    <IfModule mod_mime.c>
+        AddOutputFilter INCLUDES .shtml
+    </IfModule>
     # #virtual include of a script that sets content type is
     # considered the same as #cmd by mod_include, 
     # therefore can't use IncludesNOEXEC here
@@ -51,7 +53,9 @@
     Options +ExecCGI +IncludesNoExec
     PerlResponseHandler ModPerl::Registry
     PerlOptions +ParseHeaders +GlobalRequest
-    AddOutputFilter INCLUDES .spl
+    <IfModule mod_mime.c>
+        AddOutputFilter INCLUDES .spl
+    </IfModule>
 </Directory>
 
 <IfModule mod_perl.c>

Modified: perl/modperl/branches/clone-skip-unstable/t/conf/extra.last.conf.in
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/conf/extra.last.conf.in?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/conf/extra.last.conf.in (original)
+++ perl/modperl/branches/clone-skip-unstable/t/conf/extra.last.conf.in Fri Jul  8 12:30:40 2005
@@ -4,13 +4,16 @@
 
 ### --------------------------------- ###
 <Perl >
-push @Alias, ['/perl_sections', '@DocumentRoot@'];
-$Location{'/perl_sections'} = {
-    'PerlInitHandler' => 'ModPerl::Test::add_config',
-    'AuthType' => 'Basic',
-    'AuthName' => 'PerlSection',
-    'PerlAuthenHandler' => 'TestHooks::authen_basic',
+use Apache::Test ();
+if (Apache::Test::have_module('mod_alias.c')) {
+    push @Alias, ['/perl_sections', '@DocumentRoot@'];
+    $Location{'/perl_sections'} = {
+        'PerlInitHandler' => 'ModPerl::Test::add_config',
+        'AuthType' => 'Basic',
+        'AuthName' => 'PerlSection',
+        'PerlAuthenHandler' => 'TestHooks::authen_basic',
     };
+}
 </Perl>
 
 <Perl >
@@ -47,14 +50,17 @@
 
 #Deprecated access to Apache2::ReadConfig:: still works
 <Perl >
-push @Apache2::ReadConfig::Alias, 
-    ['/perl_sections_readconfig', '@DocumentRoot@'];
-$Apache2::ReadConfig::Location{'/perl_sections_readconfig'} = {
-    'PerlInitHandler'   => 'ModPerl::Test::add_config',
-    'AuthType'          => 'Basic',
-    'AuthName'          => 'PerlSection',
-    'PerlAuthenHandler' => 'TestHooks::authen_basic',
+use Apache::Test ();
+if (Apache::Test::have_module('mod_alias.c')) {
+    push @Apache2::ReadConfig::Alias, 
+        ['/perl_sections_readconfig', '@DocumentRoot@'];
+    $Apache2::ReadConfig::Location{'/perl_sections_readconfig'} = {
+        'PerlInitHandler'   => 'ModPerl::Test::add_config',
+        'AuthType'          => 'Basic',
+        'AuthName'          => 'PerlSection',
+        'PerlAuthenHandler' => 'TestHooks::authen_basic',
     };
+}
 </Perl>
 
 ### --------------------------------- ###

Propchange: perl/modperl/branches/clone-skip-unstable/t/directive/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul  8 12:30:40 2005
@@ -1,5 +1,6 @@
 cmdparms.t
 env.t
 perlloadmodule.t
+perlloadmodule7.t
 pod.t
 perldo.t

Modified: perl/modperl/branches/clone-skip-unstable/t/directive/perl.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/directive/perl.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/directive/perl.t (original)
+++ perl/modperl/branches/clone-skip-unstable/t/directive/perl.t Fri Jul  8 12:30:40 2005
@@ -4,7 +4,7 @@
 use Apache::Test;
 use Apache::TestRequest;
 
-plan tests => 8, need need_auth, 'HTML::HeadParser';
+plan tests => 8, need need_auth, 'mod_alias.c', 'HTML::HeadParser';
 
 #so we don't have to require lwp
 my @auth = (Authorization => 'Basic ZG91Z206Zm9v'); #dougm:foo

Modified: perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_lc.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_lc.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_lc.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_lc.pm Fri Jul  8 12:30:40 2005
@@ -30,5 +30,6 @@
 <Location /top_dir>
   PerlOutputFilterHandler TestFilter::out_str_lc
 </Location>
-
-Alias /top_dir @top_dir@
+<IfModule mod_alias.c>
+    Alias /top_dir @top_dir@
+</IfModule>

Modified: perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_subreq_default.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_subreq_default.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_subreq_default.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/filter/TestFilter/out_str_subreq_default.pm Fri Jul  8 12:30:40 2005
@@ -72,7 +72,10 @@
 PerlResponseHandler     TestFilter::out_str_subreq_default::response
 PerlOutputFilterHandler TestFilter::out_str_subreq_default::include
 
-Alias /default_subrequest @DocumentRoot@/filter
+<IfModule mod_alias.c>
+    Alias /default_subrequest @DocumentRoot@/filter
+</IfModule>
+
 <Location /default_subrequest>
-  SetHandler default-handler
+    SetHandler default-handler
 </Location>

Modified: perl/modperl/branches/clone-skip-unstable/t/filter/out_str_lc.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/out_str_lc.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/filter/out_str_lc.t (original)
+++ perl/modperl/branches/clone-skip-unstable/t/filter/out_str_lc.t Fri Jul  8 12:30:40 2005
@@ -4,7 +4,7 @@
 use Apache::Test;
 use Apache::TestRequest;
 
-plan tests => 1;
+plan tests => 1, need 'mod_alias';
 
 my $location = "/top_dir/Makefile";
 

Modified: perl/modperl/branches/clone-skip-unstable/t/filter/out_str_subreq_default.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/filter/out_str_subreq_default.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/filter/out_str_subreq_default.t (original)
+++ perl/modperl/branches/clone-skip-unstable/t/filter/out_str_subreq_default.t Fri Jul  8 12:30:40 2005
@@ -6,7 +6,7 @@
 use Apache::TestUtil;
 use Apache::TestConfig ();
 
-plan tests => 1;
+plan tests => 1, need 'mod_alias';
 
 my $location = '/TestFilter__out_str_subreq_default';
 

Modified: perl/modperl/branches/clone-skip-unstable/t/lib/TestAPRlib/base64.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/lib/TestAPRlib/base64.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/lib/TestAPRlib/base64.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/lib/TestAPRlib/base64.pm Fri Jul  8 12:30:40 2005
@@ -20,7 +20,7 @@
     my $encoded = APR::Base64::encode($str);
 
     t_debug("encoded string: $encoded");
-    ok $encoded;
+    ok t_cmp($encoded, 'MTIzNDVxd2VydCFAIyQl', 'encode');
 
     ok t_cmp(APR::Base64::encode_len(length $str),
              length $encoded,

Modified: perl/modperl/branches/clone-skip-unstable/t/lib/TestAPRlib/finfo.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/lib/TestAPRlib/finfo.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/lib/TestAPRlib/finfo.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/lib/TestAPRlib/finfo.pm Fri Jul  8 12:30:40 2005
@@ -34,8 +34,17 @@
     # On Win32, touch the file to ensure it is in the same Daylight Saving
     # Time season as the current time to workaround a bug in Win32's stat()
     # which APR::Finfo allows for, otherwise the two disagree.
+    #
+    # With perl-5.8.0 on Win32, the syntax
+    #   utime undef, undef, $file;
+    # causes an uninitialized warning to be emitted,
+    # so use the equivalent
+    #   utime $now, $now, $file;
+    # instead.
+    #
     if (WIN32) {
-        utime undef, undef, $file;
+        my $now = time;
+        utime $now, $now, $file;
     }
 
     my $pool = APR::Pool->new();

Modified: perl/modperl/branches/clone-skip-unstable/t/modules/apache_status.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/modules/apache_status.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/modules/apache_status.t (original)
+++ perl/modperl/branches/clone-skip-unstable/t/modules/apache_status.t Fri Jul  8 12:30:40 2005
@@ -10,7 +10,7 @@
 my @opts = qw(script myconfig rgysubs section_config env isa_tree
               symdump inc inh_tree sig);
 
-plan tests => @opts + 3, need 'HTML::HeadParser',
+plan tests => @opts + 5, need 'HTML::HeadParser',
     { "CGI.pm (2.93 or higher) or Apache2::Request is needed" =>
           !!(eval { require CGI && $CGI::VERSION >= 2.93 } ||
              eval { require Apache2::Request })};
@@ -40,4 +40,14 @@
 for my $opt (@opts) {
     my $url = "$base_url?$opt";
     ok GET_BODY_ASSERT $url;
+}
+
+# B::Terse has an issue with XS, but Apache::Status shouldn't crash on
+# that
+{
+    # Syntax Tree Dump: syntax and execution order options
+    for (qw(slow exec)) {
+        my $url = "$base_url/$_/Apache2::Const::OK?noh_b_terse";
+        ok GET_OK $url;
+    }
 }

Modified: perl/modperl/branches/clone-skip-unstable/t/modules/include.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/modules/include.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/modules/include.t (original)
+++ perl/modperl/branches/clone-skip-unstable/t/modules/include.t Fri Jul  8 12:30:40 2005
@@ -13,8 +13,8 @@
     'footer',
 );
 
-plan tests => 2 + @patterns, need need_module('include'),
-                                  need_min_module_version(CGI => 3.08);
+plan tests => 2 + @patterns, need need_module('include', 'mod_mime'),
+    need_min_module_version(CGI => 3.08);
 
 my $location = "/includes/test.shtml";
 

Modified: perl/modperl/branches/clone-skip-unstable/t/modules/include2.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/modules/include2.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/modules/include2.t (original)
+++ perl/modperl/branches/clone-skip-unstable/t/modules/include2.t Fri Jul  8 12:30:40 2005
@@ -12,7 +12,7 @@
     'mod_perl', #SERVER_SOFTWARE
 );
 
-plan tests => 2 + @patterns, ['include', 'HTML::HeadParser'];
+plan tests => 2 + @patterns, ['include', 'mod_mime', 'HTML::HeadParser'];
 
 my $location = "/includes-registry/test.spl";
 

Modified: perl/modperl/branches/clone-skip-unstable/t/modules/reload.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/modules/reload.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/modules/reload.t (original)
+++ perl/modperl/branches/clone-skip-unstable/t/modules/reload.t Fri Jul  8 12:30:40 2005
@@ -8,7 +8,7 @@
 
 use TestCommon::SameInterp;
 
-plan tests => 3, need 'HTML::HeadParser';
+plan tests => 3, need 'HTML::HeadParser', 0;
 
 my $test_file = catfile Apache::Test::vars("serverroot"),
     qw(lib Apache2 Reload Test.pm);
@@ -16,7 +16,7 @@
 my $module   = 'TestModules::reload';
 my $location = '/' . Apache::TestRequest::module2path($module);
 
-my @tests = qw(simple const prototype);
+my @tests = qw(simple const prototype subpackage);
 
 my $header = join '', <DATA>;
 
@@ -47,8 +47,8 @@
     $skip++ unless defined $received;
     same_interp_skip_not_found(
         $skip,
-        $expected,
         $received,
+        $expected,
         "Initial"
     );
 }
@@ -63,8 +63,8 @@
     $skip++ unless defined $received;
     same_interp_skip_not_found(
         $skip,
-        $expected,
         $received,
+        $expected,
         "Reload"
     );
 }
@@ -76,8 +76,8 @@
     $skip++ unless defined $received;
     same_interp_skip_not_found(
         $skip,
-        $expected,
         $received,
+        $expected,
         "Unregister"
     );
 }
@@ -95,7 +95,9 @@
 
 use Apache2::Reload;
 
-our @methods = qw(simple const prototype);
+our @methods = qw(simple const prototype subpackage);
+
+sub subpackage { return Apache2::Reload::Test::SubPackage::subpackage() } 
 
 sub run {
     my $r = shift;

Modified: perl/modperl/branches/clone-skip-unstable/t/protocol/pseudo_http.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/protocol/pseudo_http.t?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/protocol/pseudo_http.t (original)
+++ perl/modperl/branches/clone-skip-unstable/t/protocol/pseudo_http.t Fri Jul  8 12:30:40 2005
@@ -21,6 +21,9 @@
 # blocking socket bug fixed in 2.0.52
 my $ok = $^O !~ /^(Open|Net)BSD$/i || need_min_apache_version('2.0.52');
 
+# but not in 2.1?  hmph.
+$ok = skip_reason('skipping on httpd 2.1') if have_min_apache_version('2.1');
+
 plan tests => 13, need need_auth, need_access, $ok;
 
 {

Modified: perl/modperl/branches/clone-skip-unstable/t/response/TestAPI/request_rec.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/response/TestAPI/request_rec.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/response/TestAPI/request_rec.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/response/TestAPI/request_rec.pm Fri Jul  8 12:30:40 2005
@@ -176,8 +176,21 @@
         my $def = [qw(fr)];       #default value
         my $l   = [qw(fr us cn)]; #new value
 
-        ok t_cmp $r->content_languages, $def, '$r->content_languages';
-        ok t_cmp $r->content_languages($l), $def, '$r->content_languages';
+        if (have_module('mod_mime')) {
+            ok t_cmp $r->content_languages, $def, '$r->content_languages';
+        }
+        else {
+            skip "Need mod_mime", 0;
+        }
+
+        my $old = $r->content_languages($l);
+        if (have_module('mod_mime')) {
+            ok t_cmp $old, $def, '$r->content_languages';
+        }
+        else {
+            skip "Need mod_mime", 0;
+        }
+
         ok t_cmp $r->content_languages, $l, '$r->content_languages';
 
         eval { $r->content_languages({}) };
@@ -238,5 +251,13 @@
 
 1;
 __END__
-PerlOptions +GlobalRequest
-DefaultLanguage fr
+<NoAutoConfig>
+<Location /TestAPI__request_rec>
+    PerlOptions +GlobalRequest
+    <IfModule mod_mime.c>
+        DefaultLanguage fr
+    </IfModule>
+    SetHandler modperl
+    PerlResponseHandler TestAPI::request_rec
+</Location>
+</NoAutoConfig>

Modified: perl/modperl/branches/clone-skip-unstable/t/response/TestAPI/slurp_filename.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/response/TestAPI/slurp_filename.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/response/TestAPI/slurp_filename.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/response/TestAPI/slurp_filename.pm Fri Jul  8 12:30:40 2005
@@ -22,7 +22,7 @@
 sub handler {
     my $r = shift;
 
-    plan $r, tests => 5;
+    plan $r, tests => 5, need 'mod_alias';
 
     {
         my $data = $r->slurp_filename(0); # untainted
@@ -69,7 +69,9 @@
 1;
 __END__
 <NoAutoConfig>
-    Alias /slurp/ @DocumentRoot@/api/
+    <IfModule mod_alias.c>
+        Alias /slurp/ @DocumentRoot@/api/
+    </IfModule>
     <Location /slurp/>
         SetHandler modperl
         PerlResponseHandler TestAPI::slurp_filename

Propchange: perl/modperl/branches/clone-skip-unstable/t/response/TestDirective/perlloadmodule7.pm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: perl/modperl/branches/clone-skip-unstable/t/response/TestModules/reload.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/t/response/TestModules/reload.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/t/response/TestModules/reload.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/t/response/TestModules/reload.pm Fri Jul  8 12:30:40 2005
@@ -9,12 +9,15 @@
 
 my $package = 'Apache2::Reload::Test';
 
+our $pass = 0;
+
 sub handler {
     my $r = shift;
-
+    $pass++;
     if ($r->args eq 'last') {
         Apache2::Reload->unregister_module($package);
         ModPerl::Util::unload_package($package);
+        $pass = 0;
         $r->print("unregistered OK");
         return Apache2::Const::OK;
     }
@@ -24,6 +27,18 @@
     Apache2::Reload::Test::run($r);
 
     return Apache2::Const::OK;
+}
+
+#This one shouldn't be touched
+package Apache2::Reload::Test::SubPackage;
+
+sub subpackage { 
+    if ($TestModules::reload::pass == '2') {
+        return 'subpackage';
+    }
+    else {
+        return 'SUBPACKAGE';
+    }
 }
 
 1;

Modified: perl/modperl/branches/clone-skip-unstable/xs/APR/Base64/APR__Base64.h
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/xs/APR/Base64/APR__Base64.h?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/xs/APR/Base64/APR__Base64.h (original)
+++ perl/modperl/branches/clone-skip-unstable/xs/APR/Base64/APR__Base64.h Fri Jul  8 12:30:40 2005
@@ -13,14 +13,18 @@
  * limitations under the License.
  */
 
+/* apr_base64_encode_len and apr_base64_encode_binary give length that
+ * includes the terminating '\0' */
+#define mpxs_APR__Base64_encode_len(len) apr_base64_encode_len(len) - 1;
+    
 static MP_INLINE void mpxs_apr_base64_encode(pTHX_ SV *sv, SV *arg)
 {
     STRLEN len;
     int encoded_len;
     char *data = SvPV(arg, len);
-    mpxs_sv_grow(sv, apr_base64_encode_len(len));
+    mpxs_sv_grow(sv, apr_base64_encode_len(len) - 1);
     encoded_len = apr_base64_encode_binary(SvPVX(sv), data, len);
-    mpxs_sv_cur_set(sv, encoded_len);
+    mpxs_sv_cur_set(sv, encoded_len - 1);
 }
 
 static MP_INLINE void mpxs_apr_base64_decode(pTHX_ SV *sv, SV *arg)

Modified: perl/modperl/branches/clone-skip-unstable/xs/APR/Bucket/APR__Bucket.h
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/xs/APR/Bucket/APR__Bucket.h?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/xs/APR/Bucket/APR__Bucket.h (original)
+++ perl/modperl/branches/clone-skip-unstable/xs/APR/Bucket/APR__Bucket.h Fri Jul  8 12:30:40 2005
@@ -103,7 +103,7 @@
 static MP_INLINE
 apr_status_t mpxs_APR__Bucket_setaside(pTHX_ SV *b_sv, SV *p_sv)
 {
-    apr_pool_t *p   = mp_xs_sv2_APR__Pool(p_sv);
+    apr_pool_t *p = mp_xs_sv2_APR__Pool(p_sv);
     apr_bucket *b = mp_xs_sv2_APR__Bucket(b_sv);
     apr_status_t rc = apr_bucket_setaside(b, p);
 

Modified: perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/Util_pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/Util_pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/Util_pm (original)
+++ perl/modperl/branches/clone-skip-unstable/xs/ModPerl/Util/Util_pm Fri Jul  8 12:30:40 2005
@@ -16,6 +16,9 @@
     # alias but the original function as well
 
     for (keys %$tab) {
+        #Skip sub stashes
+        next if /::$/;
+
         my $fullname = join '::', $package, $_;
         # code/hash/array/scalar might be imported make sure the gv
         # does not point elsewhere before undefing each

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=209869&r1=209868&r2=209869&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 Fri Jul  8 12:30:40 2005
@@ -579,7 +579,7 @@
 MODULE=APR::Base64
  apr_base64_decode | MPXS_ | coded_src
  apr_base64_encode | MPXS_ | plain_src
- apr_base64_encode_len
+ int:DEFINE_encode_len | | int:len
 -apr_base64_decode_len
 -apr_base64_encode_binary
 -apr_base64_decode_binary

Modified: perl/modperl/branches/clone-skip-unstable/xs/tables/current/Apache2/ConstantsTable.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/xs/tables/current/Apache2/ConstantsTable.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/xs/tables/current/Apache2/ConstantsTable.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/xs/tables/current/Apache2/ConstantsTable.pm Fri Jul  8 12:30:40 2005
@@ -1,8 +1,8 @@
 package Apache2::ConstantsTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# ! WARNING: generated by Apache::ParseSource/0.02
-# !          Fri Dec 10 13:39:12 2004
+# ! WARNING: generated by Apache2::ParseSource/0.02
+# !          Mon May 23 14:15:32 2005
 # !          do NOT edit, any changes will be lost !
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -42,6 +42,7 @@
       'OR_UNSET',
       'ACCESS_CONF',
       'RSRC_CONF',
+      'EXEC_ON_READ',
       'OR_ALL'
     ],
     'options' => [

Modified: perl/modperl/branches/clone-skip-unstable/xs/tables/current/Apache2/FunctionTable.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/clone-skip-unstable/xs/tables/current/Apache2/FunctionTable.pm?rev=209869&r1=209868&r2=209869&view=diff
==============================================================================
--- perl/modperl/branches/clone-skip-unstable/xs/tables/current/Apache2/FunctionTable.pm (original)
+++ perl/modperl/branches/clone-skip-unstable/xs/tables/current/Apache2/FunctionTable.pm Fri Jul  8 12:30:40 2005
@@ -1,8 +1,8 @@
 package Apache2::FunctionTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# ! WARNING: generated by Apache::ParseSource/0.02
-# !          Fri Dec 10 14:14:09 2004
+# ! WARNING: generated by Apache2::ParseSource/0.02
+# !          Mon May 23 14:15:40 2005
 # !          do NOT edit, any changes will be lost !
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -4326,6 +4326,16 @@
   },
   {
     'return_type' => 'void',
+    'name' => 'ap_register_extra_mpm_process',
+    'args' => [
+      {
+        'type' => 'pid_t',
+        'name' => 'pid'
+      }
+    ]
+  },
+  {
+    'return_type' => 'void',
     'name' => 'ap_register_hooks',
     'args' => [
       {
@@ -5904,12 +5914,8 @@
     'name' => 'ap_time_process_request',
     'args' => [
       {
-        'type' => 'int',
-        'name' => 'child_num'
-      },
-      {
-        'type' => 'int',
-        'name' => 'thread_num'
+        'type' => 'ap_sb_handle_t *',
+        'name' => 'sbh'
       },
       {
         'type' => 'int',
@@ -5944,6 +5950,16 @@
       {
         'type' => 'char *',
         'name' => 'url'
+      }
+    ]
+  },
+  {
+    'return_type' => 'int',
+    'name' => 'ap_unregister_extra_mpm_process',
+    'args' => [
+      {
+        'type' => 'pid_t',
+        'name' => 'pid'
       }
     ]
   },

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=209869&r1=209868&r2=209869&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 Fri Jul  8 12:30:40 2005
@@ -2,7 +2,7 @@
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # ! WARNING: generated by ModPerl::ParseSource/0.01
-# !          Thu Jan  6 11:25:08 2005
+# !          Mon May 23 14:15:47 2005
 # !          do NOT edit, any changes will be lost !
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -7207,6 +7207,24 @@
     ]
   },
   {
+    'return_type' => 'request_rec *',
+    'name' => 'mpxs_Apache2__RequestUtil_request',
+    'args' => [
+      {
+        'type' => 'PerlInterpreter *',
+        'name' => 'my_perl'
+      },
+      {
+        'type' => 'SV *',
+        'name' => 'classname'
+      },
+      {
+        'type' => 'SV *',
+        'name' => 'svr'
+      }
+    ]
+  },
+  {
     'return_type' => 'void',
     'name' => 'mpxs_Apache2__ServerRec_add_config',
     'args' => [
@@ -7332,24 +7350,6 @@
       {
         'type' => 'SV *',
         'name' => 'arg'
-      }
-    ]
-  },
-  {
-    'return_type' => 'request_rec *',
-    'name' => 'mpxs_Apache2__RequestUtil_request',
-    'args' => [
-      {
-        'type' => 'PerlInterpreter *',
-        'name' => 'my_perl'
-      },
-      {
-        'type' => 'SV *',
-        'name' => 'classname'
-      },
-      {
-        'type' => 'SV *',
-        'name' => 'svr'
       }
     ]
   },



Mime
View raw message