Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 30 Sep 2002 11:17:40 -0000
Message-ID: <20020930111740.60126.qmail@icarus.apache.org>
From: martin@apache.org
To: apache-1.3-cvs@apache.org
Subject: cvs commit: apache-1.3/src/main http_config.c

martin      2002/09/30 04:17:40

  Modified:    src/main http_config.c
  Log:
  Make sure that we indeed had a '/' in the pattern.
  
  Revision  Changes    Path
  1.165     +1 -3      apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- http_config.c	25 Sep 2002 22:52:45 -0000	1.164
  +++ http_config.c	30 Sep 2002 11:17:40 -0000	1.165
  @@ -1244,8 +1244,7 @@
   	char *path = ap_pstrdup(p,fname);
   	char *pattern = NULL;
   
  -        if(ispatt) {
  -	    pattern = strrchr(path, '/');
  +        if(ispatt && (pattern = strrchr(path, '/')) != NULL) {
               *pattern++ = '\0';
               if (ap_is_fnmatch(path)) {
                   fprintf(stderr, "%s: wildcard patterns not allowed in Include "
  @@ -1263,7 +1262,6 @@
                           "for Include %s\n", ap_server_argv0, fname);
                   exit(1);
               }
  -
           }