httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/server config.c
Date Fri, 16 Jul 2004 20:30:43 GMT
bnicholes    2004/07/16 13:30:43

  Modified:    os/netware pre_nw.h
               server   config.c
  Log:
  Allocate memory from the temp_pool rather than the stack to avoid blowing fixed length stacks
while evaluating  nested includes
  
  Revision  Changes    Path
  1.7       +3 -0      httpd-2.0/os/netware/pre_nw.h
  
  Index: pre_nw.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/netware/pre_nw.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pre_nw.h	9 Feb 2004 20:40:48 -0000	1.6
  +++ pre_nw.h	16 Jul 2004 20:30:43 -0000	1.7
  @@ -60,6 +60,9 @@
   /* Allow MOD_AUTH_DBM to use APR */
   #define AP_AUTH_DBM_USE_APR
   
  +/* Restrict the number of nested includes */
  +#define AP_MAX_INCLUDE_DEPTH    48
  +
   #endif
   
   
  
  
  
  1.180     +1 -1      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.179
  retrieving revision 1.180
  diff -u -r1.179 -r1.180
  --- config.c	14 Jul 2004 07:25:25 -0000	1.179
  +++ config.c	16 Jul 2004 20:30:43 -0000	1.180
  @@ -1100,7 +1100,7 @@
   {
       ap_directive_t *current = *conftree;
       ap_directive_t *curr_parent = NULL;
  -    char l[MAX_STRING_LEN];
  +    char *l = apr_palloc (temp_pool, MAX_STRING_LEN);
       const char *errmsg;
   
       if (current != NULL) {
  
  
  

Mime
View raw message