Commit f7910e44 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1766998 from trunk: 

Follow up to r1739201.
These APR_TIMEUP special cases are now handled by ap_map_http_request_error().

Reviewed by: jailletc36, jim, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807753 13f79535-47bb-0310-9956-ffa450edef68
parent c3e07307

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -119,13 +119,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch: svn merge -c 1801594 ^/httpd/httpd/trunk .

     +1: jfclere, jim, covener



  *) core: Follow up to r1739201.

           These APR_TIMEUP special cases are now handled by ap_map_http_request_error().

           (r1739201 has been backported in the 2.4 branch in r1768079)

     trunk patch: http://svn.apache.org/r1766998

     2.4.x patch: svn merge -c 1766998 ^/httpd/httpd/trunk .

     +1: jailletc36, jim, covener



  *) buildconf: add an apr-config mode, which allows builds to proceed without

                APR source code as long as a valid APR installation exists.

                Involves checking in the latest versions of APR's m4 files and

modules/dav/main/mod_dav.c

+4 −11
Original line number Diff line number Diff line
@@ -1025,17 +1025,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);

                }

                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;

            }

modules/generators/mod_cgi.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

modules/generators/mod_cgid.c

+0 −5
Original line number Diff line number Diff line
@@ -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);