Commit 0ee0a515 authored by Paul Querna's avatar Paul Querna
Browse files

Fix trailing backslashes in configuration directives. 

PR: 34834
Submitted by: Timo Viipuri <viipuri dlc.fi>
Reviewed by: Paul Querna


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ Changes with Apache 2.1.5 














  [Remove entries to the current 2.0 section below, when backported]



























  *) ap_getword_conf: Fix backslashes at the end of configuration directives. 













     PR 34834. [Timo Viipuri <viipuri dlc.fi>]



























  *) mod_dbd: New additions: mod_dbd.c, mod_dbd.h, mod_dbd.xml















     Provide module hooks for apr_dbd; optimise for httpd















     threaded and non-threaded arch [Nick Kew]

































server/util.c



+5
−2






























Original line number
Diff line number
Diff line








@@ -732,11 +732,14 @@ AP_DECLARE(char *) ap_getword_conf(apr_pool_t *p, const char **line)













    if ((quote = *str) == '"' || quote == '\'') {















        strend = str + 1;















        while (*strend && *strend != quote) {













            if (*strend == '\\' && strend[1] && strend[1] == quote)













            if (*strend == '\\' && strend[1] && 













                (strend[1] == quote || strend[1] == '\\')) {















                strend += 2;













            else













            }













            else {















                ++strend;















            }













        }















        res = substring_conf(p, str + 1, strend - str - 1, quote);































        if (*strend == quote)