- Fixed build with 5.4+

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index aca90e669f5adeed209212cb1fbbc86bb34827e1..2c31d10bde65f1b6a7bdea2eea5dc79c568d0386 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -252,10 +252,17 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
                STR_FREE(body);
                return FAILURE;
        }
-       
-       if (!OG(ob_lock)) {
+
+       if (
+#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399)
+               OG(active) && (OG(active)->flags & PHP_OUTPUT_HANDLER_FLUSHABLE) && 
+#else
+               !OG(ob_lock) &&
+#endif
+               !php_ob_handler_used("zlib output compression" TSRMLS_CC) && !php_ob_handler_used("ob_gzhandler" TSRMLS_CC)) {
                php_end_ob_buffers(0 TSRMLS_CC);
        }
+
        if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
                PHPWRITE(body, strlen(body));
        }
@@ -356,11 +363,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 +410,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;
                                }
                        }