From: Stefan Fritsch <sf@apache.org>
Date: Mon, 10 May 2010 20:02:56 +0000 (+0000)
Subject: Merge r932791 from trunk:
X-Git-Tag: 2.2.16~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae5d58a8bbcf5d08d1f3da72ebe015b74223d20c;p=thirdparty%2Fapache%2Fhttpd.git

Merge r932791 from trunk:

Update apxs for perl 5.12: Remove useless use of $[, which is now deprecated.

Submitted by: Roderich Schupp <roderich schupp googlemail com>
Reviewed by: sf, trawick, pgollucci


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@942882 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index ed33b5a3ea7..c73f73692b4 100644
--- a/STATUS
+++ b/STATUS
@@ -86,10 +86,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * Update apxs for perl 5.12
-    Trunk patch: http://svn.apache.org/viewvc?rev=932791&view=rev
-    2.2.x patch: trunk patch works
-    +1: sf, trawick, pgollucci
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/support/apxs.in b/support/apxs.in
index adf4efd6a1c..1900a787bca 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -83,7 +83,6 @@ sub Getopts {
     my ($argumentative, @ARGV) = @_;
     my $errs = 0;
     local $_;
-    local $[ = 0;
 
     my @args = split / */, $argumentative;
     while (@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) {
@@ -93,7 +92,7 @@ sub Getopts {
             last;
         }
         my $pos = index($argumentative,$first);
-        if ($pos >= $[) {
+        if ($pos >= 0) {
             if ($pos < $#args && $args[$pos+1] eq ':') {
                 shift @ARGV;
                 if ($rest eq '') {