httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r416291 - in /httpd/httpd/trunk: CHANGES modules/arch/win32/mod_isapi.c
Date Thu, 22 Jun 2006 08:00:40 GMT
Author: wrowe
Date: Thu Jun 22 01:00:40 2006
New Revision: 416291

URL: http://svn.apache.org/viewvc?rev=416291&view=rev
Log:

  Stop appending a backslash if some trailing slash is present.

  For cross platform isapi we aught to find out what to add from
  apr, slash or backslash, but can't think of the trivial answer 
  at this hour.

PR: 15993

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/arch/win32/mod_isapi.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=416291&r1=416290&r2=416291&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Jun 22 01:00:40 2006
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) mod_isapi: Avoid double trailing slashes in HSE_REQ_MAP_URL_TO_PATH
+     support (although this needs a bit more elegance for cross platform
+     isapi handling.)  PR 15993  [William Rowe]
+
   *) mod_isapi: Handle "HTTP/1.1 200 OK" style status lines correctly, the
      token parser worked while the resulting length was misinterpreted.
      PR 29098 [Brock Bland <bbland serena.com>]

Modified: httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/win32/mod_isapi.c?rev=416291&r1=416290&r2=416291&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/win32/mod_isapi.c (original)
+++ httpd/httpd/trunk/modules/arch/win32/mod_isapi.c Thu Jun 22 01:00:40 2006
@@ -960,9 +960,10 @@
         len = apr_cpystrn(file, subreq->filename, *buf_size) - file;
 
 
-        /* IIS puts a trailing slash on directories, Apache doesn't */
+        /* IIS puts a trailing slash on directories, Apache may not */
         if (subreq->finfo.filetype == APR_DIR) {
-            if (len < *buf_size - 1) {
+            if ((len < *buf_size - 1) && (file[len - 1] != '/') 
+                                      && (file[len - 1] != '\\')) {
                 file[len++] = '\\';
                 file[len] = '\0';
             }



Mime
View raw message