httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1427067 - in /httpd/httpd/branches/2.4.x: ./ STATUS build/config_vars.sh.in
Date Mon, 31 Dec 2012 10:10:54 GMT
Author: rjung
Date: Mon Dec 31 10:10:54 2012
New Revision: 1427067

URL: http://svn.apache.org/viewvc?rev=1427067&view=rev
Log:
Widen strip pattern in config_vars.sh to also
match MOD_XML2ENC_LDADD. This was the first
module with digits in its name.

Submitted by: rjung
Backported by: rjung
Reviewed by: rjung, covener, fuankg

Backport of r1426975 from trunk.

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/build/config_vars.sh.in

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1426975

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1427067&r1=1427066&r2=1427067&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Dec 31 10:10:54 2012
@@ -172,13 +172,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: covener 
          also valid if you opt to remove APLOGNO altogether
 
-   * config_vars.mk: Widen strip pattern in config_vars.sh to also
-     match MOD_XML2ENC_LDADD. This was the first module with digits
-     in its name.
-     trunk patch: http://svn.apache.org/viewvc?rev=1426975&view=rev
-     2.4.x patch: trunk patch works
-     +1: rjung, covener, fuankg
-
 A list of further possible backports can be found at:
     http://people.apache.org/~rjung/patches/possible-backports-httpd-trunk-2_4.txt
 If you want to propose one of those, please still add them here.

Modified: httpd/httpd/branches/2.4.x/build/config_vars.sh.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/config_vars.sh.in?rev=1427067&r1=1427066&r2=1427067&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/config_vars.sh.in (original)
+++ httpd/httpd/branches/2.4.x/build/config_vars.sh.in Mon Dec 31 10:10:54 2012
@@ -42,7 +42,7 @@ test -n "@APU_CONFIG@" && APU_INCLUDEDIR
 installbuilddir="@exp_installbuilddir@"
 
 exec sed "
-/^[A-Z_]*_LDADD/d
+/^[A-Z0-9_]*_LDADD/d
 /MPM_LIB/d
 /APACHECTL_ULIMIT/d
 /[a-z]*_LTFLAGS/d



Mime
View raw message