You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2021/08/21 21:35:04 UTC
svn commit: r1892511 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
server/util.c
Author: minfrin
Date: Sat Aug 21 21:35:04 2021
New Revision: 1892511
URL: http://svn.apache.org/viewvc?rev=1892511&view=rev
Log:
Backport:
*) core: fix ap_escape_quotes substitution logic
trunk patch: https://svn.apache.org/r1892418
2.4.x patch: svn merge -c 1892418 ^/httpd/httpd/trunk .
+1: covener, rpluem, ylavic
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/util.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1892418
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1892511&r1=1892510&r2=1892511&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Aug 21 21:35:04 2021
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache 2.4.49
+ *) core: fix ap_escape_quotes substitution logic. [Eric Covener]
+
*) Easy patches: synch 2.4.x and trunk
- mod_auth_basic: Use ap_cstr_casecmp instead of strcasecmp.
- mod_ldap: log and abort locking errors.
@@ -14,10 +16,10 @@ Changes with Apache 2.4.49
- core: remove extra whitespace in HTTP_NOT_IMPLEMENTED
[Christophe Jaillet]
- * core/mpm: add hook 'child_stopping` that gets called when the MPM is
- stopping a child process. The additional `graceful` parameter allows
- registered hooks to free resources early during a graceful shutdown.
- [Yann Ylavic, Stefan Eissing]
+ *) core/mpm: add hook 'child_stopping` that gets called when the MPM is
+ stopping a child process. The additional `graceful` parameter allows
+ registered hooks to free resources early during a graceful shutdown.
+ [Yann Ylavic, Stefan Eissing]
*) mod_proxy: Fix icomplete initialization of BalancerMember(s) from the
balancer-manager, which can lead to a crash. [Yann Ylavic]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1892511&r1=1892510&r2=1892511&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Aug 21 21:35:04 2021
@@ -142,11 +142,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- *) core: fix ap_escape_quotes substitution logic
- trunk patch: https://svn.apache.org/r1892418
- 2.4.x patch: svn merge -c 1892418 ^/httpd/httpd/trunk .
- +1: covener, rpluem, ylavic
-
*) Add dav_get_provider(), dav_open_lockdb(), dav_close_lockdb() and
dav_get_resource() to mod_dav.h.
trunk patch: http://svn.apache.org/r1879305
Modified: httpd/httpd/branches/2.4.x/server/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util.c?rev=1892511&r1=1892510&r2=1892511&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/util.c (original)
+++ httpd/httpd/branches/2.4.x/server/util.c Sat Aug 21 21:35:04 2021
@@ -2542,13 +2542,12 @@ AP_DECLARE(char *) ap_escape_quotes(apr_
* in front of every " that doesn't already have one.
*/
while (*inchr != '\0') {
- while ((*inchr == '\\') && (inchr[1] != '\0')) {
- *outchr++ = *inchr++;
- *outchr++ = *inchr++;
- }
if (*inchr == '"') {
*outchr++ = '\\';
}
+ if ((*inchr == '\\') && (inchr[1] != '\0')) {
+ *outchr++ = *inchr++;
+ }
if (*inchr != '\0') {
*outchr++ = *inchr++;
}