httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r938265 - in /httpd/httpd/trunk: CHANGES modules/http/http_filters.c
Date Mon, 26 Apr 2010 23:05:30 GMT
Author: covener
Date: Mon Apr 26 23:05:29 2010
New Revision: 938265

URL: http://svn.apache.org/viewvc?rev=938265&view=rev
Log:
Use the more specific 408 (timed out) instead of a generic 400 during a timeout 
reading a chunk-length.


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/http/http_filters.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=938265&r1=938264&r2=938265&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Apr 26 23:05:29 2010
@@ -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

Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=938265&r1=938264&r2=938265&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)
+++ httpd/httpd/trunk/modules/http/http_filters.c Mon Apr 26 23:05:29 2010
@@ -388,7 +388,7 @@ apr_status_t ap_http_filter(ap_filter_t 
                 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 
                     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);
                 }



Mime
View raw message