This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2006-12-07 07:37:37 UTC Jakub Bogusz <qboosh@pld-linux.org> '- updated to 2.0.3 release'
Cherrypick from master 2007-03-23 13:03:59 UTC radek <radek@pld-linux.org> '- fix path_info related security issue':
    apache-mod_perl-path_info_secfix.patch -> 1.1
Delete:
    apache-perl-rh.patch

diff --git a/apache-mod_perl-path_info_secfix.patch b/apache-mod_perl-path_info_secfix.patch
new file mode 100644 (file)
index 0000000..fc64dd6
--- /dev/null
+++ b/apache-mod_perl-path_info_secfix.patch
@@ -0,0 +1,11 @@
+--- ModPerl-Registry/lib/ModPerl/RegistryCooker.pm~    2006-11-20 00:31:41.000000000 +0100
++++ ModPerl-Registry/lib/ModPerl/RegistryCooker.pm     2007-03-23 14:01:52.606187672 +0100
+@@ -337,7 +337,7 @@
+     my $self = shift;
+ 
+     my $path_info = $self->{REQ}->path_info;
+-    my $script_name = $path_info && $self->{URI} =~ /$path_info$/
++    my $script_name = $path_info && $self->{URI} =~ /\Q$path_info\E$/
+         ? substr($self->{URI}, 0, length($self->{URI}) - length($path_info))
+         : $self->{URI};
+ 

diff --git a/apache-perl-rh.patch b/apache-perl-rh.patch
deleted file mode 100644 (file)
index 5fdbf59..0000000
--- a/apache-perl-rh.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- mod_perl-1.16/Makefile.PL.rh       Fri Oct  2 18:50:15 1998
-+++ mod_perl-1.16/Makefile.PL  Mon Dec 21 11:51:46 1998
-@@ -244,6 +244,7 @@
- $callback_alias{PERL_CLEANUP} = "PERL_LOG";
- %callback_hooks = map { $_,0 } @callback_hooks;
- $callback_hooks{PERL_HANDLER} = 1; #PerlHandler always on
-+$callback_hooks{PERL_STACKED_HANDLERS} = 0; #Off for DSO
- %cant_hook = ();
- 
- my @mm_args;
-@@ -317,11 +318,11 @@
- *          We recommend linking mod_perl static instead         *
- EOF
-     print "*" x 65, $/;
--    my $ans = prompt("Continue?", "n");
--    if($ans =~ /^n$/i) {
--        print "Aborting build process\n";
--        exit;
--    }
-+#    my $ans = prompt("Continue?", "n");
-+#    if($ans =~ /^n$/i) {
-+#        print "Aborting build process\n";
-+#        exit;
-+#    }
- }
- 
- if($USE_APXS) {
-@@ -356,7 +357,7 @@
- }
- 
- if($EVERYTHING) {
--    @callback_hooks{qw(PERL_STACKED_HANDLERS PERL_METHOD_HANDLERS)} = (1) x 2;
-+    @callback_hooks{qw(PERL_METHOD_HANDLERS)} = (1) x 2;
-     for(qw(ALL_HOOKS PERL_SSI PERL_SECTIONS PERL_DIRECTIVE_HANDLERS 
-          PERL_LOG_API PERL_URI_API PERL_UTIL_API PERL_TABLE_API PERL_FILE_API)) {
-        $$_ = 1;