You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2004/08/01 02:17:52 UTC
cvs commit: httpd-apreq-2/glue/perl/xsbuilder/Apache/Upload Apache__Upload.h
joes 2004/07/31 17:17:52
Modified: glue/perl/xsbuilder/Apache/Request Apache__Request.h
glue/perl/xsbuilder/Apache/Upload Apache__Upload.h
Log:
Use req->body_status instead of apreq_env_read for checking upload exception.
Revision Changes Path
1.52 +7 -5 httpd-apreq-2/glue/perl/xsbuilder/Apache/Request/Apache__Request.h
Index: Apache__Request.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/Apache/Request/Apache__Request.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Apache__Request.h 31 Jul 2004 23:56:40 -0000 1.51
+++ Apache__Request.h 1 Aug 2004 00:17:52 -0000 1.52
@@ -33,7 +33,7 @@
default: \
req = (apreq_request_t *)SvIVX(obj); \
s = req->args_status; \
- if (s == APR_SUCCESS && req->parser) \
+ if (s == APR_SUCCESS && req->body_status != APR_EINIT) \
s = req->body_status; \
if (s != APR_SUCCESS) \
APREQ_XS_THROW_ERROR(request, s, "Apache::Request::param", \
@@ -72,12 +72,14 @@
break; \
default: \
req = (apreq_request_t *)SvIVX(obj); \
- if (req->parser == NULL) \
- break; \
- s = req->body_status; \
- if (s != APR_SUCCESS) \
+ switch(s = req->body_status) { \
+ case APR_EINIT: \
+ case APR_SUCCESS: \
+ break; \
+ default: \
APREQ_XS_THROW_ERROR(request, s, "Apache::Request::body", \
"Apache::Request::Error"); \
+ } \
} \
} while (0)
1.34 +2 -4 httpd-apreq-2/glue/perl/xsbuilder/Apache/Upload/Apache__Upload.h
Index: Apache__Upload.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/Apache/Upload/Apache__Upload.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Apache__Upload.h 31 Jul 2004 23:56:40 -0000 1.33
+++ Apache__Upload.h 1 Aug 2004 00:17:52 -0000 1.34
@@ -31,10 +31,8 @@
break; \
default: \
req = (apreq_request_t *)SvIVX(obj); \
- if (req->parser == NULL) \
- break; \
- switch (s = apreq_env_read(req->env, APR_BLOCK_READ, 0)) { \
- case APR_INCOMPLETE: \
+ switch(s = req->body_status) { \
+ case APR_EINIT: \
case APR_SUCCESS: \
break; \
default: \