Commit 689f1698 authored by Philip M. Gollucci's avatar Philip M. Gollucci
Browse files

- Backports r942209 

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



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@942211 13f79535-47bb-0310-9956-ffa450edef68
parent 4e9d432c

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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

support/apxs.in

+5 −2
Changes for support/apxs.in: 5 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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]");