You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/01/09 15:29:47 UTC
svn commit: r1556816 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/dav/main/util.c
Author: jim
Date: Thu Jan 9 14:29:47 2014
New Revision: 1556816
URL: http://svn.apache.org/r1556816
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: breser
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/dav/main/util.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1556428
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1556816&r1=1556815&r2=1556816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Jan 9 14:29:47 2014
@@ -104,10 +104,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4.x patch: trunk works, + CHANGES
+1: covener, druggeri, trawick
- * mod_dav: Fix string length calculation in dav_xml_get_cdata()
- trunk patch: https://svn.apache.org/r1556428
- 2.4.x: trunk patch applies aka `svn merge -c 1556428 ^/httpd/httpd/trunk`
- +1: breser, trawick, covener
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/dav/main/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/main/util.c?rev=1556816&r1=1556815&r2=1556816&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/dav/main/util.c (original)
+++ httpd/httpd/branches/2.4.x/modules/dav/main/util.c Thu Jan 9 14:29:47 2014
@@ -396,8 +396,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]))