From 019efb6465ed4549b235269cb4cc1653922d9891 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 28 Oct 2016 10:56:03 +0000 Subject: [PATCH] Follow up to r1739201. These APR_TIMEUP special cases are now handled by ap_map_http_request_error(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1766998 13f79535-47bb-0310-9956-ffa450edef68 --- modules/dav/main/mod_dav.c | 15 ++++----------- modules/generators/mod_cgi.c | 5 ----- modules/generators/mod_cgid.c | 5 ----- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c index 1a1730e53e..6808e2cfea 100644 --- a/modules/dav/main/mod_dav.c +++ b/modules/dav/main/mod_dav.c @@ -1039,17 +1039,10 @@ static int dav_method_put(request_rec *r) if (rc != APR_SUCCESS) { int http_err; char *msg = ap_escape_html(r->pool, r->uri); - if (APR_STATUS_IS_TIMEUP(rc)) { - http_err = HTTP_REQUEST_TIME_OUT; - msg = apr_psprintf(r->pool, "Timeout reading the body " - "(URI: %s)", msg); - } - else { - http_err = ap_map_http_request_error(rc, HTTP_BAD_REQUEST); - msg = apr_psprintf(r->pool, - "An error occurred while reading" - " the request body (URI: %s)", msg); - } + http_err = ap_map_http_request_error(rc, HTTP_BAD_REQUEST); + msg = apr_psprintf(r->pool, "An error occurred while reading " + "the request body (URI: %s)", + msg); err = dav_new_error(r->pool, http_err, 0, rc, msg); break; } diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c index 000f06e5bd..8c4a2c6360 100644 --- a/modules/generators/mod_cgi.c +++ b/modules/generators/mod_cgi.c @@ -853,11 +853,6 @@ static int cgi_handler(request_rec *r) APR_BLOCK_READ, HUGE_STRING_LEN); if (rv != APR_SUCCESS) { - if (APR_STATUS_IS_TIMEUP(rv)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01224) - "Timeout during reading request entity data"); - return HTTP_REQUEST_TIME_OUT; - } ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01225) "Error reading request entity data"); return ap_map_http_request_error(rv, HTTP_BAD_REQUEST); diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c index 1148467b46..b827ed6ac4 100644 --- a/modules/generators/mod_cgid.c +++ b/modules/generators/mod_cgid.c @@ -1534,11 +1534,6 @@ static int cgid_handler(request_rec *r) APR_BLOCK_READ, HUGE_STRING_LEN); if (rv != APR_SUCCESS) { - if (APR_STATUS_IS_TIMEUP(rv)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01269) - "Timeout during reading request entity data"); - return HTTP_REQUEST_TIME_OUT; - } ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01270) "Error reading request entity data"); return ap_map_http_request_error(rv, HTTP_BAD_REQUEST); -- 2.40.0