Fixed Bug #17896 Make failed

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index aca90e669f5adeed209212cb1fbbc86bb34827e1..183a44c01f7683eba53998504f02f6244cc82a30 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -253,7 +253,7 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
                return FAILURE;
        }
        
-       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);
        }
        if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
@@ -356,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;
                        }
                }
@@ -402,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;
                                }
                        }