You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2014/03/12 12:50:49 UTC
svn commit: r1576706 - in /httpd/httpd/branches/2.2.x: ./ STATUS
modules/dav/main/util.c
Author: rpluem
Date: Wed Mar 12 11:50:49 2014
New Revision: 1576706
URL: http://svn.apache.org/r1576706
Log:
Merge r1556428 from trunk:
mod_dav: Keep track of length of cdata properly when removing leading spaces.
* modules/dav/main/util.c
(dav_xml_get_cdata): reduce len variable when increasing cdata pointer.
Submitted by: Amin Tora <Amin.Tora neustar.biz>
Reviewed by: breser, rpluem, gstein, wrowe
Modified:
httpd/httpd/branches/2.2.x/ (props changed)
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/dav/main/util.c
Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1556428
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1576706&r1=1576705&r2=1576706&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Mar 12 11:50:49 2014
@@ -98,11 +98,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_dav: Fix string length calculation in dav_xml_get_cdata()
- trunk patch: https://svn.apache.org/r1556428
- 2.2.x: trunk patch applies aka `svn merge -c 1556428 ^/httpd/httpd/trunk`
- +1: breser, rpluem, gstein, wrowe
-
*) core: draft-ietf-httpbis-p1-messaging-23 corrections regarding
TE/CL conflicts. [Yann Ylavic <ylavic.dev gmail com>, Jim Jagielski]
trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1524192
Modified: httpd/httpd/branches/2.2.x/modules/dav/main/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/main/util.c?rev=1576706&r1=1576705&r2=1576706&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/dav/main/util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/dav/main/util.c Wed Mar 12 11:50:49 2014
@@ -372,8 +372,10 @@ DAV_DECLARE(const char *) dav_xml_get_cd
if (strip_white) {
/* trim leading whitespace */
- while (apr_isspace(*cdata)) /* assume: return false for '\0' */
+ while (apr_isspace(*cdata)) { /* assume: return false for '\0' */
++cdata;
+ --len;
+ }
/* trim trailing whitespace */
while (len-- > 0 && apr_isspace(cdata[len]))