nghttpx: Returns 408 if backend timed out before sending headers

053c7ac5 · Tatsuhiro Tsujikawa · 8a59ce6d · 053c7ac5 · 053c7ac5
Commit 053c7ac5 authored Sep 03, 2019 by Tatsuhiro Tsujikawa
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

src/shrpx_http2_upstream.cc src/shrpx_http2_upstream.cc +5 -1

src/shrpx_https_upstream.cc src/shrpx_https_upstream.cc +5 -1

No files found.
--- a/src/shrpx_http2_upstream.cc
+++ b/src/shrpx_http2_upstream.cc
@@ -1378,7 +1378,11 @@ int Http2Upstream::downstream_error(DownstreamConnection *dconn, int events) {
    } else {
      unsigned int status;
      if (events & Downstream::EVENT_TIMEOUT) {
-        status = 504;
+        if (downstream->get_request_header_sent()) {
+          status = 504;
+        } else {
+          status = 408;
+        }
      } else {
        status = 502;
      }

--- a/src/shrpx_https_upstream.cc
+++ b/src/shrpx_https_upstream.cc
@@ -893,7 +893,11 @@ int HttpsUpstream::downstream_error(DownstreamConnection *dconn, int events) {

  unsigned int status;
  if (events & Downstream::EVENT_TIMEOUT) {
-    status = 504;
+    if (downstream->get_request_header_sent()) {
+      status = 504;
+    } else {
+      status = 408;
+    }
  } else {
    status = 502;
  }