Hi,
Le 17/08/2016 à 01:17, [email protected] a écrit :
Author: ylavic
Date: Tue Aug 16 23:17:46 2016
New Revision: 1756560
URL: http://svn.apache.org/viewvc?rev=1756560&view=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&r1=1756559&r2=1756560&view=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
- "<C:%s/>" DEBUG_CR,
- err->namespace, err->tagname);
+ if (err->childtags) {
+ if (err->namespace != NULL) {
+ ap_rprintf(r,
+ " xmlns:C=\"%s\">" DEBUG_CR
+ "<C:%s>%s</C:%s>" DEBUG_CR,
+ err->namespace,
+ err->tagname, err->childtags, err->tagname);
+ }
+ else {
+ ap_rprintf(r,
+ ">" DEBUG_CR
+ "<D:%s>%s<D:%s>" DEBUG_CR,
Shouldn't this be:
"<D:%s>%s</D:%s>" DEBUG_CR,
in order to close the D tag?
+ err->tagname, err->childtags, err->tagname);
+ }
}
else {
- ap_rprintf(r,
- ">" DEBUG_CR
- "<D:%s/>" DEBUG_CR, err->tagname);
+ if (err->namespace != NULL) {
+ ap_rprintf(r,
+ " xmlns:C=\"%s\">" DEBUG_CR
+ "<C:%s/>" DEBUG_CR,
+ err->namespace, err->tagname);
+ }
+ else {
+ ap_rprintf(r,
+ ">" DEBUG_CR
+ "<D:%s/>" 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
