fix http_get_request_body_stream() the same way like http_get_request_body()

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 00461d9d7e49050e8212769e0667548eaa6f2486..6b01a3bce7d43dda465fd49e8f98de828e76c2c1 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -182,7 +182,7 @@ zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend_class_
        }
 #if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
        Z_ADDREF_P(old_exception);
-       zend_exception_set_previous(new_exception, old_exception);
+       zend_exception_set_previous(new_exception, old_exception TSRMLS_CC);
 #endif
        zval_ptr_dtor(&old_exception);
        return new_exception;
@@ -252,10 +252,14 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
                STR_FREE(body);
                return FAILURE;
        }
-       
-       if (!OG(ob_lock)) {
+
+#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));
        }
@@ -278,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;
@@ -350,20 +358,22 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
                }
                return SUCCESS;
        } else if (sapi_module.read_post && !HTTP_G->read_post_data) {
-               char buf[4096];
+               char *buf = emalloc(4096);
                int len;
                
                HTTP_G->read_post_data = 1;
                
-               while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+               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;
                        }
                }
+               efree(buf);
                
                /* check for error */
                if (len < 0) {
@@ -396,15 +406,17 @@ PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
                HTTP_G->read_post_data = 1;
                
                if ((s = php_stream_temp_new())) {
-                       char buf[4096];
+                       char *buf = emalloc(4096);
                        int len;
                        
-                       while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+                       while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
+                               SG(read_post_bytes) += len;
                                php_stream_write(s, buf, len);
-                               if (len < (int) sizeof(buf)) {
+                               if (len < 4096) {
                                        break;
                                }
                        }
+                       efree(buf);
                        
                        if (len < 0) {
                                php_stream_close(s);