svn commit: r393087 - in /httpd/httpd/trunk: CHANGES server/protocol.c

[rp...@apache.org]

Author: rpluem
Date: Mon Apr 10 15:07:02 2006
New Revision: 393087

URL: http://svn.apache.org/viewcvs?rev=393087&view=rev
Log:
* Rollback r393037 as this was vetoed by wrowe. Details see
  http://mail-archives.apache.org/mod_mbox/httpd-dev/200604.mbox/%3c443ABE65.1060603@rowe-clan.net%3e

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/protocol.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=393087&r1=393086&r2=393087&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Apr 10 15:07:02 2006
@@ -2,9 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) core: Set the path of a parsed uri in a request to "/" if the path is
-     NULL. PR 39259. [Davi Arnaut <davi haxent.com.br>]
-
   *) htdbm: Warn the user when adding a plaintext password on a platform
      where it wouldn't work with the server (i.e., anywhere that has
      crypt()).  [Jeff Trawick]

Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/protocol.c?rev=393087&r1=393086&r2=393087&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Mon Apr 10 15:07:02 2006
@@ -518,11 +518,9 @@
             r->hostname = r->parsed_uri.hostname;
         }
 
-        if (r->parsed_uri.path == NULL)
-            r->parsed_uri.path = apr_pstrdup(r->pool, "/");
-
         r->args = r->parsed_uri.query;
-        r->uri = r->parsed_uri.path;
+        r->uri = r->parsed_uri.path ? r->parsed_uri.path
+                 : apr_pstrdup(r->pool, "/");
 
 #if defined(OS2) || defined(WIN32)
         /* Handle path translations for OS/2 and plug security hole.