httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/src/support apxs.pl
Date Sun, 06 Feb 2000 13:16:03 GMT
rse         00/02/06 05:16:02

  Modified:    src      CHANGES
               src/support apxs.pl
  Log:
  Fix handling of multiple queries in APXS commands (e.g. "apxs -q
  CC CFLAGS") and make sure Perl-related command line options (which
  can contain the "::" constructs) do no longer cause an incorrect
  internal parsing of the query result.
  
  Submitted by: Ralf S. Engelschall
  Hints by: Steve Robb <steve@eu.c2.net>
  
  Revision  Changes    Path
  1.1512    +6 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1511
  retrieving revision 1.1512
  diff -u -r1.1511 -r1.1512
  --- CHANGES	2000/02/05 14:28:54	1.1511
  +++ CHANGES	2000/02/06 13:15:59	1.1512
  @@ -1,5 +1,11 @@
   Changes with Apache 1.3.12
   
  +  *) Fix handling of multiple queries in APXS commands (e.g. "apxs -q
  +     CC CFLAGS") and make sure Perl-related command line options (which
  +     can contain the "::" constructs) do no longer cause an incorrect
  +     internal parsing of the query result.
  +     [Ralf S. Engelschall, Steve Robb <steve@eu.c2.net>]
  +
     *) Avoid infinite looping in APACI's configure script
        inside Ultrix' /bin/sh5 upgrade step.
        [Jan Gallo <gallo@viapvt.sk>, Ralf S. Engelschall] PR#4940
  
  
  
  1.32      +3 -3      apache-1.3/src/support/apxs.pl
  
  Index: apxs.pl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- apxs.pl	1999/12/16 16:10:30	1.31
  +++ apxs.pl	2000/02/06 13:16:02	1.32
  @@ -297,7 +297,7 @@
           )) {
               if ($arg eq $name or $arg eq lc($name)) {
                   my $val = eval "\$CFG_$name";
  -                $result .= "${val}::";
  +                $result .= "${val}##";
                   $ok = 1;
               }
           }
  @@ -306,8 +306,8 @@
               exit(1);
           }
       }
  -    $result =~ s|::$||;
  -    $result =~ s|::| |;
  +    $result =~ s|##$||;
  +    $result =~ s|##| |g;
       print $result;
   }
   
  
  
  

Mime
View raw message