Change 27354 by [EMAIL PROTECTED] on 2006/03/01 16:08:17
Upgrade to CGI.pm-3.17, but continuing the version bump for
unintegrated changes.
Affected files ...
... //depot/perl/lib/CGI.pm#58 edit
... //depot/perl/lib/CGI/Carp.pm#29 edit
... //depot/perl/lib/CGI/Cookie.pm#25 edit
... //depot/perl/lib/CGI/Fast.pm#16 edit
Differences ...
==== //depot/perl/lib/CGI.pm#58 (text) ====
Index: perl/lib/CGI.pm
--- perl/lib/CGI.pm#57~27255~ 2006-02-20 16:40:23.000000000 -0800
+++ perl/lib/CGI.pm 2006-03-01 08:08:17.000000000 -0800
@@ -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.200 2006/02/08 18:28:54 lstein Exp $';
-$CGI::VERSION='3.16_01';
+$CGI::revision = '$Id: CGI.pm,v 1.202 2006/02/24 19:03:29 lstein Exp $';
+$CGI::VERSION='3.17_01';
# HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
# UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
@@ -3314,11 +3314,11 @@
return;
}
- my($param)= $header{'Content-Disposition'}=~/ name="([^;]*)"/;
+ my($param)= $header{'Content-Disposition'}=~/ name="([^"]*)"/;
$param .= $TAINTED;
# Bug: Netscape doesn't escape quotation marks in file names!!!
- my($filename) = $header{'Content-Disposition'}=~/ filename="([^;]*)"/;
+ my($filename) = $header{'Content-Disposition'}=~/ filename="([^"]*)"/;
# Test for Opera's multiple upload feature
my($multipart) = ( defined( $header{'Content-Type'} ) &&
$header{'Content-Type'} =~ /multipart\/mixed/ ) ?
==== //depot/perl/lib/CGI/Carp.pm#29 (text) ====
Index: perl/lib/CGI/Carp.pm
--- perl/lib/CGI/Carp.pm#28~27202~ 2006-02-16 04:54:08.000000000 -0800
+++ perl/lib/CGI/Carp.pm 2006-03-01 08:08:17.000000000 -0800
@@ -207,6 +207,9 @@
=head1 CHANGE LOG
+1.29 Patch from Peter Whaite to fix the unfixable problem of CGI::Carp
+ not behaving correctly in an eval() context.
+
1.05 carpout() added and minor corrections by Marc Hedlund
<[EMAIL PROTECTED]> on 11/26/95.
@@ -384,7 +387,18 @@
sub die {
my ($arg,@rest) = @_;
- realdie ($arg,@rest) if ineval();
+
+ if ( ineval() ) {
+ if (!ref($arg)) {
+ $arg = join("",($arg,@rest)) || "Died";
+ my($file,$line,$id) = id(1);
+ $arg .= " at $file line $line.\n" unless $arg=~/\n$/;
+ realdie($arg);
+ }
+ else {
+ realdie($arg,@rest);
+ }
+ }
if (!ref($arg)) {
$arg = join("", ($arg,@rest));
==== //depot/perl/lib/CGI/Cookie.pm#25 (text) ====
Index: perl/lib/CGI/Cookie.pm
--- perl/lib/CGI/Cookie.pm#24~27202~ 2006-02-16 04:54:08.000000000 -0800
+++ perl/lib/CGI/Cookie.pm 2006-03-01 08:08:17.000000000 -0800
@@ -13,7 +13,7 @@
# wish, but if you redistribute a modified version, please attach a note
# listing the modifications you have made.
-$CGI::Cookie::VERSION='1.26';
+$CGI::Cookie::VERSION='1.27';
use CGI::Util qw(rearrange unescape escape);
use CGI;
@@ -163,7 +163,7 @@
push(@constant_values,"secure") if $secure = $self->secure;
my($key) = escape($self->name);
- my($cookie) = join("=",($key||''),join("&",map
escape($_||''),$self->value));
+ my($cookie) = join("=",(defined $key ? $key : ''),join("&",map
escape(defined $_ ? $_ : ''),$self->value));
return join("; ",$cookie,@constant_values);
}
==== //depot/perl/lib/CGI/Fast.pm#16 (text) ====
Index: perl/lib/CGI/Fast.pm
--- perl/lib/CGI/Fast.pm#15~27202~ 2006-02-16 04:54:08.000000000 -0800
+++ perl/lib/CGI/Fast.pm 2006-03-01 08:08:17.000000000 -0800
@@ -13,7 +13,7 @@
# wish, but if you redistribute a modified version, please attach a note
# listing the modifications you have made.
-$CGI::Fast::VERSION='1.06';
+$CGI::Fast::VERSION='1.07';
use CGI;
use FCGI;
@@ -54,6 +54,7 @@
return undef unless FCGI::accept() >= 0;
}
}
+ CGI->_reset_globals;
return $CGI::Q = $self->SUPER::new($initializer, @param);
}
End of Patch.
