[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-modperl-cvs
Subject:    cvs commit: modperl/src/modules/perl perl_config.c
From:       dougm () apache ! org
Date:       2002-03-24 20:45:18
[Download RAW message or body]

dougm       02/03/24 12:45:18

  Modified:    .        Changes STATUS
               src/modules/perl perl_config.c
  Log:
  Submitted by:   Salvador Ortiz Garcia <sog@msg.com.mx>
  Reviewed by:	dougm
  fix multiple %LocationMatch in <Perl> sections bug
  
  Revision  Changes    Path
  1.630     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.629
  retrieving revision 1.630
  diff -u -r1.629 -r1.630
  --- Changes	24 Mar 2002 19:06:03 -0000	1.629
  +++ Changes	24 Mar 2002 20:45:17 -0000	1.630
  @@ -10,6 +10,9 @@
   
   =item 1.26_01-dev
   
  +fix multiple %LocationMatch in <Perl> sections bug
  +[Salvador Ortiz Garcia <sog@msg.com.mx>]
  +
   rip -D_GNU_SOURCE out of Perl 5.7.3+'s ccflags, which modperl doesn't
   need and apache won't compile with [Stas Bekman <stas@stason.org>]
   
  
  
  
  1.6       +1 -7      modperl/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/modperl/STATUS,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- STATUS	24 Mar 2002 18:22:56 -0000	1.5
  +++ STATUS	24 Mar 2002 20:45:17 -0000	1.6
  @@ -1,5 +1,5 @@
   mod_perl 1.3 STATUS:
  -   Last modified at [$Date: 2002/03/24 18:22:56 $]
  +   Last modified at [$Date: 2002/03/24 20:45:17 $]
   
   
   Release:
  @@ -20,12 +20,6 @@
           Report: http://marc.theaimsgroup.com/?l=apache-modperl&m=97449481013350&w=2
   	Status: 
             doc patch at http://marc.theaimsgroup.com/?l=apache-modperl&m=97450363501652&w=2
  -
  -    * %LocationMatch <Perl> bug
  -        Report: http://marc.theaimsgroup.com/?l=apache-modperl&m=98260537428737&w=2
  -	Status:
  -          may be fixed here
  -            http://marc.theaimsgroup.com/?l=apache-modperl&m=101366182205497&w=2
   
       * PVIV issues
           Report: http://marc.theaimsgroup.com/?l=apache-modperl&m=99905070209305&w=2
  
  
  
  1.112     +6 -3      modperl/src/modules/perl/perl_config.c
  
  Index: perl_config.c
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/perl_config.c,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- perl_config.c	11 Jul 2001 03:02:26 -0000	1.111
  +++ perl_config.c	24 Mar 2002 20:45:17 -0000	1.112
  @@ -1166,6 +1166,8 @@
       char *tmpkey; 
       I32 tmpklen; 
       SV *tmpval;
  +    void *old_info = cmd->info;
  +
       (void)hv_iterinit(hv); 
       while ((tmpval = hv_iternextsv(hv, &tmpkey, &tmpklen))) { 
   	char line[MAX_STRING_LEN]; 
  @@ -1195,6 +1197,9 @@
   	if(errmsg)
   	    log_printf(cmd->server, "<Perl>: %s", errmsg);
       }
  +
  +    cmd->info = old_info;
  +
       /* Emulate the handling of end token for the section */ 
       perl_set_config_vectors(cmd, cfg, &core_module);
   } 
  @@ -1511,9 +1516,7 @@
       void *dummy = perl_set_config_vectors(cmd, config, &core_module);
       void *old_info = cmd->info;
   
  -    if (strstr(key, "Match")) {
  -	cmd->info = (void*)key;
  -    }
  +    cmd->info = (void *)strstr(key, "Match");
   
       if(strnEQ(key, "Location", 8))
   	perl_urlsection(cmd, dummy, hv);
  
  
  
[prev in list] [next in list] [prev in thread] [next in thread]