Return-Path: 
 <cvs-return-25230-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 76947 invoked from network); 22 Jun 2006 08:01:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 22 Jun 2006 08:01:03 -0000
Received: (qmail 30684 invoked by uid 500); 22 Jun 2006 08:01:02 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 30642 invoked by uid 500); 22 Jun 2006 08:01:02 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 30631 invoked by uid 99); 22 Jun 2006 08:01:01 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jun 2006 01:01:01 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jun 2006 01:01:01 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4184F1A983A; Thu, 22 Jun 2006 01:00:41 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r416291 - in /httpd/httpd/trunk: CHANGES
 modules/arch/win32/mod_isapi.c
Date: Thu, 22 Jun 2006 08:00:40 -0000
To: cvs@httpd.apache.org
From: wrowe@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060622080041.4184F1A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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';
             }