diff options
| author | Justin Erenkrantz <jerenkrantz@apache.org> | 2002-09-05 08:59:14 +0200 |
|---|---|---|
| committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2002-09-05 08:59:14 +0200 |
| commit | b902cb08f843f66ceb949a373d318eea4b4e244b (patch) | |
| tree | 3bccf6ebb68d6df7a5f00a32b4a04fdb0e51be98 /server/request.c | |
| parent | Switch hook from type_checker to fixups. (diff) | |
| download | apache2-b902cb08f843f66ceb949a373d318eea4b4e244b.tar.xz apache2-b902cb08f843f66ceb949a373d318eea4b4e244b.zip | |
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96642 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/request.c')
| -rw-r--r-- | server/request.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server/request.c b/server/request.c index 4cd55af78c..af28372fbc 100644 --- a/server/request.c +++ b/server/request.c @@ -1867,6 +1867,9 @@ AP_DECLARE(int) ap_run_sub_req(request_rec *r) } if (retval != OK) { retval = ap_invoke_handler(r); + if (retval == DONE) { + retval = OK; + } } ap_finalize_sub_req_protocol(r); return retval; |