X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_api.c;h=6b01a3bce7d43dda465fd49e8f98de828e76c2c1;hb=280b469e963c4e96a1cc8de6c500ed58aaf629b5;hp=2c31d10bde65f1b6a7bdea2eea5dc79c568d0386;hpb=7d35618105146cc620cce13454a5ef242bf52a12;p=m6w6%2Fext-http

diff --git a/http_api.c b/http_api.c
index 2c31d10..6b01a3b 100644
--- a/http_api.c
+++ b/http_api.c
@@ -253,15 +253,12 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 		return FAILURE;
 	}
 
-	if (
-#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399)
-		OG(active) && (OG(active)->flags & PHP_OUTPUT_HANDLER_FLUSHABLE) && 
-#else
-		!OG(ob_lock) &&
-#endif
+#ifndef PHP_OUTPUT_NEWAPI
+	if (!OG(ob_lock) &&
 		!php_ob_handler_used("zlib output compression" TSRMLS_CC) && !php_ob_handler_used("ob_gzhandler" TSRMLS_CC)) {
 		php_end_ob_buffers(0 TSRMLS_CC);
 	}
+#endif
 
 	if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
 		PHPWRITE(body, strlen(body));
@@ -285,7 +282,11 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 	if (HTTP_G->force_exit) {
 		zend_bailout();
 	} else {
+#ifdef PHP_OUTPUT_NEWAPI
+		php_output_start_devnull(TSRMLS_C);
+#else
 		php_ob_set_internal_handler(http_ob_blackhole, 4096, "blackhole", 0 TSRMLS_CC);
+#endif
 	}
 	
 	return SUCCESS;
@@ -409,6 +410,7 @@ PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
 			int len;
 			
 			while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
+				SG(read_post_bytes) += len;
 				php_stream_write(s, buf, len);
 				if (len < 4096) {
 					break;