apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1183711 - in /apr/apr/branches/1.4.x: ./ CHANGES build/apr_common.m4
Date Sat, 15 Oct 2011 21:07:13 GMT
Author: sf
Date: Sat Oct 15 21:07:12 2011
New Revision: 1183711

URL: http://svn.apache.org/viewvc?rev=1183711&view=rev
Log:
Backport r1183686:

    Fix APR_RESTORE_THE_ENVIRONMENT if the original variable was a single space

    Autoconf selects a POSIX shell for us, so we can get rid of sed, here.

    PR 50334
    Submitted by:  Nathan Phillip Brink <binki gentoo org>


Modified:
    apr/apr/branches/1.4.x/   (props changed)
    apr/apr/branches/1.4.x/CHANGES
    apr/apr/branches/1.4.x/build/apr_common.m4

Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 15 21:07:12 2011
@@ -1,2 +1,2 @@
 /apr/apr/branches/1.5.x:1083592
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,905040,908427,910419,917837-917838,983618,990435,1072165,1078845,1183683,1183685
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,905040,908427,910419,917837-917838,983618,990435,1072165,1078845,1183683,1183685-1183686

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=1183711&r1=1183710&r2=1183711&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Sat Oct 15 21:07:12 2011
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.4.6
 
+  *) configure: Fix APR_RESTORE_THE_ENVIRONMENT if the original variable was
+     a single space. PR 50334. [Nathan Phillip Brink <binki gentoo org>]
+
   *) apr_proc_create: Don't close any of the new stdin/stdout/stderr in the
      child if it already has the correct FD. PR 51995.
      [Dan Ports <drkp csail mit edu>]

Modified: apr/apr/branches/1.4.x/build/apr_common.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/apr_common.m4?rev=1183711&r1=1183710&r2=1183711&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/apr_common.m4 (original)
+++ apr/apr/branches/1.4.x/build/apr_common.m4 Sat Oct 15 21:07:12 2011
@@ -209,7 +209,7 @@ else
   if test "x$apr_ste_save_$1" = "x$$1"; then
     $2$1=
   else
-    $2$1=`echo $$1 | sed -e "s%${apr_ste_save_$1}%%"`
+    $2$1="${$1#"${apr_ste_save_$1}"}"
     $1="$apr_ste_save_$1"
   fi
 fi



Mime
View raw message