joes 2004/07/07 06:49:53
Modified: src apreq_params.c apreq_params.h apreq_version.h
Log:
apreq_parse_request needs to return APR_ENOTIMPL when the enctype isn't
recognized.
Revision Changes Path
1.44 +4 -4 httpd-apreq-2/src/apreq_params.c
Index: apreq_params.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_params.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- apreq_params.c 2 Jul 2004 06:32:53 -0000 1.43
+++ apreq_params.c 7 Jul 2004 13:49:53 -0000 1.44
@@ -282,11 +282,11 @@
APREQ_DECLARE(apr_status_t) apreq_parse_request(apreq_request_t *req,
apr_bucket_brigade *bb)
{
- if (req->parser == NULL)
+ if (req->parser == NULL) {
req->parser = apreq_parser(req->env,NULL);
- if (req->parser == NULL)
- return APR_EINIT;
-
+ if (req->parser == NULL)
+ return APR_ENOTIMPL;
+ }
if (req->body == NULL)
req->body = apr_table_make(apreq_env_pool(req->env),APREQ_NELTS);
1.35 +2 -0 httpd-apreq-2/src/apreq_params.h
Index: apreq_params.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_params.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- apreq_params.h 29 Jun 2004 18:34:48 -0000 1.34
+++ apreq_params.h 7 Jul 2004 13:49:53 -0000 1.35
@@ -185,6 +185,8 @@
* @param bb Brigade to parse. See remarks below.
* @return APR_INCOMPLETE if the parse is incomplete,
* APR_SUCCESS if the parser is finished (saw eos),
+ * APR_ENOTIMPL if no parser is available for this request
+ * (i.e. unrecognized Content-Type header),
* unrecoverable error value otherwise.
*/
1.19 +1 -1 httpd-apreq-2/src/apreq_version.h
Index: apreq_version.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_version.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apreq_version.h 5 Jul 2004 17:39:50 -0000 1.18
+++ apreq_version.h 7 Jul 2004 13:49:53 -0000 1.19
@@ -61,7 +61,7 @@
#define APREQ_MINOR_VERSION 0
/** patch level */
-#define APREQ_PATCH_VERSION 14
+#define APREQ_PATCH_VERSION 15
/**
* This symbol is defined for internal, "development" copies of libapreq.
