Use the more specific 408 (timed out) instead of a generic 400 during a timeout

reading a chunk-length.

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

diff --git a/CHANGES b/CHANGES
index 7c3518cac5eb3fc315a42141741214196db130b5..a7b63f680f644dd5d8e172b5de672721eddbd6b1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -28,7 +28,7 @@ Changes with Apache 2.3.7
      processing is completed, avoiding orphaned callback pointers.
      [Brett Gervasoni <brettg senseofsecurity.com>, Jeff Trawick]
 
-  *) Log an error for failures to read a chunk-size, and return 400 instead
+  *) Log an error for failures to read a chunk-size, and return 408 instead of
      413 when this is due to a read timeout.  This change also fixes some cases 
      of two error documents being sent in the response for the same scenario. 
      [Eric Covener] PR49167

diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index abccc1b56f0a1b218a9a8ca156ff1f5a6fc74367..9f979b4cd681082faacce3d0b8eaf38a23c0abd6 100644 (file)
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -388,7 +388,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
                 ctx->remaining = 0; /* Reset it in case we have to
                                      * come back here later */
                 if (APR_STATUS_IS_TIMEUP(rv)) { 
-                    http_error = HTTP_BAD_REQUEST;
+                    http_error = HTTP_REQUEST_TIME_OUT;
                 }
                 return bail_out_on_error(ctx, f, http_error);
             }
@@ -494,7 +494,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
                     ctx->remaining = 0; /* Reset it in case we have to
                                          * come back here later */
                     if (APR_STATUS_IS_TIMEUP(rv)) { 
-                        http_error = HTTP_BAD_REQUEST;
+                        http_error = HTTP_REQUEST_TIME_OUT;
                     }
                     return bail_out_on_error(ctx, f, http_error);
                 }