more syncing and work in progress

git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable@209869 13f79535-47bb-0310-9956-ffa450edef68
apache · Jul 8, 2005 · ff7c9d0 · ff7c9d0
1 parent e82e66e
commit ff7c9d0
Show file tree

Hide file tree

Showing 63 changed files with 689 additions and 185 deletions.
diff --git a/BRANCHING b/BRANCHING
@@ -0,0 +1,47 @@
+This doc explains how to create/work/re-merge svn branches
+
+#######################################
+### make a new branch               ###
+#######################################
+
+we will create a branch clone-skip-unstable
+
+tag before the branch:
+
+  svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk \
+    https://svn.apache.org/repos/asf/perl/modperl/tags/pre-clone-skip \
+    -m "tag before branching for CLONE_SKIP support"
+
+branch:
+
+  svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk \
+    https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable \
+    -m "branching to provide CLONE_SKIP support"
+
+check out:
+
+  svn co https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable mp2-clone-skip-unstable
+
+change externals to point to the new A-T branch (if one was done)
+
+  svn propedit svn:externals .
+
+#######################################
+### sync the branch with the trunk  ###
+#######################################
+
+the branch was created @r165203
+
+  svn co https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable \
+         mp2-clone-skip-unstable
+  cd mp2-clone-skip-unstable
+  svn propset merge-point 165203 .
+  build/svn.remerge
+
+now resolve any conflicts and commit the changes
+
+
+#######################################
+### merge the branch into the trunk ###
+#######################################
+
diff --git a/Changes b/Changes
@@ -10,7 +10,73 @@ Also refer to the Apache::Test changes log file, at Apache-Test/Changes
 
 =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]

diff --git a/Makefile.PL b/Makefile.PL
@@ -49,6 +49,8 @@ our $VERSION;
 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,15 +253,17 @@ EOI
         }
         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) {
                 $build->dir($ans);
                 $ok++;
             }
             else {
-                error "Can't find dir '$ans'";            }
+                error "Can't find dir '$ans'";
+                last if UNATTENDED;
+            }
         }
     }
 
@@ -344,7 +348,7 @@ EOI
     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 @@ sub MY::postamble {
     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
 

diff --git a/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm b/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
@@ -645,7 +645,7 @@ sub get_mark_line {
 #########################################################################
 
 sub strip_end_data_segment {
-    ${ +shift->{CODE} } =~ s/__(END|DATA)__(.*)//s;
+    ${ +shift->{CODE} } =~ s/^__(END|DATA)__(.*)//ms;
 }
 
 

diff --git a/ModPerl-Registry/t/206.t b/ModPerl-Registry/t/206.t
@@ -5,7 +5,7 @@ use Apache::Test;
 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);

diff --git a/ModPerl-Registry/t/304.t b/ModPerl-Registry/t/304.t
@@ -5,7 +5,7 @@ use Apache::Test;
 use Apache::TestUtil;
 use Apache::TestRequest qw(GET);
 
-plan tests => 10;
+plan tests => 10, need 'mod_alias.c';
 
 my $url = "/registry/304.pl";
 

diff --git a/ModPerl-Registry/t/404.t b/ModPerl-Registry/t/404.t
@@ -5,7 +5,7 @@ use Apache::Test;
 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();

diff --git a/ModPerl-Registry/t/500.t b/ModPerl-Registry/t/500.t
@@ -5,7 +5,7 @@ use Apache::Test;
 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,

diff --git a/ModPerl-Registry/t/bad_scripts.t b/ModPerl-Registry/t/bad_scripts.t
@@ -5,7 +5,7 @@ use Apache::Test;
 use Apache::TestUtil;
 use Apache::TestRequest qw(GET);
 
-plan tests => 1;
+plan tests => 1, need 'mod_alias.c';
 
 {
     t_client_log_error_is_expected();

diff --git a/ModPerl-Registry/t/basic.t b/ModPerl-Registry/t/basic.t
@@ -14,7 +14,7 @@ my %modules = (
 
 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';

diff --git a/ModPerl-Registry/t/bin_resp.t b/ModPerl-Registry/t/bin_resp.t
@@ -7,7 +7,7 @@ use Apache::Test;
 use Apache::TestUtil;
 use Apache::TestRequest;
 
-plan tests => 2;
+plan tests => 2, need 'mod_alias.c';
 
 # 2 sub-tests
 {

diff --git a/ModPerl-Registry/t/cgi-bin/basic.pl b/ModPerl-Registry/t/cgi-bin/basic.pl
@@ -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
diff --git a/ModPerl-Registry/t/cgi.t b/ModPerl-Registry/t/cgi.t
@@ -5,7 +5,7 @@ use Apache::Test;
 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;

diff --git a/ModPerl-Registry/t/closure.t b/ModPerl-Registry/t/closure.t
@@ -17,7 +17,7 @@ use File::Spec::Functions;
 
 my @modules = qw(registry registry_bb perlrun);
 
-plan tests => 6;
+plan tests => 6, need 'mod_alias.c';
 
 my $cfg = Apache::Test::config();
 

diff --git a/ModPerl-Registry/t/conf/extra.conf.in b/ModPerl-Registry/t/conf/extra.conf.in
@@ -35,16 +35,18 @@ PerlModule ModPerl::Util
 #############################
 ### 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/
-
-ScriptAlias /cgi-bin/ @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/
+</IfModule>
 
 PerlModule ModPerl::RegistryBB
 <Location /registry_bb>
@@ -112,11 +114,12 @@ PerlModule ModPerl::PerlRun
 #######################################
 ### 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 @@ PerlModule Apache::TestHandler
 </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 @@ Alias /error_document/ @ServerRoot@/cgi-bin/
 </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 @@ PerlModule ModPerl::RegistryBB
 # 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>
 
 
diff --git a/ModPerl-Registry/t/flush.t b/ModPerl-Registry/t/flush.t
@@ -5,7 +5,7 @@ use Apache::Test;
 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:

diff --git a/ModPerl-Registry/t/ithreads.t b/ModPerl-Registry/t/ithreads.t
@@ -9,7 +9,7 @@ use Config;
 
 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