Re: svn commit: r1756560 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS include/ap_mmn.h modules/dav/main/mod_dav.c modules/dav/main/mod_dav.h

[Yann Ylavic]

On Wed, Aug 17, 2016 at 6:58 AM, Marion & Christophe JAILLET
 wrote:
>> +if (err->childtags) {
>> +if (err->namespace != NULL) {
>> +ap_rprintf(r,
>> +" xmlns:C=\"%s\">" DEBUG_CR
>> +"%s" DEBUG_CR,
>> +err->namespace,
>> +err->tagname, err->childtags, err->tagname);
>> +}
>> +else {
>> +ap_rprintf(r,
>> +">" DEBUG_CR
>> +"%s" DEBUG_CR,
>
> Shouldn't this be:
> "%s" DEBUG_CR,
> in order to close the D tag?

Of course..
Fixed in r1756611, and backport (follow up) proposed for 2.4.x in r1756613.

Thanks Christophe,
Yann.

Re: svn commit: r1756560 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS include/ap_mmn.h modules/dav/main/mod_dav.c modules/dav/main/mod_dav.h

[Marion & Christophe JAILLET]

Hi,


Le 17/08/2016 à 01:17, yla...@apache.org a écrit :

Author: ylavic
Date: Tue Aug 16 23:17:46 2016
New Revision: 1756560

URL: http://svn.apache.org/viewvc?rev=1756560=rev
Log:
Merge r1746207 from trunk:

mod_dav: Add support for childtags to dav_error.

Submitted by: minfrin
Reviewed by: minfrin, jim, 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/include/ap_mmn.h
 httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c
 httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.h

[...]

Modified: httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c
URL: 
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c?rev=1756560=1756559=1756560=diff
==
--- httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c Tue Aug 16 23:17:46 
2016
@@ -364,16 +364,33 @@ static int dav_error_response_tag(reques
  ap_rputs(" xmlns:m=\"http://apache.org/dav/xmlns\";, r);
  }
  
-if (err->namespace != NULL) {

-ap_rprintf(r,
-   " xmlns:C=\"%s\">" DEBUG_CR
-   "" DEBUG_CR,
-   err->namespace, err->tagname);
+if (err->childtags) {
+if (err->namespace != NULL) {
+ap_rprintf(r,
+" xmlns:C=\"%s\">" DEBUG_CR
+"%s" DEBUG_CR,
+err->namespace,
+err->tagname, err->childtags, err->tagname);
+}
+else {
+ap_rprintf(r,
+">" DEBUG_CR
+"%s" DEBUG_CR,

Shouldn't this be:
"%s" DEBUG_CR,
in order to close the D tag?


+err->tagname, err->childtags, err->tagname);
+}
  }
  else {
-ap_rprintf(r,
-   ">" DEBUG_CR
-   "" DEBUG_CR, err->tagname);
+if (err->namespace != NULL) {
+ap_rprintf(r,
+" xmlns:C=\"%s\">" DEBUG_CR
+"" DEBUG_CR,
+err->namespace, err->tagname);
+}
+else {
+ap_rprintf(r,
+">" DEBUG_CR
+"" DEBUG_CR, err->tagname);
+}
  }
  
  /* here's our mod_dav specific tag: */

[...

CJ

---
L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel 
antivirus Avast.
https://www.avast.com/antivirus