Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 23 Sep 2000 12:06:18 -0000
Message-ID: <20000923120618.42854.qmail@locus.apache.org>
From: bjh@locus.apache.org
To: apache-1.3-cvs@apache.org
Subject: cvs commit: apache-1.3/src/os/os2 util_os2.c

bjh         00/09/23 05:06:17

  Modified:    src/os/os2 util_os2.c
  Log:
  OS/2: Consider partial UNC paths "//" and "//server" to be valid in
  ap_os_canonical_filename().
  
  Revision  Changes    Path
  1.9       +8 -1      apache-1.3/src/os/os2/util_os2.c
  
  Index: util_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/os2/util_os2.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- util_os2.c	2000/03/19 16:15:35	1.8
  +++ util_os2.c	2000/09/23 12:06:16	1.9
  @@ -18,7 +18,14 @@
       
       if (len > 3 && buf[len-1] == '/')
           buf[--len] = 0;
  -      
  +
  +    if (buf[0] == '/' && buf[1] == '/') {
  +        /* A UNC path */
  +        if (strchr(buf+2, '/') == NULL) {  /* Allow // or //server */
  +            return ap_pstrdup(pPool, buf);
  +        }
  +    }
  +
       rc = DosQueryPathInfo(buf, FIL_QUERYFULLNAME, buf2, HUGE_STRING_LEN);
   
       if (rc) {