From: Jean-Frederic Clere <jfclere@apache.org>
Date: Tue, 8 May 2007 11:01:51 +0000 (+0000)
Subject: Rollback my previous commit. Sorry ;-(
X-Git-Tag: 2.2.5~253
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=718dd3a76bd6fcf971d028df72d76188879a8b01;p=thirdparty%2Fapache%2Fhttpd.git

Rollback my previous commit. Sorry ;-(


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536160 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index 7fe1f922f73..d5aa87e7849 100644
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -271,7 +271,6 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
                             ap_log_error(APLOG_MARK, APLOG_DEBUG, status,
                                          r->server,
                                          "ap_get_brigade failed");
-                            isok = 0;
                             break;
                         }
                         bufsiz = AJP13_MAX_SEND_BODY_SZ;
@@ -282,7 +281,6 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
                             ap_log_error(APLOG_MARK, APLOG_DEBUG, status,
                                          r->server,
                                          "apr_brigade_flatten failed");
-                            isok = 0;
                             break;
                         }
                     }
@@ -293,7 +291,6 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
                     if (status != APR_SUCCESS) {
                         ap_log_error(APLOG_MARK, APLOG_DEBUG, status, r->server,
                                      "ajp_send_data_msg failed");
-                        isok = 0;
                         break;
                     }
                     conn->worker->s->transferred += bufsiz;
@@ -361,7 +358,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
                 if (ap_pass_brigade(r->output_filters,
                                     output_brigade) != APR_SUCCESS) {
                     ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                                  "proxy: error processing end");
+                                  "proxy: error processing body");
                     isok = 0;
                 }
                 /* XXX: what about flush here? See mod_jk */
@@ -409,11 +406,11 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
      */
     apr_brigade_cleanup(output_brigade);
 
-    if (! isok) {
+    if (status != APR_SUCCESS) {
         /* We had a failure: Close connection to backend */
         conn->close++;
         ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
-                     "proxy: dialog to %pI (%s) failed",
+                     "proxy: send body failed to %pI (%s)",
                      conn->worker->cp->addr,
                      conn->worker->hostname);
         /*