httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dean Gaudet <dgau...@arctic.org>
Subject [PATCH] 1.2.2: cvs commit: apache/src http_request.c (fwd)
Date Fri, 01 Aug 1997 08:02:31 GMT
This should go into 1.2.2 as well.  Anyone want to try to pursue some of
those people with weird problems that we figured were just local config
problems?  If any of our modules have non-idempotent merging functions,
this bug could potentially cause weird config things to happen.  Quite
annoying. 

Dean

---------- Forwarded message ----------
Date: Fri, 1 Aug 1997 01:01:22 -0700 (PDT)
From: Dean Gaudet <dgaudet@hyperreal.org>
Reply-To: new-httpd@apache.org
To: apache-cvs@hyperreal.org
Subject: cvs commit: apache/src http_request.c

dgaudet     97/08/01 01:01:22

  Modified:    src       http_request.c
  Log:
  Fix a bug introduced by a bug fix during the 1.2 betas: if there are
  multiple <Directory>s that match, all are applied... that's the bug that
  was fixed during 1.2bX.  But it didn't reset this_conf to NULL, so as
  soon as one match was found, it would be merged over and over again.
  
  Revision  Changes    Path
  1.67      +2 -1      apache/src/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_request.c,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- http_request.c	1997/07/20 18:52:41	1.66
  +++ http_request.c	1997/08/01 08:01:21	1.67
  @@ -349,7 +349,7 @@
           core_dir_config *core_dir =
   	  (core_dir_config *)get_module_config(per_dir_defaults, &core_module);
   	int overrides_here;
  -        void *this_conf = NULL, *htaccess_conf = NULL;
  +        void *this_conf, *htaccess_conf = NULL;
   	char *test_dirname_tail;
   	int j;
   
  @@ -380,6 +380,7 @@
   	      (core_dir_config *)get_module_config(entry_config, &core_module);
   	    entry_dir = entry_core->d;
   	
  +	    this_conf = NULL;
   	    if (entry_core->r) {
   		if (!regexec(entry_core->r, test_dirname, 0, NULL,
   			     (j == num_sec) ? 0 : REG_NOTEOL)) {
  
  
  


Mime
View raw message