Commit 13fe1784 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393087 13f79535-47bb-0310-9956-ffa450edef68
parent 2cdf62e1

CHANGES

+0 −3
Changes for CHANGES: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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]


































server/protocol.c



+2
−4



























Changes for server/protocol.c: 2 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -518,11 +518,9 @@ AP_CORE_DECLARE(void) ap_parse_uri(request_rec *r, const char *uri)







            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.