Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into...

This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing
changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.

(cherry picked from commit 57736cc937fc6dfdfb403293d7bf88b264e83e15)

Something went wrong, so the revert didn't land in master.
Cherry-picking extra therefore.

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 2a414813c56facc9a1fd237f1b462ea7aa283e1e..0ee4fcbddf08767ef78435b731eb685ebfa4c614 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -65,33 +65,6 @@ char *apache2_php_ini_path_override = NULL;
 ZEND_TSRMLS_CACHE_DEFINE()
 #endif
 
-/* if apache's version is newer than 2.2.31 or 2.4.16 */
-#if MODULE_MAGIC_COOKIE == 0x41503232UL && AP_MODULE_MAGIC_AT_LEAST(20051115,40) || \
-       MODULE_MAGIC_COOKIE == 0x41503234UL && AP_MODULE_MAGIC_AT_LEAST(20120211,47)
-#define php_ap_map_http_request_error ap_map_http_request_error
-#else
-static int php_ap_map_http_request_error(apr_status_t rv, int status)
-{
-       switch (rv) {
-       case AP_FILTER_ERROR: {
-               return AP_FILTER_ERROR;
-       }
-       case APR_ENOSPC: {
-               return HTTP_REQUEST_ENTITY_TOO_LARGE;
-       }
-       case APR_ENOTIMPL: {
-               return HTTP_NOT_IMPLEMENTED;
-       }
-       case APR_ETIMEDOUT: {
-               return HTTP_REQUEST_TIME_OUT;
-       }
-       default: {
-               return status;
-       }
-       }
-}
-#endif
-
 static size_t
 php_apache_sapi_ub_write(const char *str, size_t str_length)
 {
@@ -207,7 +180,6 @@ php_apache_sapi_read_post(char *buf, size_t count_bytes)
        php_struct *ctx = SG(server_context);
        request_rec *r;
        apr_bucket_brigade *brigade;
-       apr_status_t ret;
 
        r = ctx->r;
        brigade = ctx->brigade;
@@ -219,7 +191,7 @@ php_apache_sapi_read_post(char *buf, size_t count_bytes)
         * need to make sure that if data is available we fill the buffer completely.
         */
 
-       while ((ret=ap_get_brigade(r->input_filters, brigade, AP_MODE_READBYTES, APR_BLOCK_READ, len)) == APR_SUCCESS) {
+       while (ap_get_brigade(r->input_filters, brigade, AP_MODE_READBYTES, APR_BLOCK_READ, len) == APR_SUCCESS) {
                apr_brigade_flatten(brigade, buf, &len);
                apr_brigade_cleanup(brigade);
                tlen += len;
@@ -230,14 +202,6 @@ php_apache_sapi_read_post(char *buf, size_t count_bytes)
                len = count_bytes - tlen;
        }
 
-       if (ret != APR_SUCCESS) {
-               if (APR_STATUS_IS_TIMEUP(ret)) {
-                       SG(sapi_headers).http_response_code = php_ap_map_http_request_error(ret, HTTP_REQUEST_TIME_OUT);
-               } else {
-                       SG(sapi_headers).http_response_code = php_ap_map_http_request_error(ret, HTTP_BAD_REQUEST);
-               }
-       }
-
        return tlen;
 }
 
@@ -715,13 +679,6 @@ zend_first_try {
                brigade = ctx->brigade;
        }
 
-       if (SG(request_info).content_length > SG(read_post_bytes)) {
-               ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Error while attempting to read POST data: %d", SG(sapi_headers).http_response_code);
-               apr_brigade_cleanup(brigade);
-               PHPAP_INI_OFF;
-               return SG(sapi_headers).http_response_code;
-       }
-
        if (AP2(last_modified)) {
                ap_update_mtime(r, r->finfo.mtime);
                ap_set_last_modified(r);