CGI.pm 3.10 fixes mod_perl problems (#158036)
This commit is contained in:
Warren Togami
parent
011ee7c783
commit
db893775ce
142
perl-5.8.6-CGI-3.1.0.patch
Normal file
142
perl-5.8.6-CGI-3.1.0.patch
Normal file
@ -0,0 +1,142 @@
|
||||
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158036
|
||||
|
||||
diff -ruN perl-5.8.6-cgi308/lib/CGI/t/form.t perl-5.8.6-cgi310/lib/CGI/t/form.t
|
||||
--- perl-5.8.6-cgi308/lib/CGI/t/form.t 2005-05-15 01:20:29.910116896 +0100
|
||||
+++ perl-5.8.6-cgi310/lib/CGI/t/form.t 2005-05-05 21:14:56.000000000 +0100
|
||||
@@ -33,43 +33,43 @@
|
||||
"start_form()");
|
||||
|
||||
is(submit(),
|
||||
- qq(<input type="submit" tabindex="0" name=".submit" />),
|
||||
+ qq(<input type="submit" tabindex="1" name=".submit" />),
|
||||
"submit()");
|
||||
|
||||
is(submit(-name => 'foo',
|
||||
-value => 'bar'),
|
||||
- qq(<input type="submit" tabindex="1" name="foo" value="bar" />),
|
||||
+ qq(<input type="submit" tabindex="2" name="foo" value="bar" />),
|
||||
"submit(-name,-value)");
|
||||
|
||||
is(submit({-name => 'foo',
|
||||
-value => 'bar'}),
|
||||
- qq(<input type="submit" tabindex="2" name="foo" value="bar" />),
|
||||
+ qq(<input type="submit" tabindex="3" name="foo" value="bar" />),
|
||||
"submit({-name,-value})");
|
||||
|
||||
is(textfield(-name => 'weather'),
|
||||
- qq(<input type="text" name="weather" tabindex="3" value="dull" />),
|
||||
+ qq(<input type="text" name="weather" tabindex="4" value="dull" />),
|
||||
"textfield({-name})");
|
||||
|
||||
is(textfield(-name => 'weather',
|
||||
-value => 'nice'),
|
||||
- qq(<input type="text" name="weather" tabindex="4" value="dull" />),
|
||||
+ qq(<input type="text" name="weather" tabindex="5" value="dull" />),
|
||||
"textfield({-name,-value})");
|
||||
|
||||
is(textfield(-name => 'weather',
|
||||
-value => 'nice',
|
||||
-override => 1),
|
||||
- qq(<input type="text" name="weather" tabindex="5" value="nice" />),
|
||||
+ qq(<input type="text" name="weather" tabindex="6" value="nice" />),
|
||||
"textfield({-name,-value,-override})");
|
||||
|
||||
is(checkbox(-name => 'weather',
|
||||
-value => 'nice'),
|
||||
- qq(<label><input type="checkbox" name="weather" value="nice" tabindex="6" />weather</label>),
|
||||
+ qq(<label><input type="checkbox" name="weather" value="nice" tabindex="7" />weather</label>),
|
||||
"checkbox()");
|
||||
|
||||
is(checkbox(-name => 'weather',
|
||||
-value => 'nice',
|
||||
-label => 'forecast'),
|
||||
- qq(<label><input type="checkbox" name="weather" value="nice" tabindex="7" />forecast</label>),
|
||||
+ qq(<label><input type="checkbox" name="weather" value="nice" tabindex="8" />forecast</label>),
|
||||
"checkbox()");
|
||||
|
||||
is(checkbox(-name => 'weather',
|
||||
@@ -77,41 +77,41 @@
|
||||
-label => 'forecast',
|
||||
-checked => 1,
|
||||
-override => 1),
|
||||
- qq(<label><input type="checkbox" name="weather" value="nice" tabindex="8" checked="checked" />forecast</label>),
|
||||
+ qq(<label><input type="checkbox" name="weather" value="nice" tabindex="9" checked="checked" />forecast</label>),
|
||||
"checkbox()");
|
||||
|
||||
is(checkbox(-name => 'weather',
|
||||
-value => 'dull',
|
||||
-label => 'forecast'),
|
||||
- qq(<label><input type="checkbox" name="weather" value="dull" tabindex="9" checked="checked" />forecast</label>),
|
||||
+ qq(<label><input type="checkbox" name="weather" value="dull" tabindex="10" checked="checked" />forecast</label>),
|
||||
"checkbox()");
|
||||
|
||||
is(radio_group(-name => 'game'),
|
||||
- qq(<label><input type="radio" name="game" value="chess" checked="checked" tabindex="10" />chess</label> <label><input type="radio" name="game" value="checkers" tabindex="11" />checkers</label>),
|
||||
+ qq(<label><input type="radio" name="game" value="chess" checked="checked" tabindex="11" />chess</label> <label><input type="radio" name="game" value="checkers" tabindex="12" />checkers</label>),
|
||||
'radio_group()');
|
||||
|
||||
is(radio_group(-name => 'game',
|
||||
-labels => {'chess' => 'ping pong'}),
|
||||
- qq(<label><input type="radio" name="game" value="chess" checked="checked" tabindex="12" />ping pong</label> <label><input type="radio" name="game" value="checkers" tabindex="13" />checkers</label>),
|
||||
+ qq(<label><input type="radio" name="game" value="chess" checked="checked" tabindex="13" />ping pong</label> <label><input type="radio" name="game" value="checkers" tabindex="14" />checkers</label>),
|
||||
'radio_group()');
|
||||
|
||||
is(checkbox_group(-name => 'game',
|
||||
-Values => [qw/checkers chess cribbage/]),
|
||||
- qq(<label><input type="checkbox" name="game" value="checkers" checked="checked" tabindex="14" />checkers</label> <label><input type="checkbox" name="game" value="chess" checked="checked" tabindex="15" />chess</label> <label><input type="checkbox" name="game" value="cribbage" tabindex="16" />cribbage</label>),
|
||||
+ qq(<label><input type="checkbox" name="game" value="checkers" checked="checked" tabindex="15" />checkers</label> <label><input type="checkbox" name="game" value="chess" checked="checked" tabindex="16" />chess</label> <label><input type="checkbox" name="game" value="cribbage" tabindex="17" />cribbage</label>),
|
||||
'checkbox_group()');
|
||||
|
||||
is(checkbox_group(-name => 'game',
|
||||
'-values' => [qw/checkers chess cribbage/],
|
||||
'-defaults' => ['cribbage'],
|
||||
-override=>1),
|
||||
- qq(<label><input type="checkbox" name="game" value="checkers" tabindex="17" />checkers</label> <label><input type="checkbox" name="game" value="chess" tabindex="18" />chess</label> <label><input type="checkbox" name="game" value="cribbage" checked="checked" tabindex="19" />cribbage</label>),
|
||||
+ qq(<label><input type="checkbox" name="game" value="checkers" tabindex="18" />checkers</label> <label><input type="checkbox" name="game" value="chess" tabindex="19" />chess</label> <label><input type="checkbox" name="game" value="cribbage" checked="checked" tabindex="20" />cribbage</label>),
|
||||
'checkbox_group()');
|
||||
|
||||
is(popup_menu(-name => 'game',
|
||||
'-values' => [qw/checkers chess cribbage/],
|
||||
-default => 'cribbage',
|
||||
-override => 1),
|
||||
- '<select name="game" tabindex="20">
|
||||
+ '<select name="game" tabindex="21">
|
||||
<option value="checkers">checkers</option>
|
||||
<option value="chess">chess</option>
|
||||
<option selected="selected" value="cribbage">cribbage</option>
|
||||
diff -ruN perl-5.8.6-cgi308/lib/CGI.pm perl-5.8.6-cgi310/lib/CGI.pm
|
||||
--- perl-5.8.6-cgi308/lib/CGI.pm 2005-05-15 01:20:29.955110056 +0100
|
||||
+++ perl-5.8.6-cgi310/lib/CGI.pm 2005-05-13 22:46:21.000000000 +0100
|
||||
@@ -18,8 +18,8 @@
|
||||
# The most recent version and complete docs are available at:
|
||||
# http://stein.cshl.org/WWW/software/CGI/
|
||||
|
||||
-$CGI::revision = '$Id: CGI.pm,v 1.179 2005/04/07 22:40:37 lstein Exp $';
|
||||
-$CGI::VERSION=3.08;
|
||||
+$CGI::revision = '$Id: CGI.pm,v 1.181 2005/05/13 21:45:26 lstein Exp $';
|
||||
+$CGI::VERSION='3.10';
|
||||
|
||||
# HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
|
||||
# UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
|
||||
@@ -179,11 +179,12 @@
|
||||
if (exists $ENV{MOD_PERL}) {
|
||||
# mod_perl handlers may run system() on scripts using CGI.pm;
|
||||
# Make sure so we don't get fooled by inherited $ENV{MOD_PERL}
|
||||
- if ($ENV{MOD_PERL_API_VERSION} == 2) {
|
||||
+ if (exists $ENV{MOD_PERL_API_VERSION} && $ENV{MOD_PERL_API_VERSION} == 2) {
|
||||
$MOD_PERL = 2;
|
||||
require Apache2::Response;
|
||||
require Apache2::RequestRec;
|
||||
require Apache2::RequestUtil;
|
||||
+ require Apache2::RequestIO;
|
||||
require APR::Pool;
|
||||
} else {
|
||||
$MOD_PERL = 1;
|
||||
@@ -888,6 +889,7 @@
|
||||
|
||||
sub element_tab {
|
||||
my ($self,$new_value) = self_or_default(@_);
|
||||
+ $self->{'.etab'} ||= 1;
|
||||
$self->{'.etab'} = $new_value if defined $new_value;
|
||||
$self->{'.etab'}++;
|
||||
}
|
||||
@ -5,7 +5,7 @@
|
||||
%define multilib_64_archs x86_64 s390x ppc64 sparc64
|
||||
|
||||
%define perlver 5.8.6
|
||||
%define perlrel 13
|
||||
%define perlrel 14
|
||||
%define perlepoch 3
|
||||
|
||||
Provides: perl(:WITH_PERLIO)
|
||||
@ -105,6 +105,9 @@ Patch27: perl-5.8.5-CAN-2005-0155+0156.patch
|
||||
# bugzilla 118877, 127023
|
||||
Patch28: perl-5.8.6-findbin-selinux.patch
|
||||
|
||||
# CGI.pm 3.10 fixes mod_perl
|
||||
Patch29: perl-5.8.6-CGI-3.1.0.patch
|
||||
|
||||
# arch-specific patches
|
||||
Patch100: perl-5.8.1-fpic.patch
|
||||
Patch101: perl-5.8.0-libdir64.patch
|
||||
@ -222,6 +225,7 @@ more secure running of setuid perl scripts.
|
||||
%patch26 -p1
|
||||
%patch27 -p0
|
||||
%patch28 -p1
|
||||
%patch29 -p1
|
||||
|
||||
%patch100 -p1
|
||||
|
||||
@ -421,6 +425,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue May 17 2005 Warren Togami <wtogami@redhat.com> - 3:5.8.6-14
|
||||
- CGI.pm 3.10 fixes mod_perl problems (#158036)
|
||||
|
||||
* Sun May 15 2005 Warren Togami <wtogami@redhat.com> - 3:5.8.6-13
|
||||
- Better patch for FindBin.pm (#127023#c37)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user