From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Thu, 5 Sep 2002 06:59:14 +0000 (+0000)
Subject: Morph DONE result from a sub-request handler to OK as DONE is only relevant
X-Git-Tag: AGB_BEFORE_AAA_CHANGES~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b902cb08f843f66ceb949a373d318eea4b4e244b;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/server/request.c b/server/request.c
index 4cd55af78cd..af28372fbcb 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;