You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2010/05/10 22:02:57 UTC
svn commit: r942882 - in /httpd/httpd/branches/2.2.x: ./ STATUS
support/apxs.in
Author: sf
Date: Mon May 10 20:02:56 2010
New Revision: 942882
URL: http://svn.apache.org/viewvc?rev=942882&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.2.x/ (props changed)
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/support/apxs.in
Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 10 20:02:56 2010
@@ -1 +1 @@
-/httpd/httpd/trunk:395552,451572,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,678761,680082,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219,734710,743589,755190,756671,756675,756678,756683,757741,761329,763394,764239,768535,769809,771587,771610,776325,777042,777091,778438-778439,778531,778942,780648,780655,780692,780697,780699,785661,790587,803704,823536,823563,891282,942209
+/httpd/httpd/trunk:395552,451572,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,678761,680082,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219,734710,743589,755190,756671,756675,756678,756683,757741,761329,763394,764239,768535,769809,771587,771610,776325,777042,777091,778438-778439,778531,778942,780648,780655,780692,780697,780699,785661,790587,803704,823536,823563,891282,932791,942209
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=942882&r1=942881&r2=942882&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon May 10 20:02:56 2010
@@ -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 ]
Modified: httpd/httpd/branches/2.2.x/support/apxs.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/apxs.in?rev=942882&r1=942881&r2=942882&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/apxs.in (original)
+++ httpd/httpd/branches/2.2.x/support/apxs.in Mon May 10 20:02:56 2010
@@ -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 '') {