- 455933 update to CGI-3.38
This commit is contained in:
parent
8fee4ecba2
commit
1443e2aaf1
|
@ -1,6 +1,6 @@
|
||||||
diff -up perl-5.10.0/lib/CGI/Apache.pm.eee perl-5.10.0/lib/CGI/Apache.pm
|
diff -up perl-5.10.0/lib/CGI/Apache.pm.olde perl-5.10.0/lib/CGI/Apache.pm
|
||||||
diff -up perl-5.10.0/lib/CGI/Carp.pm.eee perl-5.10.0/lib/CGI/Carp.pm
|
diff -up perl-5.10.0/lib/CGI/Carp.pm.olde perl-5.10.0/lib/CGI/Carp.pm
|
||||||
--- perl-5.10.0/lib/CGI/Carp.pm.eee 2007-12-18 11:47:07.000000000 +0100
|
--- perl-5.10.0/lib/CGI/Carp.pm.olde 2007-12-18 11:47:07.000000000 +0100
|
||||||
+++ perl-5.10.0/lib/CGI/Carp.pm 2008-03-27 15:23:36.000000000 +0100
|
+++ perl-5.10.0/lib/CGI/Carp.pm 2008-03-27 15:23:36.000000000 +0100
|
||||||
@@ -323,7 +323,7 @@ use File::Spec;
|
@@ -323,7 +323,7 @@ use File::Spec;
|
||||||
|
|
||||||
|
@ -19,10 +19,21 @@ diff -up perl-5.10.0/lib/CGI/Carp.pm.eee perl-5.10.0/lib/CGI/Carp.pm
|
||||||
print STDOUT "Content-type: text/html\n\n";
|
print STDOUT "Content-type: text/html\n\n";
|
||||||
print STDOUT $mess;
|
print STDOUT $mess;
|
||||||
}
|
}
|
||||||
diff -up perl-5.10.0/lib/CGI/Changes.eee perl-5.10.0/lib/CGI/Changes
|
diff -up perl-5.10.0/lib/CGI/Changes.olde perl-5.10.0/lib/CGI/Changes
|
||||||
--- perl-5.10.0/lib/CGI/Changes.eee 2007-12-18 11:47:07.000000000 +0100
|
--- perl-5.10.0/lib/CGI/Changes.olde 2007-12-18 11:47:07.000000000 +0100
|
||||||
+++ perl-5.10.0/lib/CGI/Changes 2008-04-23 15:08:05.000000000 +0200
|
+++ perl-5.10.0/lib/CGI/Changes 2008-06-25 16:51:35.000000000 +0200
|
||||||
@@ -1,3 +1,35 @@
|
@@ -1,3 +1,46 @@
|
||||||
|
+ Version 3.38
|
||||||
|
+ 1. Fix annoying warning in http://rt.cpan.org/Ticket/Display.html?id=34551
|
||||||
|
+ 2. Added nobr() function http://rt.cpan.org/Ticket/Display.html?id=35377
|
||||||
|
+ 3. popup_menu() allows multiple items to be selected by default, satisfying
|
||||||
|
+ http://rt.cpan.org/Ticket/Display.html?id=35376
|
||||||
|
+ 4. Patch from Renee Backer to avoid doubled <http-equiv> headers.
|
||||||
|
+ 5. Fixed documentation bug that describes what happens when a
|
||||||
|
+ parameter is empty (e.g. "?test1=").
|
||||||
|
+ 6. Fixed minor warning described at http://rt.cpan.org/Public/Bug/Display.html?id=36435
|
||||||
|
+ 7. Fixed overlap of attribute and parameter space described in http://rt.perl.org/rt3//Ticket/Display.html?id=24294
|
||||||
|
+
|
||||||
+ Version 3.37
|
+ Version 3.37
|
||||||
+ 1. Fix pragmas so that they persist over modperl invocations (e.g. RT 34761)
|
+ 1. Fix pragmas so that they persist over modperl invocations (e.g. RT 34761)
|
||||||
+ 2. Fixed handling of chunked multipart uploads; thanks to Michael Bernhardt
|
+ 2. Fixed handling of chunked multipart uploads; thanks to Michael Bernhardt
|
||||||
|
@ -58,8 +69,8 @@ diff -up perl-5.10.0/lib/CGI/Changes.eee perl-5.10.0/lib/CGI/Changes
|
||||||
Version 3.29
|
Version 3.29
|
||||||
1. The position of file handles is now reset to zero when CGI->new is called.
|
1. The position of file handles is now reset to zero when CGI->new is called.
|
||||||
(Mark Stosberg)
|
(Mark Stosberg)
|
||||||
diff -up perl-5.10.0/lib/CGI/Cookie.pm.eee perl-5.10.0/lib/CGI/Cookie.pm
|
diff -up perl-5.10.0/lib/CGI/Cookie.pm.olde perl-5.10.0/lib/CGI/Cookie.pm
|
||||||
--- perl-5.10.0/lib/CGI/Cookie.pm.eee 2007-12-18 11:47:07.000000000 +0100
|
--- perl-5.10.0/lib/CGI/Cookie.pm.olde 2007-12-18 11:47:07.000000000 +0100
|
||||||
+++ perl-5.10.0/lib/CGI/Cookie.pm 2008-03-28 18:15:51.000000000 +0100
|
+++ perl-5.10.0/lib/CGI/Cookie.pm 2008-03-28 18:15:51.000000000 +0100
|
||||||
@@ -13,7 +13,7 @@ package CGI::Cookie;
|
@@ -13,7 +13,7 @@ package CGI::Cookie;
|
||||||
# wish, but if you redistribute a modified version, please attach a note
|
# wish, but if you redistribute a modified version, please attach a note
|
||||||
|
@ -88,8 +99,30 @@ diff -up perl-5.10.0/lib/CGI/Cookie.pm.eee perl-5.10.0/lib/CGI/Cookie.pm
|
||||||
foreach (@pairs) {
|
foreach (@pairs) {
|
||||||
s/\s*(.*?)\s*/$1/;
|
s/\s*(.*?)\s*/$1/;
|
||||||
my($key,$value) = split("=",$_,2);
|
my($key,$value) = split("=",$_,2);
|
||||||
diff -up perl-5.10.0/lib/CGI/Fast.pm.eee perl-5.10.0/lib/CGI/Fast.pm
|
diff -up perl-5.10.0/lib/CGI/eg/caution.xbm.olde perl-5.10.0/lib/CGI/eg/caution.xbm
|
||||||
--- perl-5.10.0/lib/CGI/Fast.pm.eee 2007-12-18 11:47:07.000000000 +0100
|
diff -up perl-5.10.0/lib/CGI/eg/clickable_image.cgi.olde perl-5.10.0/lib/CGI/eg/clickable_image.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/cookie.cgi.olde perl-5.10.0/lib/CGI/eg/cookie.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/crash.cgi.olde perl-5.10.0/lib/CGI/eg/crash.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/customize.cgi.olde perl-5.10.0/lib/CGI/eg/customize.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/diff_upload.cgi.olde perl-5.10.0/lib/CGI/eg/diff_upload.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/dna_small_gif.uu.olde perl-5.10.0/lib/CGI/eg/dna_small_gif.uu
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/file_upload.cgi.olde perl-5.10.0/lib/CGI/eg/file_upload.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/frameset.cgi.olde perl-5.10.0/lib/CGI/eg/frameset.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/index.html.olde perl-5.10.0/lib/CGI/eg/index.html
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/internal_links.cgi.olde perl-5.10.0/lib/CGI/eg/internal_links.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/javascript.cgi.olde perl-5.10.0/lib/CGI/eg/javascript.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/make_links.pl.olde perl-5.10.0/lib/CGI/eg/make_links.pl
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/monty.cgi.olde perl-5.10.0/lib/CGI/eg/monty.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/multiple_forms.cgi.olde perl-5.10.0/lib/CGI/eg/multiple_forms.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/nph-clock.cgi.olde perl-5.10.0/lib/CGI/eg/nph-clock.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/nph-multipart.cgi.olde perl-5.10.0/lib/CGI/eg/nph-multipart.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/popup.cgi.olde perl-5.10.0/lib/CGI/eg/popup.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/RunMeFirst.olde perl-5.10.0/lib/CGI/eg/RunMeFirst
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/save_state.cgi.olde perl-5.10.0/lib/CGI/eg/save_state.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/tryit.cgi.olde perl-5.10.0/lib/CGI/eg/tryit.cgi
|
||||||
|
diff -up perl-5.10.0/lib/CGI/eg/wilogo_gif.uu.olde perl-5.10.0/lib/CGI/eg/wilogo_gif.uu
|
||||||
|
diff -up perl-5.10.0/lib/CGI/Fast.pm.olde perl-5.10.0/lib/CGI/Fast.pm
|
||||||
|
--- perl-5.10.0/lib/CGI/Fast.pm.olde 2007-12-18 11:47:07.000000000 +0100
|
||||||
+++ perl-5.10.0/lib/CGI/Fast.pm 2008-04-14 19:53:12.000000000 +0200
|
+++ perl-5.10.0/lib/CGI/Fast.pm 2008-04-14 19:53:12.000000000 +0200
|
||||||
@@ -55,6 +55,7 @@ sub new {
|
@@ -55,6 +55,7 @@ sub new {
|
||||||
}
|
}
|
||||||
|
@ -99,17 +132,17 @@ diff -up perl-5.10.0/lib/CGI/Fast.pm.eee perl-5.10.0/lib/CGI/Fast.pm
|
||||||
return $CGI::Q = $self->SUPER::new($initializer, @param);
|
return $CGI::Q = $self->SUPER::new($initializer, @param);
|
||||||
}
|
}
|
||||||
|
|
||||||
diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
|
||||||
--- perl-5.10.0/lib/CGI.pm.eee 2007-12-18 11:47:07.000000000 +0100
|
--- perl-5.10.0/lib/CGI.pm.olde 2007-12-18 11:47:07.000000000 +0100
|
||||||
+++ perl-5.10.0/lib/CGI.pm 2008-04-23 15:08:23.000000000 +0200
|
+++ perl-5.10.0/lib/CGI.pm 2008-06-25 16:52:19.000000000 +0200
|
||||||
@@ -18,8 +18,8 @@ use Carp 'croak';
|
@@ -18,8 +18,8 @@ use Carp 'croak';
|
||||||
# The most recent version and complete docs are available at:
|
# The most recent version and complete docs are available at:
|
||||||
# http://stein.cshl.org/WWW/software/CGI/
|
# http://stein.cshl.org/WWW/software/CGI/
|
||||||
|
|
||||||
-$CGI::revision = '$Id: CGI.pm,v 1.234 2007/04/16 16:58:46 lstein Exp $';
|
-$CGI::revision = '$Id: CGI.pm,v 1.234 2007/04/16 16:58:46 lstein Exp $';
|
||||||
-$CGI::VERSION='3.29';
|
-$CGI::VERSION='3.29';
|
||||||
+$CGI::revision = '$Id: CGI.pm,v 1.251 2008/04/23 13:08:23 lstein Exp $';
|
+$CGI::revision = '$Id: CGI.pm,v 1.254 2008/06/25 14:52:19 lstein Exp $';
|
||||||
+$CGI::VERSION='3.37';
|
+$CGI::VERSION='3.38';
|
||||||
|
|
||||||
# HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
|
# HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
|
||||||
# UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
|
# UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
|
||||||
|
@ -151,6 +184,15 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
# Other globals that you shouldn't worry about.
|
# Other globals that you shouldn't worry about.
|
||||||
undef $Q;
|
undef $Q;
|
||||||
$BEEN_THERE = 0;
|
$BEEN_THERE = 0;
|
||||||
|
@@ -226,7 +227,7 @@ if ($needs_binmode) {
|
||||||
|
tt u i b blockquote pre img a address cite samp dfn html head
|
||||||
|
base body Link nextid title meta kbd start_html end_html
|
||||||
|
input Select option comment charset escapeHTML/],
|
||||||
|
- ':html3'=>[qw/div table caption th td TR Tr sup Sub strike applet Param
|
||||||
|
+ ':html3'=>[qw/div table caption th td TR Tr sup Sub strike applet Param nobr
|
||||||
|
embed basefont style span layer ilayer font frameset frame script small big Area Map/],
|
||||||
|
':html4'=>[qw/abbr acronym bdo col colgroup del fieldset iframe
|
||||||
|
ins label legend noframes noscript object optgroup Q
|
||||||
@@ -352,6 +353,7 @@ sub new {
|
@@ -352,6 +353,7 @@ sub new {
|
||||||
$self->r(Apache->request) unless $self->r;
|
$self->r(Apache->request) unless $self->r;
|
||||||
my $r = $self->r;
|
my $r = $self->r;
|
||||||
|
@ -167,9 +209,19 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
}
|
}
|
||||||
undef $NPH;
|
undef $NPH;
|
||||||
}
|
}
|
||||||
@@ -445,15 +448,14 @@ sub param {
|
@@ -437,23 +440,22 @@ sub param {
|
||||||
|
# If values is provided, then we set it.
|
||||||
|
if (@values or defined $value) {
|
||||||
|
$self->add_parameter($name);
|
||||||
|
- $self->{$name}=[@values];
|
||||||
|
+ $self->{param}{$name}=[@values];
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$name = $p[0];
|
||||||
|
}
|
||||||
|
|
||||||
return unless defined($name) && $self->{$name};
|
- return unless defined($name) && $self->{$name};
|
||||||
|
+ return unless defined($name) && $self->{param}{$name};
|
||||||
|
|
||||||
- my $charset = $self->charset || '';
|
- my $charset = $self->charset || '';
|
||||||
- my $utf8 = $charset eq 'utf-8';
|
- my $utf8 = $charset eq 'utf-8';
|
||||||
|
@ -179,7 +231,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
- : Encode::decode(utf8=>$self->{$name}->[0]);
|
- : Encode::decode(utf8=>$self->{$name}->[0]);
|
||||||
- } else {
|
- } else {
|
||||||
- return wantarray ? @{$self->{$name}} : $self->{$name}->[0];
|
- return wantarray ? @{$self->{$name}} : $self->{$name}->[0];
|
||||||
+ my @result = @{$self->{$name}};
|
+ my @result = @{$self->{param}{$name}};
|
||||||
+
|
+
|
||||||
+ if ($PARAM_UTF8) {
|
+ if ($PARAM_UTF8) {
|
||||||
+ eval "require Encode; 1;" unless Encode->can('decode'); # bring in these functions
|
+ eval "require Encode; 1;" unless Encode->can('decode'); # bring in these functions
|
||||||
|
@ -190,6 +242,23 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
}
|
}
|
||||||
|
|
||||||
sub self_or_default {
|
sub self_or_default {
|
||||||
|
@@ -574,14 +576,14 @@ sub init {
|
||||||
|
$self->add_parameter($param);
|
||||||
|
$self->read_from_client(\$value,$content_length,0)
|
||||||
|
if $content_length > 0;
|
||||||
|
- push (@{$self->{$param}},$value);
|
||||||
|
+ push (@{$self->{param}{$param}},$value);
|
||||||
|
$is_xforms = 1;
|
||||||
|
} elsif ($ENV{'CONTENT_TYPE'} =~ /multipart\/related.+boundary=\"?([^\";,]+)\"?.+start=\"?\<?([^\"\>]+)\>?\"?/) {
|
||||||
|
my($boundary,$start) = ($1,$2);
|
||||||
|
my($param) = 'XForms:Model';
|
||||||
|
$self->add_parameter($param);
|
||||||
|
my($value) = $self->read_multipart_related($start,$boundary,$content_length,0);
|
||||||
|
- push (@{$self->{$param}},$value);
|
||||||
|
+ push (@{$self->{param}{$param}},$value);
|
||||||
|
if ($MOD_PERL) {
|
||||||
|
$query_string = $self->r->args;
|
||||||
|
} else {
|
||||||
@@ -641,7 +643,7 @@ sub init {
|
@@ -641,7 +643,7 @@ sub init {
|
||||||
last METHOD;
|
last METHOD;
|
||||||
}
|
}
|
||||||
|
@ -199,7 +268,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
$self->read_from_client(\$query_string,$content_length,0)
|
$self->read_from_client(\$query_string,$content_length,0)
|
||||||
if $content_length > 0;
|
if $content_length > 0;
|
||||||
# Some people want to have their cake and eat it too!
|
# Some people want to have their cake and eat it too!
|
||||||
@@ -667,11 +669,11 @@ sub init {
|
@@ -667,13 +669,13 @@ sub init {
|
||||||
}
|
}
|
||||||
|
|
||||||
# YL: Begin Change for XML handler 10/19/2001
|
# YL: Begin Change for XML handler 10/19/2001
|
||||||
|
@ -211,8 +280,47 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
- my($param) = 'POSTDATA' ;
|
- my($param) = 'POSTDATA' ;
|
||||||
+ my($param) = $meth . 'DATA' ;
|
+ my($param) = $meth . 'DATA' ;
|
||||||
$self->add_parameter($param) ;
|
$self->add_parameter($param) ;
|
||||||
push (@{$self->{$param}},$query_string);
|
- push (@{$self->{$param}},$query_string);
|
||||||
|
+ push (@{$self->{param}{$param}},$query_string);
|
||||||
undef $query_string ;
|
undef $query_string ;
|
||||||
|
}
|
||||||
|
# YL: End Change for XML handler 10/19/2001
|
||||||
|
@@ -685,7 +687,7 @@ sub init {
|
||||||
|
$self->parse_params($query_string);
|
||||||
|
} else {
|
||||||
|
$self->add_parameter('keywords');
|
||||||
|
- $self->{'keywords'} = [$self->parse_keywordlist($query_string)];
|
||||||
|
+ $self->{param}{'keywords'} = [$self->parse_keywordlist($query_string)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -752,7 +754,7 @@ sub save_request {
|
||||||
|
@QUERY_PARAM = $self->param; # save list of parameters
|
||||||
|
foreach (@QUERY_PARAM) {
|
||||||
|
next unless defined $_;
|
||||||
|
- $QUERY_PARAM{$_}=$self->{$_};
|
||||||
|
+ $QUERY_PARAM{$_}=$self->{param}{$_};
|
||||||
|
}
|
||||||
|
$QUERY_CHARSET = $self->charset;
|
||||||
|
%QUERY_FIELDNAMES = %{$self->{'.fieldnames'}};
|
||||||
|
@@ -771,7 +773,7 @@ sub parse_params {
|
||||||
|
$param = unescape($param);
|
||||||
|
$value = unescape($value);
|
||||||
|
$self->add_parameter($param);
|
||||||
|
- push (@{$self->{$param}},$value);
|
||||||
|
+ push (@{$self->{param}{$param}},$value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -779,7 +781,7 @@ sub add_parameter {
|
||||||
|
my($self,$param)=@_;
|
||||||
|
return unless defined $param;
|
||||||
|
push (@{$self->{'.parameters'}},$param)
|
||||||
|
- unless defined($self->{$param});
|
||||||
|
+ unless defined($self->{param}{$param});
|
||||||
|
}
|
||||||
|
|
||||||
|
sub all_parameters {
|
||||||
@@ -904,6 +906,7 @@ sub _setup_symbols {
|
@@ -904,6 +906,7 @@ sub _setup_symbols {
|
||||||
$DEBUG=0, next if /^[:-]no_?[Dd]ebug$/;
|
$DEBUG=0, next if /^[:-]no_?[Dd]ebug$/;
|
||||||
$DEBUG=2, next if /^[:-][Dd]ebug$/;
|
$DEBUG=2, next if /^[:-][Dd]ebug$/;
|
||||||
|
@ -221,6 +329,35 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
$XHTML++, next if /^[:-]xhtml$/;
|
$XHTML++, next if /^[:-]xhtml$/;
|
||||||
$XHTML=0, next if /^[:-]no_?xhtml$/;
|
$XHTML=0, next if /^[:-]no_?xhtml$/;
|
||||||
$USE_PARAM_SEMICOLONS=0, next if /^[:-]oldstyle_urls$/;
|
$USE_PARAM_SEMICOLONS=0, next if /^[:-]oldstyle_urls$/;
|
||||||
|
@@ -1005,7 +1008,7 @@ sub delete {
|
||||||
|
my %to_delete;
|
||||||
|
foreach my $name (@to_delete)
|
||||||
|
{
|
||||||
|
- CORE::delete $self->{$name};
|
||||||
|
+ CORE::delete $self->{param}{$name};
|
||||||
|
CORE::delete $self->{'.fieldnames'}->{$name};
|
||||||
|
$to_delete{$name}++;
|
||||||
|
}
|
||||||
|
@@ -1054,8 +1057,8 @@ END_OF_FUNC
|
||||||
|
sub keywords {
|
||||||
|
my($self,@values) = self_or_default(@_);
|
||||||
|
# If values is provided, then we set it.
|
||||||
|
- $self->{'keywords'}=[@values] if @values;
|
||||||
|
- my(@result) = defined($self->{'keywords'}) ? @{$self->{'keywords'}} : ();
|
||||||
|
+ $self->{param}{'keywords'}=[@values] if @values;
|
||||||
|
+ my(@result) = defined($self->{param}{'keywords'}) ? @{$self->{param}{'keywords'}} : ();
|
||||||
|
@result;
|
||||||
|
}
|
||||||
|
END_OF_FUNC
|
||||||
|
@@ -1200,7 +1203,7 @@ sub append {
|
||||||
|
my(@values) = defined($value) ? (ref($value) ? @{$value} : $value) : ();
|
||||||
|
if (@values) {
|
||||||
|
$self->add_parameter($name);
|
||||||
|
- push(@{$self->{$name}},@values);
|
||||||
|
+ push(@{$self->{param}{$name}},@values);
|
||||||
|
}
|
||||||
|
return $self->param($name);
|
||||||
|
}
|
||||||
@@ -1519,7 +1522,7 @@ sub header {
|
@@ -1519,7 +1522,7 @@ sub header {
|
||||||
push(@header,map {ucfirst $_} @other);
|
push(@header,map {ucfirst $_} @other);
|
||||||
push(@header,"Content-Type: $type") if $type ne '';
|
push(@header,"Content-Type: $type") if $type ne '';
|
||||||
|
@ -230,7 +367,32 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
$self->r->send_cgi_header($header);
|
$self->r->send_cgi_header($header);
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
@@ -1699,6 +1702,7 @@ sub _style {
|
@@ -1663,12 +1666,22 @@ sub start_html {
|
||||||
|
: qq(<meta name="$_" content="$meta->{$_}">)); }
|
||||||
|
}
|
||||||
|
|
||||||
|
- push(@result,ref($head) ? @$head : $head) if $head;
|
||||||
|
+ my $meta_bits_set = 0;
|
||||||
|
+ if( $head ) {
|
||||||
|
+ if( ref $head ) {
|
||||||
|
+ push @result, @$head;
|
||||||
|
+ $meta_bits_set = 1 if grep { /http-equiv=["']Content-Type/i }@$head;
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ push @result, $head;
|
||||||
|
+ $meta_bits_set = 1 if $head =~ /http-equiv=["']Content-Type/i;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
# handle the infrequently-used -style and -script parameters
|
||||||
|
push(@result,$self->_style($style)) if defined $style;
|
||||||
|
push(@result,$self->_script($script)) if defined $script;
|
||||||
|
- push(@result,$meta_bits) if defined $meta_bits;
|
||||||
|
+ push(@result,$meta_bits) if defined $meta_bits and !$meta_bits_set;
|
||||||
|
|
||||||
|
# handle -noscript parameter
|
||||||
|
push(@result,<<END) if $noscript;
|
||||||
|
@@ -1699,6 +1712,7 @@ sub _style {
|
||||||
my $cdata_end = $XHTML ? "\n/* ]]> */-->\n" : " -->\n";
|
my $cdata_end = $XHTML ? "\n/* ]]> */-->\n" : " -->\n";
|
||||||
|
|
||||||
my @s = ref($style) eq 'ARRAY' ? @$style : $style;
|
my @s = ref($style) eq 'ARRAY' ? @$style : $style;
|
||||||
|
@ -238,7 +400,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
|
|
||||||
for my $s (@s) {
|
for my $s (@s) {
|
||||||
if (ref($s)) {
|
if (ref($s)) {
|
||||||
@@ -1708,7 +1712,7 @@ sub _style {
|
@@ -1708,7 +1722,7 @@ sub _style {
|
||||||
ref($s) eq 'ARRAY' ? @$s : %$s));
|
ref($s) eq 'ARRAY' ? @$s : %$s));
|
||||||
my $type = defined $stype ? $stype : 'text/css';
|
my $type = defined $stype ? $stype : 'text/css';
|
||||||
my $rel = $alternate ? 'alternate stylesheet' : 'stylesheet';
|
my $rel = $alternate ? 'alternate stylesheet' : 'stylesheet';
|
||||||
|
@ -247,7 +409,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
|
|
||||||
if (ref($src) eq "ARRAY") # Check to see if the $src variable is an array reference
|
if (ref($src) eq "ARRAY") # Check to see if the $src variable is an array reference
|
||||||
{ # If it is, push a LINK tag for each one
|
{ # If it is, push a LINK tag for each one
|
||||||
@@ -1831,7 +1835,7 @@ sub startform {
|
@@ -1831,7 +1845,7 @@ sub startform {
|
||||||
my($method,$action,$enctype,@other) =
|
my($method,$action,$enctype,@other) =
|
||||||
rearrange([METHOD,ACTION,ENCTYPE],@p);
|
rearrange([METHOD,ACTION,ENCTYPE],@p);
|
||||||
|
|
||||||
|
@ -256,7 +418,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
$enctype = $self->escapeHTML($enctype || &URL_ENCODED);
|
$enctype = $self->escapeHTML($enctype || &URL_ENCODED);
|
||||||
if (defined $action) {
|
if (defined $action) {
|
||||||
$action = $self->escapeHTML($action);
|
$action = $self->escapeHTML($action);
|
||||||
@@ -2147,8 +2151,9 @@ END_OF_FUNC
|
@@ -2147,8 +2161,9 @@ END_OF_FUNC
|
||||||
sub checkbox {
|
sub checkbox {
|
||||||
my($self,@p) = self_or_default(@_);
|
my($self,@p) = self_or_default(@_);
|
||||||
|
|
||||||
|
@ -268,7 +430,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
|
|
||||||
$value = defined $value ? $value : 'on';
|
$value = defined $value ? $value : 'on';
|
||||||
|
|
||||||
@@ -2165,7 +2170,8 @@ sub checkbox {
|
@@ -2165,7 +2180,8 @@ sub checkbox {
|
||||||
my($other) = @other ? "@other " : '';
|
my($other) = @other ? "@other " : '';
|
||||||
$tabindex = $self->element_tab($tabindex);
|
$tabindex = $self->element_tab($tabindex);
|
||||||
$self->register_parameter($name);
|
$self->register_parameter($name);
|
||||||
|
@ -278,7 +440,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
: qq{<input type="checkbox" name="$name" value="$value"$checked$other>$the_label};
|
: qq{<input type="checkbox" name="$name" value="$value"$checked$other>$the_label};
|
||||||
}
|
}
|
||||||
END_OF_FUNC
|
END_OF_FUNC
|
||||||
@@ -2192,9 +2198,11 @@ sub escapeHTML {
|
@@ -2192,9 +2208,11 @@ sub escapeHTML {
|
||||||
else {
|
else {
|
||||||
$toencode =~ s{"}{"}gso;
|
$toencode =~ s{"}{"}gso;
|
||||||
}
|
}
|
||||||
|
@ -293,7 +455,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
$toencode =~ s{'}{'}gso;
|
$toencode =~ s{'}{'}gso;
|
||||||
$toencode =~ s{\x8b}{‹}gso;
|
$toencode =~ s{\x8b}{‹}gso;
|
||||||
$toencode =~ s{\x9b}{›}gso;
|
$toencode =~ s{\x9b}{›}gso;
|
||||||
@@ -2327,13 +2335,14 @@ sub _box_group {
|
@@ -2327,13 +2345,14 @@ sub _box_group {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
my $box_type = shift;
|
my $box_type = shift;
|
||||||
|
|
||||||
|
@ -314,7 +476,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
|
|
||||||
my($result,$checked,@elements,@values);
|
my($result,$checked,@elements,@values);
|
||||||
|
|
||||||
@@ -2393,7 +2402,7 @@ sub _box_group {
|
@@ -2393,7 +2412,7 @@ sub _box_group {
|
||||||
|
|
||||||
if ($XHTML) {
|
if ($XHTML) {
|
||||||
push @elements,
|
push @elements,
|
||||||
|
@ -323,7 +485,59 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
qq(<input type="$box_type" name="$name" value="$_" $checkit$other$tab$attribs$disable/>$label)).${break};
|
qq(<input type="$box_type" name="$name" value="$_" $checkit$other$tab$attribs$disable/>$label)).${break};
|
||||||
} else {
|
} else {
|
||||||
push(@elements,qq/<input type="$box_type" name="$name" value="$_"$checkit$other$tab$attribs$disable>${label}${break}/);
|
push(@elements,qq/<input type="$box_type" name="$name" value="$_"$checkit$other$tab$attribs$disable>${label}${break}/);
|
||||||
@@ -2560,6 +2569,7 @@ sub scrolling_list {
|
@@ -2428,12 +2447,14 @@ sub popup_menu {
|
||||||
|
my($name,$values,$default,$labels,$attributes,$override,$tabindex,@other) =
|
||||||
|
rearrange([NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LABELS,
|
||||||
|
ATTRIBUTES,[OVERRIDE,FORCE],TABINDEX],@p);
|
||||||
|
- my($result,$selected);
|
||||||
|
+ my($result,%selected);
|
||||||
|
|
||||||
|
if (!$override && defined($self->param($name))) {
|
||||||
|
- $selected = $self->param($name);
|
||||||
|
- } else {
|
||||||
|
- $selected = $default;
|
||||||
|
+ $selected{$self->param($name)}++;
|
||||||
|
+ } elsif ($default) {
|
||||||
|
+ %selected = map {$_=>1} ref($default) eq 'ARRAY'
|
||||||
|
+ ? @$default
|
||||||
|
+ : $default;
|
||||||
|
}
|
||||||
|
$name=$self->escapeHTML($name);
|
||||||
|
my($other) = @other ? " @other" : '';
|
||||||
|
@@ -2444,20 +2465,22 @@ sub popup_menu {
|
||||||
|
$result = qq/<select name="$name" $tabindex$other>\n/;
|
||||||
|
foreach (@values) {
|
||||||
|
if (/<optgroup/) {
|
||||||
|
- foreach (split(/\n/)) {
|
||||||
|
+ for my $v (split(/\n/)) {
|
||||||
|
my $selectit = $XHTML ? 'selected="selected"' : 'selected';
|
||||||
|
- s/(value="$selected")/$selectit $1/ if defined $selected;
|
||||||
|
- $result .= "$_\n";
|
||||||
|
+ for my $selected (keys %selected) {
|
||||||
|
+ $v =~ s/(value="$selected")/$selectit $1/;
|
||||||
|
+ }
|
||||||
|
+ $result .= "$v\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
- my $attribs = $self->_set_attributes($_, $attributes);
|
||||||
|
- my($selectit) = defined($selected) ? $self->_selected($selected eq $_) : '';
|
||||||
|
- my($label) = $_;
|
||||||
|
- $label = $labels->{$_} if defined($labels) && defined($labels->{$_});
|
||||||
|
- my($value) = $self->escapeHTML($_);
|
||||||
|
- $label=$self->escapeHTML($label,1);
|
||||||
|
- $result .= "<option${attribs} ${selectit}value=\"$value\">$label</option>\n";
|
||||||
|
+ my $attribs = $self->_set_attributes($_, $attributes);
|
||||||
|
+ my($selectit) = $self->_selected($selected{$_});
|
||||||
|
+ my($label) = $_;
|
||||||
|
+ $label = $labels->{$_} if defined($labels) && defined($labels->{$_});
|
||||||
|
+ my($value) = $self->escapeHTML($_);
|
||||||
|
+ $label = $self->escapeHTML($label,1);
|
||||||
|
+ $result .= "<option${attribs} ${selectit}value=\"$value\">$label</option>\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2560,6 +2583,7 @@ sub scrolling_list {
|
||||||
$size = $size || scalar(@values);
|
$size = $size || scalar(@values);
|
||||||
|
|
||||||
my(%selected) = $self->previous_or_default($name,$defaults,$override);
|
my(%selected) = $self->previous_or_default($name,$defaults,$override);
|
||||||
|
@ -331,7 +545,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
my($is_multiple) = $multiple ? qq/ multiple="multiple"/ : '';
|
my($is_multiple) = $multiple ? qq/ multiple="multiple"/ : '';
|
||||||
my($has_size) = $size ? qq/ size="$size"/: '';
|
my($has_size) = $size ? qq/ size="$size"/: '';
|
||||||
my($other) = @other ? " @other" : '';
|
my($other) = @other ? " @other" : '';
|
||||||
@@ -2692,7 +2702,7 @@ sub url {
|
@@ -2692,7 +2716,7 @@ sub url {
|
||||||
my $request_uri = unescape($self->request_uri) || '';
|
my $request_uri = unescape($self->request_uri) || '';
|
||||||
my $query_str = $self->query_string;
|
my $query_str = $self->query_string;
|
||||||
|
|
||||||
|
@ -340,7 +554,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
undef $path if $rewrite_in_use && $rewrite; # path not valid when rewriting active
|
undef $path if $rewrite_in_use && $rewrite; # path not valid when rewriting active
|
||||||
|
|
||||||
my $uri = $rewrite && $request_uri ? $request_uri : $script_name;
|
my $uri = $rewrite && $request_uri ? $request_uri : $script_name;
|
||||||
@@ -2723,6 +2733,7 @@ sub url {
|
@@ -2723,6 +2747,7 @@ sub url {
|
||||||
|
|
||||||
$url .= $path if $path_info and defined $path;
|
$url .= $path if $path_info and defined $path;
|
||||||
$url .= "?$query_str" if $query and $query_str ne '';
|
$url .= "?$query_str" if $query and $query_str ne '';
|
||||||
|
@ -348,7 +562,34 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
$url =~ s/([^a-zA-Z0-9_.%;&?\/\\:+=~-])/sprintf("%%%02X",ord($1))/eg;
|
$url =~ s/([^a-zA-Z0-9_.%;&?\/\\:+=~-])/sprintf("%%%02X",ord($1))/eg;
|
||||||
return $url;
|
return $url;
|
||||||
}
|
}
|
||||||
@@ -3284,10 +3295,10 @@ sub previous_or_default {
|
@@ -2793,12 +2818,12 @@ END_OF_FUNC
|
||||||
|
sub param_fetch {
|
||||||
|
my($self,@p) = self_or_default(@_);
|
||||||
|
my($name) = rearrange([NAME],@p);
|
||||||
|
- unless (exists($self->{$name})) {
|
||||||
|
+ unless (exists($self->{param}{$name})) {
|
||||||
|
$self->add_parameter($name);
|
||||||
|
- $self->{$name} = [];
|
||||||
|
+ $self->{param}{$name} = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
- return $self->{$name};
|
||||||
|
+ return $self->{param}{$name};
|
||||||
|
}
|
||||||
|
END_OF_FUNC
|
||||||
|
|
||||||
|
@@ -2931,7 +2956,9 @@ sub Accept {
|
||||||
|
my($self,$search) = self_or_CGI(@_);
|
||||||
|
my(%prefs,$type,$pref,$pat);
|
||||||
|
|
||||||
|
- my(@accept) = split(',',$self->http('accept'));
|
||||||
|
+ my(@accept) = defined $self->http('accept')
|
||||||
|
+ ? split(',',$self->http('accept'))
|
||||||
|
+ : ();
|
||||||
|
|
||||||
|
foreach (@accept) {
|
||||||
|
($pref) = /q=(\d\.\d+|\d+)/;
|
||||||
|
@@ -3284,10 +3311,10 @@ sub previous_or_default {
|
||||||
|
|
||||||
if (!$override && ($self->{'.fieldnames'}->{$name} ||
|
if (!$override && ($self->{'.fieldnames'}->{$name} ||
|
||||||
defined($self->param($name)) ) ) {
|
defined($self->param($name)) ) ) {
|
||||||
|
@ -361,7 +602,12 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
} else {
|
} else {
|
||||||
$selected{$defaults}++ if defined($defaults);
|
$selected{$defaults}++ if defined($defaults);
|
||||||
}
|
}
|
||||||
@@ -3371,8 +3382,12 @@ sub read_multipart {
|
@@ -3368,11 +3395,20 @@ sub read_multipart {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ $header{'Content-Disposition'} ||= ''; # quench uninit variable warning
|
||||||
|
+
|
||||||
my($param)= $header{'Content-Disposition'}=~/ name="([^"]*)"/;
|
my($param)= $header{'Content-Disposition'}=~/ name="([^"]*)"/;
|
||||||
$param .= $TAINTED;
|
$param .= $TAINTED;
|
||||||
|
|
||||||
|
@ -372,11 +618,23 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
+ # content-disposition parsing fail.
|
+ # content-disposition parsing fail.
|
||||||
+ my ($filename) = $header{'Content-Disposition'}
|
+ my ($filename) = $header{'Content-Disposition'}
|
||||||
+ =~/ filename=(("[^"]*")|([a-z\d!\#'\*\+,\.^_\`\{\}\|\~]*))/i;
|
+ =~/ filename=(("[^"]*")|([a-z\d!\#'\*\+,\.^_\`\{\}\|\~]*))/i;
|
||||||
|
+
|
||||||
|
+ $filename ||= ''; # quench uninit variable warning
|
||||||
|
+
|
||||||
+ $filename =~ s/^"([^"]*)"$/$1/;
|
+ $filename =~ s/^"([^"]*)"$/$1/;
|
||||||
# Test for Opera's multiple upload feature
|
# Test for Opera's multiple upload feature
|
||||||
my($multipart) = ( defined( $header{'Content-Type'} ) &&
|
my($multipart) = ( defined( $header{'Content-Type'} ) &&
|
||||||
$header{'Content-Type'} =~ /multipart\/mixed/ ) ?
|
$header{'Content-Type'} =~ /multipart\/mixed/ ) ?
|
||||||
@@ -3431,7 +3446,7 @@ sub read_multipart {
|
@@ -3386,7 +3422,7 @@ sub read_multipart {
|
||||||
|
if ( ( !defined($filename) || $filename eq '' ) && !$multipart ) {
|
||||||
|
my($value) = $buffer->readBody;
|
||||||
|
$value .= $TAINTED;
|
||||||
|
- push(@{$self->{$param}},$value);
|
||||||
|
+ push(@{$self->{param}{$param}},$value);
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -3431,7 +3467,7 @@ sub read_multipart {
|
||||||
|
|
||||||
my ($data);
|
my ($data);
|
||||||
local($\) = '';
|
local($\) = '';
|
||||||
|
@ -385,7 +643,25 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
while (defined($data = $buffer->read)) {
|
while (defined($data = $buffer->read)) {
|
||||||
if (defined $self->{'.upload_hook'})
|
if (defined $self->{'.upload_hook'})
|
||||||
{
|
{
|
||||||
@@ -3696,7 +3711,7 @@ sub new {
|
@@ -3462,7 +3498,7 @@ sub read_multipart {
|
||||||
|
name => $tmpfile,
|
||||||
|
info => {%header},
|
||||||
|
};
|
||||||
|
- push(@{$self->{$param}},$filehandle);
|
||||||
|
+ push(@{$self->{param}{$param}},$filehandle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -3564,7 +3600,7 @@ sub read_multipart_related {
|
||||||
|
name => $tmpfile,
|
||||||
|
info => {%header},
|
||||||
|
};
|
||||||
|
- push(@{$self->{$param}},$filehandle);
|
||||||
|
+ push(@{$self->{param}{$param}},$filehandle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $returnvalue;
|
||||||
|
@@ -3696,7 +3732,7 @@ sub new {
|
||||||
(my $safename = $name) =~ s/([':%])/ sprintf '%%%02X', ord $1 /eg;
|
(my $safename = $name) =~ s/([':%])/ sprintf '%%%02X', ord $1 /eg;
|
||||||
my $fv = ++$FH . $safename;
|
my $fv = ++$FH . $safename;
|
||||||
my $ref = \*{"Fh::$fv"};
|
my $ref = \*{"Fh::$fv"};
|
||||||
|
@ -394,7 +670,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
my $safe = $1;
|
my $safe = $1;
|
||||||
sysopen($ref,$safe,Fcntl::O_RDWR()|Fcntl::O_CREAT()|Fcntl::O_EXCL(),0600) || return;
|
sysopen($ref,$safe,Fcntl::O_RDWR()|Fcntl::O_CREAT()|Fcntl::O_EXCL(),0600) || return;
|
||||||
unlink($safe) if $delete;
|
unlink($safe) if $delete;
|
||||||
@@ -3768,7 +3783,7 @@ sub new {
|
@@ -3768,7 +3804,7 @@ sub new {
|
||||||
}
|
}
|
||||||
|
|
||||||
my $self = {LENGTH=>$length,
|
my $self = {LENGTH=>$length,
|
||||||
|
@ -403,7 +679,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
BOUNDARY=>$boundary,
|
BOUNDARY=>$boundary,
|
||||||
INTERFACE=>$interface,
|
INTERFACE=>$interface,
|
||||||
BUFFER=>'',
|
BUFFER=>'',
|
||||||
@@ -4032,10 +4047,10 @@ sub new {
|
@@ -4032,10 +4068,10 @@ sub new {
|
||||||
my $filename;
|
my $filename;
|
||||||
find_tempdir() unless -w $TMPDIRECTORY;
|
find_tempdir() unless -w $TMPDIRECTORY;
|
||||||
for (my $i = 0; $i < $MAXTRIES; $i++) {
|
for (my $i = 0; $i < $MAXTRIES; $i++) {
|
||||||
|
@ -416,7 +692,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
# this used to untaint, now it doesn't
|
# this used to untaint, now it doesn't
|
||||||
# $filename = $1;
|
# $filename = $1;
|
||||||
return bless \$filename;
|
return bless \$filename;
|
||||||
@@ -4109,6 +4124,8 @@ CGI - Simple Common Gateway Interface Cl
|
@@ -4109,6 +4145,8 @@ CGI - Simple Common Gateway Interface Cl
|
||||||
hr;
|
hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -425,7 +701,17 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
=head1 ABSTRACT
|
=head1 ABSTRACT
|
||||||
|
|
||||||
This perl library uses perl5 objects to make it easy to create Web
|
This perl library uses perl5 objects to make it easy to create Web
|
||||||
@@ -4477,6 +4494,10 @@ it, use code like this:
|
@@ -4392,8 +4430,7 @@ selections in a scrolling list), you can
|
||||||
|
the method will return a single value.
|
||||||
|
|
||||||
|
If a value is not given in the query string, as in the queries
|
||||||
|
-"name1=&name2=" or "name1&name2", it will be returned as an empty
|
||||||
|
-string. This feature is new in 2.63.
|
||||||
|
+"name1=&name2=", it will be returned as an empty string.
|
||||||
|
|
||||||
|
|
||||||
|
If the parameter does not exist at all, then param() will return undef
|
||||||
|
@@ -4477,6 +4514,10 @@ it, use code like this:
|
||||||
|
|
||||||
my $data = $query->param('POSTDATA');
|
my $data = $query->param('POSTDATA');
|
||||||
|
|
||||||
|
@ -436,7 +722,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
(If you don't know what the preceding means, don't worry about it. It
|
(If you don't know what the preceding means, don't worry about it. It
|
||||||
only affects people trying to use CGI for XML processing and other
|
only affects people trying to use CGI for XML processing and other
|
||||||
specialized tasks.)
|
specialized tasks.)
|
||||||
@@ -4812,6 +4833,16 @@ If start_html()'s -dtd parameter specifi
|
@@ -4812,6 +4853,16 @@ If start_html()'s -dtd parameter specifi
|
||||||
XHTML will automatically be disabled without needing to use this
|
XHTML will automatically be disabled without needing to use this
|
||||||
pragma.
|
pragma.
|
||||||
|
|
||||||
|
@ -453,7 +739,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
=item -nph
|
=item -nph
|
||||||
|
|
||||||
This makes CGI.pm produce a header appropriate for an NPH (no
|
This makes CGI.pm produce a header appropriate for an NPH (no
|
||||||
@@ -5388,7 +5419,7 @@ Generate just the protocol and net locat
|
@@ -5388,7 +5439,7 @@ Generate just the protocol and net locat
|
||||||
If Apache's mod_rewrite is turned on, then the script name and path
|
If Apache's mod_rewrite is turned on, then the script name and path
|
||||||
info probably won't match the request that the user sent. Set
|
info probably won't match the request that the user sent. Set
|
||||||
-rewrite=>1 (default) to return URLs that match what the user sent
|
-rewrite=>1 (default) to return URLs that match what the user sent
|
||||||
|
@ -462,7 +748,26 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
the URL after mod_rewrite's rules have run. Because the additional
|
the URL after mod_rewrite's rules have run. Because the additional
|
||||||
path information only makes sense in the context of the rewritten URL,
|
path information only makes sense in the context of the rewritten URL,
|
||||||
-rewrite is set to false when you request path info in the URL.
|
-rewrite is set to false when you request path info in the URL.
|
||||||
@@ -6389,6 +6420,9 @@ are the tab indexes of each button. Exa
|
@@ -6102,7 +6153,7 @@ recognized. See textfield() for details
|
||||||
|
|
||||||
|
print popup_menu(-name=>'menu_name',
|
||||||
|
-values=>['eenie','meenie','minie'],
|
||||||
|
- -default=>'meenie',
|
||||||
|
+ -default=>['meenie','minie'],
|
||||||
|
-labels=>\%labels,
|
||||||
|
-attributes=>\%attributes);
|
||||||
|
|
||||||
|
@@ -6125,7 +6176,8 @@ a named array, such as "\@foo".
|
||||||
|
|
||||||
|
The optional third parameter (-default) is the name of the default
|
||||||
|
menu choice. If not specified, the first item will be the default.
|
||||||
|
-The values of the previous choice will be maintained across queries.
|
||||||
|
+The values of the previous choice will be maintained across
|
||||||
|
+queries. Pass an array reference to select multiple defaults.
|
||||||
|
|
||||||
|
=item 4.
|
||||||
|
|
||||||
|
@@ -6389,6 +6441,9 @@ are the tab indexes of each button. Exa
|
||||||
-tabindex => ['moe','minie','eenie','meenie'] # tab in this order
|
-tabindex => ['moe','minie','eenie','meenie'] # tab in this order
|
||||||
-tabindex => {meenie=>100,moe=>101,minie=>102,eenie=>200} # tab in this order
|
-tabindex => {meenie=>100,moe=>101,minie=>102,eenie=>200} # tab in this order
|
||||||
|
|
||||||
|
@ -472,7 +777,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
When the form is processed, all checked boxes will be returned as
|
When the form is processed, all checked boxes will be returned as
|
||||||
a list under the parameter name 'group_name'. The values of the
|
a list under the parameter name 'group_name'. The values of the
|
||||||
"on" checkboxes can be retrieved with:
|
"on" checkboxes can be retrieved with:
|
||||||
@@ -6546,6 +6580,9 @@ an associative array relating menu value
|
@@ -6546,6 +6601,9 @@ an associative array relating menu value
|
||||||
with the attribute's name as the key and the attribute's value as the
|
with the attribute's name as the key and the attribute's value as the
|
||||||
value.
|
value.
|
||||||
|
|
||||||
|
@ -482,7 +787,7 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
When the form is processed, the selected radio button can
|
When the form is processed, the selected radio button can
|
||||||
be retrieved using:
|
be retrieved using:
|
||||||
|
|
||||||
@@ -7658,10 +7695,8 @@ of CGI.pm without rewriting your old scr
|
@@ -7658,10 +7716,8 @@ of CGI.pm without rewriting your old scr
|
||||||
|
|
||||||
=head1 AUTHOR INFORMATION
|
=head1 AUTHOR INFORMATION
|
||||||
|
|
||||||
|
@ -495,27 +800,27 @@ diff -up perl-5.10.0/lib/CGI.pm.eee perl-5.10.0/lib/CGI.pm
|
||||||
|
|
||||||
Address bug reports and comments to: lstein@cshl.org. When sending
|
Address bug reports and comments to: lstein@cshl.org. When sending
|
||||||
bug reports, please provide the version of CGI.pm, the version of
|
bug reports, please provide the version of CGI.pm, the version of
|
||||||
diff -up perl-5.10.0/lib/CGI/Pretty.pm.eee perl-5.10.0/lib/CGI/Pretty.pm
|
diff -up perl-5.10.0/lib/CGI/Pretty.pm.olde perl-5.10.0/lib/CGI/Pretty.pm
|
||||||
diff -up perl-5.10.0/lib/CGI/Push.pm.eee perl-5.10.0/lib/CGI/Push.pm
|
diff -up perl-5.10.0/lib/CGI/Push.pm.olde perl-5.10.0/lib/CGI/Push.pm
|
||||||
diff -up perl-5.10.0/lib/CGI/Switch.pm.eee perl-5.10.0/lib/CGI/Switch.pm
|
diff -up perl-5.10.0/lib/CGI/Switch.pm.olde perl-5.10.0/lib/CGI/Switch.pm
|
||||||
diff -up perl-5.10.0/lib/CGI/t/apache.t.eee perl-5.10.0/lib/CGI/t/apache.t
|
diff -up perl-5.10.0/lib/CGI/t/apache.t.olde perl-5.10.0/lib/CGI/t/apache.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/can.t.eee perl-5.10.0/lib/CGI/t/can.t
|
diff -up perl-5.10.0/lib/CGI/t/can.t.olde perl-5.10.0/lib/CGI/t/can.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/carp.t.eee perl-5.10.0/lib/CGI/t/carp.t
|
diff -up perl-5.10.0/lib/CGI/t/carp.t.olde perl-5.10.0/lib/CGI/t/carp.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/cookie.t.eee perl-5.10.0/lib/CGI/t/cookie.t
|
diff -up perl-5.10.0/lib/CGI/t/cookie.t.olde perl-5.10.0/lib/CGI/t/cookie.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/fast.t.eee perl-5.10.0/lib/CGI/t/fast.t
|
diff -up perl-5.10.0/lib/CGI/t/fast.t.olde perl-5.10.0/lib/CGI/t/fast.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/form.t.eee perl-5.10.0/lib/CGI/t/form.t
|
diff -up perl-5.10.0/lib/CGI/t/form.t.olde perl-5.10.0/lib/CGI/t/form.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/function.t.eee perl-5.10.0/lib/CGI/t/function.t
|
diff -up perl-5.10.0/lib/CGI/t/function.t.olde perl-5.10.0/lib/CGI/t/function.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/html.t.eee perl-5.10.0/lib/CGI/t/html.t
|
diff -up perl-5.10.0/lib/CGI/t/html.t.olde perl-5.10.0/lib/CGI/t/html.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/no_tabindex.t.eee perl-5.10.0/lib/CGI/t/no_tabindex.t
|
diff -up perl-5.10.0/lib/CGI/t/no_tabindex.t.olde perl-5.10.0/lib/CGI/t/no_tabindex.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/pretty.t.eee perl-5.10.0/lib/CGI/t/pretty.t
|
diff -up perl-5.10.0/lib/CGI/t/pretty.t.olde perl-5.10.0/lib/CGI/t/pretty.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/push.t.eee perl-5.10.0/lib/CGI/t/push.t
|
diff -up perl-5.10.0/lib/CGI/t/push.t.olde perl-5.10.0/lib/CGI/t/push.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/request.t.eee perl-5.10.0/lib/CGI/t/request.t
|
diff -up perl-5.10.0/lib/CGI/t/request.t.olde perl-5.10.0/lib/CGI/t/request.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/start_end_asterisk.t.eee perl-5.10.0/lib/CGI/t/start_end_asterisk.t
|
diff -up perl-5.10.0/lib/CGI/t/start_end_asterisk.t.olde perl-5.10.0/lib/CGI/t/start_end_asterisk.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/start_end_end.t.eee perl-5.10.0/lib/CGI/t/start_end_end.t
|
diff -up perl-5.10.0/lib/CGI/t/start_end_end.t.olde perl-5.10.0/lib/CGI/t/start_end_end.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/start_end_start.t.eee perl-5.10.0/lib/CGI/t/start_end_start.t
|
diff -up perl-5.10.0/lib/CGI/t/start_end_start.t.olde perl-5.10.0/lib/CGI/t/start_end_start.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/switch.t.eee perl-5.10.0/lib/CGI/t/switch.t
|
diff -up perl-5.10.0/lib/CGI/t/switch.t.olde perl-5.10.0/lib/CGI/t/switch.t
|
||||||
diff -up perl-5.10.0/lib/CGI/t/util-58.t.eee perl-5.10.0/lib/CGI/t/util-58.t
|
diff -up perl-5.10.0/lib/CGI/t/util-58.t.olde perl-5.10.0/lib/CGI/t/util-58.t
|
||||||
--- perl-5.10.0/lib/CGI/t/util-58.t.eee 2007-12-18 11:47:07.000000000 +0100
|
--- perl-5.10.0/lib/CGI/t/util-58.t.olde 2007-12-18 11:47:07.000000000 +0100
|
||||||
+++ perl-5.10.0/lib/CGI/t/util-58.t 2003-04-14 20:32:22.000000000 +0200
|
+++ perl-5.10.0/lib/CGI/t/util-58.t 2003-04-14 20:32:22.000000000 +0200
|
||||||
@@ -11,11 +11,6 @@ BEGIN {
|
@@ -11,11 +11,6 @@ BEGIN {
|
||||||
use Test::More tests => 2;
|
use Test::More tests => 2;
|
||||||
|
@ -531,9 +836,9 @@ diff -up perl-5.10.0/lib/CGI/t/util-58.t.eee perl-5.10.0/lib/CGI/t/util-58.t
|
||||||
+is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
|
+is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
|
||||||
+ "# Escape string with UTF-8 flag");
|
+ "# Escape string with UTF-8 flag");
|
||||||
__END__
|
__END__
|
||||||
diff -up perl-5.10.0/lib/CGI/t/util.t.eee perl-5.10.0/lib/CGI/t/util.t
|
diff -up perl-5.10.0/lib/CGI/t/util.t.olde perl-5.10.0/lib/CGI/t/util.t
|
||||||
diff -up perl-5.10.0/lib/CGI/Util.pm.eee perl-5.10.0/lib/CGI/Util.pm
|
diff -up perl-5.10.0/lib/CGI/Util.pm.olde perl-5.10.0/lib/CGI/Util.pm
|
||||||
--- perl-5.10.0/lib/CGI/Util.pm.eee 2007-12-18 11:47:07.000000000 +0100
|
--- perl-5.10.0/lib/CGI/Util.pm.olde 2007-12-18 11:47:07.000000000 +0100
|
||||||
+++ perl-5.10.0/lib/CGI/Util.pm 2008-03-14 15:25:54.000000000 +0100
|
+++ perl-5.10.0/lib/CGI/Util.pm 2008-03-14 15:25:54.000000000 +0100
|
||||||
@@ -141,8 +141,12 @@ sub simple_escape {
|
@@ -141,8 +141,12 @@ sub simple_escape {
|
||||||
|
|
11
perl.spec
11
perl.spec
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
Name: perl
|
Name: perl
|
||||||
Version: %{perl_version}
|
Version: %{perl_version}
|
||||||
Release: 36%{?dist}
|
Release: 37%{?dist}
|
||||||
Epoch: %{perl_epoch}
|
Epoch: %{perl_epoch}
|
||||||
Summary: The Perl programming language
|
Summary: The Perl programming language
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
|
@ -62,8 +62,8 @@ Patch12: perl-5.10.0-Module-Load-Conditional-0.24.patch
|
||||||
# Upgrade Module::CoreList to 2.14
|
# Upgrade Module::CoreList to 2.14
|
||||||
Patch13: perl-5.10.0-Module-CoreList2.14.patch
|
Patch13: perl-5.10.0-Module-CoreList2.14.patch
|
||||||
|
|
||||||
# Upgrade CGI to 3.37 for bugzilla package
|
# Upgrade CGI to 3.38
|
||||||
Patch14: perl-5.10.0-CGI-3.37.patch
|
Patch14: perl-5.10.0-CGI-3.38.patch
|
||||||
|
|
||||||
# Problem with assertion - add upstream patch
|
# Problem with assertion - add upstream patch
|
||||||
Patch15: perl-5.10.0-bz448392.patch
|
Patch15: perl-5.10.0-bz448392.patch
|
||||||
|
@ -1016,7 +1016,7 @@ perl -x patchlevel.h 'Fedora Patch10: Dont run one io test due to random builder
|
||||||
perl -x patchlevel.h '32891 fix big slowdown in 5.10 @_ parameter passing'
|
perl -x patchlevel.h '32891 fix big slowdown in 5.10 @_ parameter passing'
|
||||||
perl -x patchlevel.h 'Fedora Patch12: Update Module::Load::Conditional to 0.24'
|
perl -x patchlevel.h 'Fedora Patch12: Update Module::Load::Conditional to 0.24'
|
||||||
perl -x patchlevel.h 'Fedora Patch13: Upgrade Module::CoreList to 2.14'
|
perl -x patchlevel.h 'Fedora Patch13: Upgrade Module::CoreList to 2.14'
|
||||||
perl -x patchlevel.h 'Fedora Patch14: Upgrade CGI to 3.37'
|
perl -x patchlevel.h 'Fedora Patch14: Upgrade CGI to 3.38'
|
||||||
perl -x patchlevel.h 'Fedora Patch15: Adopt upstream commit for assertion'
|
perl -x patchlevel.h 'Fedora Patch15: Adopt upstream commit for assertion'
|
||||||
perl -x patchlevel.h 'Fedora Patch16: Access permission - rt49003'
|
perl -x patchlevel.h 'Fedora Patch16: Access permission - rt49003'
|
||||||
perl -x patchlevel.h 'Fedora Patch17: CVE-2008-2827 perl: insecure use of chmod in rmtree'
|
perl -x patchlevel.h 'Fedora Patch17: CVE-2008-2827 perl: insecure use of chmod in rmtree'
|
||||||
|
@ -1627,6 +1627,9 @@ make test
|
||||||
|
|
||||||
# Old changelog entries are preserved in CVS.
|
# Old changelog entries are preserved in CVS.
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 21 2008 Marcela Maslanova <mmaslano@redhat.com> 4:5.10.0-37
|
||||||
|
- 455933 update to CGI-3.38
|
||||||
|
|
||||||
* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4:5.10.0-36
|
* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4:5.10.0-36
|
||||||
- rebuild for new db4 4.7
|
- rebuild for new db4 4.7
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue