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 2016/05/30 22:38:38 UTC
svn commit: r1746207 - in /httpd/httpd/trunk: CHANGES include/ap_mmn.h
modules/dav/main/mod_dav.c modules/dav/main/mod_dav.h
Author: minfrin
Date: Mon May 30 22:38:23 2016
New Revision: 1746207
URL: http://svn.apache.org/viewvc?rev=1746207&view=rev
Log:
mod_dav: Add support for childtags to dav_error.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/modules/dav/main/mod_dav.c
httpd/httpd/trunk/modules/dav/main/mod_dav.h
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1746207&r1=1746206&r2=1746207&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon May 30 22:38:23 2016
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) mod_dav: Add support for childtags to dav_error.
+ [Jari Urpalainen <jari.urpalainen nokia.com>]
+
*) abs: include OpenSSL_Applink when compiling on Visual Studio 2015
and up. PR59630 [Jan Ehrhardt <phpdev ehrhardt.nl>]
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1746207&r1=1746206&r2=1746207&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Mon May 30 22:38:23 2016
@@ -523,6 +523,7 @@
* ap_proxy_connection_create_ex() and section_config
* to struct proxy_{worker,balancer} in mod_proxy.h,
* and optional ssl_engine_set() to mod_ssl.h.
+ * 20160315.3 (2.5.0-dev) Add childtags to dav_error.
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -530,7 +531,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20160315
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 3 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/mod_dav.c?rev=1746207&r1=1746206&r2=1746207&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.c Mon May 30 22:38:23 2016
@@ -358,16 +358,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,
+ 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: */
Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/mod_dav.h?rev=1746207&r1=1746206&r2=1746207&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.h (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.h Mon May 30 22:38:23 2016
@@ -130,6 +130,8 @@ typedef struct dav_error {
struct dav_error *prev; /* previous error (in stack) */
+ const char *childtags; /* error-tag may have children */
+
} dav_error;
/*