[SCM] Debian packaging of libfcgi-perl branch, squeeze, updated. debian/0.71-1+squeeze1
Damyan Ivanov
dmn at debian.org
Mon Oct 24 10:19:43 UTC 2011
The following commit has been merged in the squeeze branch:
commit 6ebd32517e25d00f2ef8603b9c3874d017cfffc7
Author: Damyan Ivanov <dmn at debian.org>
Date: Mon Oct 24 13:03:50 2011 +0300
refresh cve-2011-2766.patch to apply cleanly
tabs vs. spaces issues only
diff --git a/debian/patches/cve-2011-2766.patch b/debian/patches/cve-2011-2766.patch
index 62ca4ac..96fcdd4 100644
--- a/debian/patches/cve-2011-2766.patch
+++ b/debian/patches/cve-2011-2766.patch
@@ -12,31 +12,31 @@ Bug-Debian: http://bugs.debian.org/607479
--- a/FCGI.PL
+++ b/FCGI.PL
@@ -294,14 +294,14 @@ sub Request(;***$*$) {
-
+
sub accept() {
warn "accept called as a method; you probably wanted to call Accept" if @_;
- if (%FCGI::ENV) {
-- %ENV = %FCGI::ENV;
+- %ENV = %FCGI::ENV;
+ if ( defined($FCGI::ENV) ) {
-+ %ENV = %$FCGI::ENV;
++ %ENV = %$FCGI::ENV;
} else {
-- %FCGI::ENV = %ENV;
-+ $FCGI::ENV = {%ENV};
+- %FCGI::ENV = %ENV;
++ $FCGI::ENV = {%ENV};
}
my $rc = Accept($global_request);
- for (keys %FCGI::ENV) {
-- $ENV{$_} = $FCGI::ENV{$_} unless exists $ENV{$_};
+- $ENV{$_} = $FCGI::ENV{$_} unless exists $ENV{$_};
+ for (keys %$FCGI::ENV) {
-+ $ENV{$_} = $FCGI::ENV->{$_} unless exists $ENV{$_};
++ $ENV{$_} = $FCGI::ENV->{$_} unless exists $ENV{$_};
}
-
+
# not SFIO
@@ -313,7 +313,7 @@ sub accept() {
-
+
sub finish() {
warn "finish called as a method; you probably wanted to call Finish" if @_;
- %ENV = %FCGI::ENV if %FCGI::ENV;
+ %ENV = %$FCGI::ENV if defined($FCGI::ENV);
-
+
# not SFIO
if (tied (*STDIN)) {
--
Debian packaging of libfcgi-perl
More information about the Pkg-perl-cvs-commits
mailing list