mirror of
https://github.com/apache/httpd.git
synced 2025-06-03 10:42:03 +03:00
0660784172
- teach APRUTIL how to find Expat and respond to --with-expat - Apache's configure points APRUTIL's configure at its srclib/expat-lite (this will go away; aprutil can work against installed expats or fallback to an expat bundled within aprutil) - shift some of the timing of INCLUDES and top_builddir processing in the APRUTIL configure.in script - expose the new apr_xml functions in apr_xml.h, apr_xml.c (by building it), and apu_compat.h - rewrite util_xml.[ch] in terms of apr_xml git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88299 13f79535-47bb-0310-9956-ffa450edef68
135 lines
4.5 KiB
C
135 lines
4.5 KiB
C
/* ====================================================================
|
|
* The Apache Software License, Version 1.1
|
|
*
|
|
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
|
|
* reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* 3. The end-user documentation included with the redistribution,
|
|
* if any, must include the following acknowledgment:
|
|
* "This product includes software developed by the
|
|
* Apache Software Foundation (http://www.apache.org/)."
|
|
* Alternately, this acknowledgment may appear in the software itself,
|
|
* if and wherever such third-party acknowledgments normally appear.
|
|
*
|
|
* 4. The names "Apache" and "Apache Software Foundation" must
|
|
* not be used to endorse or promote products derived from this
|
|
* software without prior written permission. For written
|
|
* permission, please contact apache@apache.org.
|
|
*
|
|
* 5. Products derived from this software may not be called "Apache",
|
|
* nor may "Apache" appear in their name, without prior written
|
|
* permission of the Apache Software Foundation.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
* ====================================================================
|
|
*
|
|
* This software consists of voluntary contributions made by many
|
|
* individuals on behalf of the Apache Software Foundation. For more
|
|
* information on the Apache Software Foundation, please see
|
|
* <http://www.apache.org/>.
|
|
*/
|
|
|
|
#include "apr_xml.h"
|
|
|
|
#include "httpd.h"
|
|
#include "http_protocol.h"
|
|
#include "http_log.h"
|
|
#include "http_core.h"
|
|
|
|
#include "util_xml.h"
|
|
|
|
|
|
#define READ_BLOCKSIZE 2048 /* used for reading input blocks */
|
|
|
|
|
|
AP_DECLARE(int) ap_xml_parse_input(request_rec * r, apr_xml_doc **pdoc)
|
|
{
|
|
apr_xml_parser *parser;
|
|
int result;
|
|
apr_status_t status;
|
|
char errbuf[200];
|
|
|
|
if ((result = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) != OK)
|
|
return result;
|
|
|
|
if (r->remaining == 0) {
|
|
*pdoc = NULL;
|
|
return OK;
|
|
}
|
|
|
|
parser = apr_xml_parser_create(r->pool);
|
|
|
|
if (ap_should_client_block(r)) {
|
|
long len;
|
|
char *buffer;
|
|
apr_size_t total_read = 0;
|
|
apr_size_t limit_xml_body = ap_get_limit_xml_body(r);
|
|
|
|
/* allocate our working buffer */
|
|
buffer = apr_palloc(r->pool, READ_BLOCKSIZE);
|
|
|
|
/* read the body, stuffing it into the parser */
|
|
while ((len = ap_get_client_block(r, buffer, READ_BLOCKSIZE)) > 0) {
|
|
total_read += len;
|
|
if (limit_xml_body && total_read > limit_xml_body) {
|
|
ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
|
|
"XML request body is larger than the configured "
|
|
"limit of %lu", (unsigned long)limit_xml_body);
|
|
goto read_error;
|
|
}
|
|
|
|
status = apr_xml_parser_feed(parser, buffer, len);
|
|
if (status)
|
|
goto parser_error;
|
|
}
|
|
if (len == -1) {
|
|
/* ap_get_client_block() has logged an error */
|
|
goto read_error;
|
|
}
|
|
}
|
|
|
|
/* tell the parser that we're done */
|
|
status = apr_xml_parser_done(parser, pdoc);
|
|
if (status)
|
|
goto parser_error;
|
|
|
|
return OK;
|
|
|
|
parser_error:
|
|
(void) apr_xml_parser_geterror(parser, errbuf, sizeof(errbuf));
|
|
ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
|
|
"%s", errbuf);
|
|
|
|
/* FALLTHRU */
|
|
|
|
read_error:
|
|
/* make sure the parser is terminated */
|
|
(void) apr_xml_parser_done(parser, NULL);
|
|
|
|
/* Apache will supply a default error, plus the error log above. */
|
|
return HTTP_BAD_REQUEST;
|
|
}
|