httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pgollu...@apache.org
Subject svn commit: r942211 - in /httpd/httpd/branches/2.0.x: ./ CHANGES docs/ docs/conf/mime.types support/apxs.in
Date Fri, 07 May 2010 20:43:34 GMT
Author: pgollucci
Date: Fri May  7 20:43:34 2010
New Revision: 942211

URL: http://svn.apache.org/viewvc?rev=942211&view=rev
Log:
- Backports r942209

As previously discussed with wrowe, treast this the same way roy treats
mime.types


Modified:
    httpd/httpd/branches/2.0.x/   (props changed)
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/docs/   (props changed)
    httpd/httpd/branches/2.0.x/docs/conf/mime.types   (props changed)
    httpd/httpd/branches/2.0.x/support/apxs.in

Propchange: httpd/httpd/branches/2.0.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /httpd/httpd/trunk:942209

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?rev=942211&r1=942210&r2=942211&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Fri May  7 20:43:34 2010
@@ -25,6 +25,9 @@ Changes with Apache 2.0.64
   *) Add Set-Cookie and Set-Cookie2 to the list of headers allowed to pass 
      through on a 304 response.  [Nick Kew]
 
+  *) apxs: Fix -A and -a options to ignore whitespace in httpd.conf
+     [Philip M. Gollucci]
+
 Changes with Apache 2.0.63
 
   *) winnt_mpm: Resolve modperl issues by redirecting console mode stdout

Propchange: httpd/httpd/branches/2.0.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  7 20:43:34 2010
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:675610,692325,703441,703997
+/httpd/httpd/trunk/docs:675610,692325,703441,703997,942209

Propchange: httpd/httpd/branches/2.0.x/docs/conf/mime.types
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  7 20:43:34 2010
@@ -1 +1 @@
-/httpd/httpd/trunk/docs/conf/mime.types:83749-896277
+/httpd/httpd/trunk/docs/conf/mime.types:83749-896277,942209

Modified: httpd/httpd/branches/2.0.x/support/apxs.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/support/apxs.in?rev=942211&r1=942210&r2=942211&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/support/apxs.in (original)
+++ httpd/httpd/branches/2.0.x/support/apxs.in Fri May  7 20:43:34 2010
@@ -548,7 +548,10 @@ if ($opt_i or $opt_e) {
         $c = '#' if ($opt_A);
         foreach $lmd (@lmd) {
             my $what = $opt_A ? "preparing" : "activating";
-            if ($content !~ m|\n#?\s*$lmd|) {
+            my $lmd_re = $lmd;
+            $lmd_re =~ s/\s+/\\s+/g;
+
+            if ($content !~ m|\n#?\s*$lmd_re|) {
                 # check for open <containers>, so that the new LoadModule
                 # directive always appears *outside* of an <container>.
 
@@ -611,7 +614,7 @@ if ($opt_i or $opt_e) {
                 }
             } else {
                 # replace already existing LoadModule line
-                $content =~ s|^(.*\n)#?\s*$lmd[^\n]*\n|$1$c$lmd\n|s;
+                $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s;
             }
             $lmd =~ m|LoadModule\s+(.+?)_module.*|;
             notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]");



Mime
View raw message