Date: 28 Aug 1999 02:34:38 -0000
Message-ID: <19990828023438.5463.qmail@hyperreal.org>
From: stoddard@hyperreal.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/main http_config.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

stoddard    99/08/27 19:34:38

  Modified:    src/main http_config.c
  Log:
  Fix merge bug
  
  Revision  Changes    Path
  1.8       +1 -0      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- http_config.c	1999/08/27 23:47:09	1.7
  +++ http_config.c	1999/08/28 02:34:37	1.8
  @@ -1119,6 +1119,7 @@
                             "access to be safe");
               return HTTP_FORBIDDEN;
           }
  +    }
   
   /* cache it */
       new = ap_palloc(r->pool, sizeof(struct htaccess_result));