From 7fc429cc85e865066840570eede8169abc3d7160 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Tue, 19 Mar 2019 18:01:21 +0000 Subject: [PATCH] *) 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 --- STATUS | 6 ------ server/util.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/STATUS b/STATUS index ffe5d22550c..1f8cb2f7884 100644 --- 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 f3b17f1581e..e0c558cee2d 100644 --- 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; } -- 2.47.3