You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2002/09/05 08:59:15 UTC
cvs commit: httpd-2.0/server request.c
jerenkrantz 2002/09/04 23:59:15
Modified: server request.c
Log:
Morph DONE result from a sub-request handler to OK as DONE is only relevant
when we are the main request.
This fixes a problem with mod_include printing out an error message on DAV
sub-requests because mod_dav will return DONE instead of OK. This would
result in the correct output merged in with an error string.
Revision Changes Path
1.115 +3 -0 httpd-2.0/server/request.c
Index: request.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/request.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -u -r1.114 -r1.115
--- request.c 17 May 2002 11:11:37 -0000 1.114
+++ request.c 5 Sep 2002 06:59:14 -0000 1.115
@@ -1867,6 +1867,9 @@
}
if (retval != OK) {
retval = ap_invoke_handler(r);
+ if (retval == DONE) {
+ retval = OK;
+ }
}
ap_finalize_sub_req_protocol(r);
return retval;