diff options
| author | Christophe Jaillet <jailletc36@apache.org> | 2022-02-24 20:37:08 +0000 |
|---|---|---|
| committer | Christophe Jaillet <jailletc36@apache.org> | 2022-02-24 20:37:08 +0000 |
| commit | 4a0e77df1e16a258a47d468bea7f2b24edca6c05 (patch) | |
| tree | 2a22cfb5979d9087132f59cf162cf1458af4eacb /server | |
| parent | bc00cf5743dac43dda4d47c61552ce4e3b539ae5 (diff) | |
| download | httpd-4a0e77df1e16a258a47d468bea7f2b24edca6c05.tar.gz | |
Merge r1881379, r1892422, r1893011, r1897270, r1897271 from trunk
Easy patches: synch 2.4.x and trunk
- mod_ssl: Fix a few warnings on 64 bits windows compilation
- ap_escape_quotes(): Remove unneeded checks to improve performance
- test/time-sem.c: unlock the accept mutex before exiting (error conditions)
- mod_ext_filter: Fix a spurious -1 used as a APR_SIZE_T_FMT in an error message
- mod_sed: fix some format string (s/lld/APR_INT64_T_FMT/)
Submitted by: jailletc36, rpluem, ylavic, jailletc36, jailletc36
Reviewed by: jailletc36, icing, rpluem
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898391 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/util.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/server/util.c b/server/util.c index 1dc512b1d4..424a28a59f 100644 --- a/server/util.c +++ b/server/util.c @@ -2548,7 +2548,7 @@ AP_DECLARE(char *) ap_escape_quotes(apr_pool_t *p, const char *instring) * If we find a slosh, and it's not the last byte in the string, * it's escaping something - advance past both bytes. */ - if ((*inchr == '\\') && (inchr[1] != '\0')) { + else if ((*inchr == '\\') && (inchr[1] != '\0')) { inchr++; newlen++; } @@ -2565,12 +2565,10 @@ AP_DECLARE(char *) ap_escape_quotes(apr_pool_t *p, const char *instring) if (*inchr == '"') { *outchr++ = '\\'; } - if ((*inchr == '\\') && (inchr[1] != '\0')) { - *outchr++ = *inchr++; - } - if (*inchr != '\0') { + else if ((*inchr == '\\') && (inchr[1] != '\0')) { *outchr++ = *inchr++; } + *outchr++ = *inchr++; } *outchr = '\0'; return outstring; |