From ef8632c9dc5c4827a47c5b226ad5a0a9cb93326e Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 28 Mar 2017 13:06:38 +0200 Subject: [PATCH 1/3] Revert "Fixed bug #61471" This reverts commit 80c8d84af303d2fddc9ba9f181c7117b9040811d. --- sapi/apache2handler/php_apache.h | 1 - sapi/apache2handler/sapi_apache2.c | 47 +----------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index bd3e1813a24..38e4716779b 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -73,7 +73,6 @@ typedef struct { zend_bool engine; zend_bool xbithack; zend_bool last_modified; - zend_bool post_read_error; } php_apache2_info_struct; extern zend_module_entry apache2_module_entry; diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 204904ab11e..bf22d2c783e 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -63,33 +63,6 @@ #define PHP_SOURCE_MAGIC_TYPE "application/x-httpd-php-source" #define PHP_SCRIPT "php7-script" -/* 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 - /* A way to specify the location of the php.ini dir in an apache directive */ char *apache2_php_ini_path_override = NULL; #if defined(PHP_WIN32) && defined(ZTS) @@ -211,7 +184,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; @@ -223,7 +195,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; @@ -234,15 +206,6 @@ php_apache_sapi_read_post(char *buf, size_t count_bytes) len = count_bytes - tlen; } - if (ret != APR_SUCCESS) { - AP2(post_read_error) = 1; - 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; } @@ -524,7 +487,6 @@ static int php_apache_request_ctor(request_rec *r, php_struct *ctx) SG(request_info).proto_num = r->proto_num; SG(request_info).request_uri = apr_pstrdup(r->pool, r->uri); SG(request_info).path_translated = apr_pstrdup(r->pool, r->filename); - AP2(post_read_error) = 0; r->no_local_copy = 1; content_length = (char *) apr_table_get(r->headers_in, "Content-Length"); @@ -694,13 +656,6 @@ zend_first_try { brigade = ctx->brigade; } - if (AP2(post_read_error)) { - 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); From 5c93a31804fe7592d862c12eff15199c55058d72 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 28 Mar 2017 13:12:27 +0200 Subject: [PATCH 2/3] update NEWS --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 929dd93130f..0a5d4411626 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,9 @@ PHP NEWS to `isfinite'). (Nikita) . Fixed bug #74302 (yield fromLABEL is over-greedy). (Sara) +- Apache: + . Reverted patch for bug #61471, fixes bug #74318. (Anatol) + - Date: . Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8) From 2a5e631e31365f9ba281eb14fc1335f5f07dc481 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 28 Mar 2017 13:14:51 +0200 Subject: [PATCH 3/3] update NEWS --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index c0220fd8d4c..aff1233ec61 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,9 @@ PHP NEWS to `isfinite'). (Nikita) . Fixed bug #74302 (yield fromLABEL is over-greedy). (Sara) +- Apache: + . Reverted patch for bug #61471, fixes bug #74318. (Anatol) + - Date: . Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8)