Attachment 37139 Details for Bug 63626 – Patch for trunk

[patch] Patch for trunk

BZ-63626_trunk.patch (text/plain), 1.22 KB, created by Michael Osipov on 2020-03-31 13:58:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2020-03-31 13:58:00 UTC

Size: 1.22 KB

patch

obsolete

>commit 5fd8847bb194db6e87a7c10df349a12e66d17855
>Author: Michael Osipov <michaelo@apache.org>
>Date:   2019-08-05 12:39:28 +0200
>
>    BZ 63626: mod_proxy_http uses incorrect status codes for timed out upstream requests
>    
>    If a status is known to time out at some point, use HTTP_GATEWAY_TIME_OUT
>    rather than HTTP_BAD_GATEWAY because we know that the connection has been
>    established and the upstream server has received our request.
>
>diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
>index c5e1777623..2aadd7c489 100644
>--- a/modules/proxy/mod_proxy_http.c
>+++ b/modules/proxy/mod_proxy_http.c
>@@ -1307,7 +1307,9 @@ int ap_proxy_http_process_response(proxy_http_req_t *req)
>                                    backend->hostname, backend->port);
>             }
>             proxy_run_detach_backend(r, backend);
>-            return ap_proxyerror(r, HTTP_GATEWAY_TIME_OUT,
>+            return ap_proxyerror(r, APR_STATUS_IS_TIMEUP(rc)
>+                                        ? HTTP_GATEWAY_TIME_OUT
>+                                        : HTTP_BAD_GATEWAY,
>                                  "Error reading from remote server");
>         }
>         /* XXX: Is this a real headers length send from remote? */

Actions: View | Diff

Attachments on bug 63626: 36700 | 36974 | 37137 | 37138 | 37139