X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=183a44c01f7683eba53998504f02f6244cc82a30;hp=aebd434209deb323f2c2ba3dac0b73649f276222;hb=930e15c0f50743465332dcf3e1036ff11ef2150e;hpb=ad5f896b03adaa073134a00108a9cdf00720673a

diff --git a/http_api.c b/http_api.c
index aebd434..183a44c 100644
--- a/http_api.c
+++ b/http_api.c
@@ -253,15 +253,9 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 		return FAILURE;
 	}
 	
-#if PHP_VERSION_ID < 50399
-	if (!OG(ob_lock)) {
+	if (!php_ob_handler_used("zlib output compression") && !php_ob_handler_used("ob_gzhandler") && !OG(ob_lock)) {
 		php_end_ob_buffers(0 TSRMLS_CC);
 	}
-#else
-	if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_LOCKED) {
-		php_output_end_all(TSRMLS_C);
-	}
-#endif
 	if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
 		PHPWRITE(body, strlen(body));
 	}
@@ -362,11 +356,12 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 		HTTP_G->read_post_data = 1;
 		
 		while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
+			SG(read_post_bytes) += len;
 			*body = erealloc(*body, *length + len + 1);
 			memcpy(*body + *length, buf, len);
 			*length += len;
 			(*body)[*length] = '\0';
-			if (len < (int) sizeof(buf)) {
+			if (len < 4096) {
 				break;
 			}
 		}
@@ -408,7 +403,7 @@ PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
 			
 			while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
 				php_stream_write(s, buf, len);
-				if (len < (int) sizeof(buf)) {
+				if (len < 4096) {
 					break;
 				}
 			}