You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/04/15 22:10:38 UTC
cvs commit: httpd-2.0/server util_xml.c
jorton 2004/04/15 13:10:38
Modified: . Tag: APACHE_2_0_BRANCH STATUS
server Tag: APACHE_2_0_BRANCH util_xml.c
Log:
* server/util_xml.c (ap_xml_parse_input): Give a 413 (Request Entity
Too Large) not a 400 if the client exceeds the configured XML request
body limit.
Reviewed by: Jeff Trawick, Brad Nicholes
Revision Changes Path
No revision
No revision
1.751.2.820 +1 -5 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.819
retrieving revision 1.751.2.820
diff -w -d -u -r1.751.2.819 -r1.751.2.820
--- STATUS 15 Apr 2004 19:54:49 -0000 1.751.2.819
+++ STATUS 15 Apr 2004 20:10:37 -0000 1.751.2.820
@@ -175,10 +175,6 @@
http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/util.c?r1=1.53&r2=1.54
+1: jorton, nd
- *) Issue a 413 not a 400 if client exceeds configured LimitXMLRequestBody
- http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/util_xml.c?r1=1.28&r2=1.29
- +1: jorton, trawick, bnicholes
-
*) mod_dav: Send an EOS at the end of the multistatus brigade.
http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/mod_dav.c?r1=1.105&r2=1.106
+1: jorton
No revision
No revision
1.20.2.6 +3 -1 httpd-2.0/server/util_xml.c
Index: util_xml.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_xml.c,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -w -d -u -r1.20.2.5 -r1.20.2.6
--- util_xml.c 9 Feb 2004 20:59:46 -0000 1.20.2.5
+++ util_xml.c 15 Apr 2004 20:10:38 -0000 1.20.2.6
@@ -36,6 +36,7 @@
char errbuf[200];
apr_size_t total_read = 0;
apr_size_t limit_xml_body = ap_get_limit_xml_body(r);
+ int result = HTTP_BAD_REQUEST;
parser = apr_xml_parser_create(r->pool);
brigade = apr_brigade_create(r->pool, r->connection->bucket_alloc);
@@ -78,6 +79,7 @@
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"XML request body is larger than the configured "
"limit of %lu", (unsigned long)limit_xml_body);
+ result = HTTP_REQUEST_ENTITY_TOO_LARGE;
goto read_error;
}
@@ -121,5 +123,5 @@
apr_brigade_destroy(brigade);
/* Apache will supply a default error, plus the error log above. */
- return HTTP_BAD_REQUEST;
+ return result;
}