*) maintainer mode fix for util.c no2slash_ex

     trunk patch: http://svn.apache.org/r1855755
     2.4.x patch svn merge -c 1855755 ^/httpd/httpd/trunk .
     +1: covener, rpluem, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855853 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index ffe5d22550c11c24cc1325160ea66dc568cfc64e..1f8cb2f7884e0e7ebabbdc8d7a3905c84a4133c2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -126,12 +126,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) maintainer mode fix for util.c no2slash_ex
-     trunk patch: http://svn.apache.org/r1855755
-     2.4.x patch svn merge -c 1855755 ^/httpd/httpd/trunk .
-     +1: covener, rpluem, jim, ylavic
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/server/util.c b/server/util.c
index f3b17f1581eaecb6f80d9baeaf63d04086c6ae79..e0c558cee2dd51a295b310fdc1e5411814e3830a 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -566,7 +566,7 @@ AP_DECLARE(void) ap_no2slash_ex(char *name, int is_fs_path)
 
     char *d, *s;
 
-    if (!name || !*name) {
+    if (!*name) {
         return;
     }