From: Greg Ames <gregames@apache.org>
Date: Thu, 8 Aug 2002 20:39:15 +0000 (+0000)
Subject: remove some dead code.  It's been there since 1996 (1.3 rev 1.28), so
X-Git-Tag: 2.0.40~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=787074640b7055b3ee7e8af6031d3305c65f84c0;p=apache

remove some dead code.  It's been there since 1996 (1.3 rev 1.28), so
extra eyeballs would be appreciated.

If it's not really dead, then we need to re-arrange this function so
that earlier changes to the r aren't lost.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96321 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index d4a28f996e..c2fd96beb3 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2284,19 +2284,18 @@ AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error)
          * as a text message, so first check the custom response
          * string to ensure that it is a text-string (using the
          * same test used in ap_die(), i.e. does it start with a ").
-         * If it doesn't, we've got a recursive error, so find
-         * the original error and output that as well.
+         * 
+         * If it's not a text string, we've got a recursive error or 
+         * an external redirect.  If it's a recursive error, ap_die passes
+         * us the second error code so we can write both, and has already 
+         * backed up to the original error.  If it's an external redirect, 
+         * it hasn't happened yet; we may never know if it fails.
          */
         if (custom_response[0] == '\"') {
             ap_rputs(custom_response + 1, r);
             ap_finalize_request_protocol(r);
             return;
         }
-        /*
-         * Redirect failed, so get back the original error
-         */
-        while (r->prev && (r->prev->status != HTTP_OK))
-            r = r->prev;
     }
     {
         const char *title = status_lines[idx];