httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_ext_filter.c
Date Mon, 20 Jan 2003 23:02:47 GMT
trawick     2003/01/20 15:02:47

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/filters Tag: APACHE_2_0_BRANCH mod_ext_filter.c
  Log:
  merge the fix for PR 15491 to the stable 2.0 branch
  (mod_ext_filter problem parsing some types of commands)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.18 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.17
  retrieving revision 1.988.2.18
  diff -u -r1.988.2.17 -r1.988.2.18
  --- CHANGES	18 Jan 2003 15:15:44 -0000	1.988.2.17
  +++ CHANGES	20 Jan 2003 23:02:45 -0000	1.988.2.18
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.45
   
  +  *) mod_ext_filter: Fix a problem building argument lists which 
  +     occasionally caused exec to fail.  PR 15491.  [Jeff Trawick]
  +
   Changes with Apache 2.0.44
   
     *) mod_autoindex: Bring forward the IndexOptions IgnoreCase option
  
  
  
  1.751.2.45 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.44
  retrieving revision 1.751.2.45
  diff -u -r1.751.2.44 -r1.751.2.45
  --- STATUS	20 Jan 2003 21:54:39 -0000	1.751.2.44
  +++ STATUS	20 Jan 2003 23:02:46 -0000	1.751.2.45
  @@ -74,11 +74,6 @@
         -1: brianp (we need a more robust solution than what's in 2.1 right now),
             jerenkrantz (should be fixed, but I don't have time to do this)
   
  -    * Fix mod_ext_filter to properly NULL-terminate an array of args
  -      for some forms of ExtFilterDefine.  PR 15491.  This is r1.2 of
  -      modules/filters/mod_ext_filter.c.
  -      +1: trawick, jerenkrantz, wrowe, gregames
  -
       * Use different ulimit commands in apachectl on Tru64 and AIX.
         On both platforms, there are situations where problems with the
         default command won't be found at configure time.  The changes
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +3 -2      httpd-2.0/modules/filters/mod_ext_filter.c
  
  Index: mod_ext_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_ext_filter.c,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- mod_ext_filter.c	14 Nov 2002 20:22:50 -0000	1.1
  +++ mod_ext_filter.c	20 Jan 2003 23:02:47 -0000	1.1.2.1
  @@ -222,9 +222,10 @@
       else
       {
           /* simple path */
  -        /* Allocate space for one argv pointer and parse the args. */
  -        filter->args = (char **)apr_palloc(p, sizeof(char *));
  +        /* Allocate space for two argv pointers and parse the args. */
  +        filter->args = (char **)apr_palloc(p, 2 * sizeof(char *));
           filter->args[0] = ap_getword_white(p, args);
  +        filter->args[1] = NULL; /* end of args */
       }
       if (!filter->args[0]) {
           return "Invalid cmd= parameter";
  
  
  

Mime
View raw message