Merge branch 'v2.6.x'

[m6w6/ext-http] / src / php_http_message_body.c

diff --git a/src/php_http_message_body.c b/src/php_http_message_body.c
index d907e8033d24354517cc127506f6c98c77aa9224..18859a3b409cb8fe1a4d30479892f62afa37fc55 100644 (file)
--- a/src/php_http_message_body.c
+++ b/src/php_http_message_body.c
@@ -12,7 +12,7 @@
 
 #include "php_http_api.h"
 
-#include <ext/standard/php_lcg.h>
+#include "ext/standard/php_lcg.h"
 
 #define BOUNDARY_OPEN(body) \
        do {\
@@ -46,10 +46,11 @@ php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **bo
 
        if (stream) {
                body->res = stream->res;
+               ++GC_REFCOUNT(body->res);
        } else {
                body->res = php_stream_temp_create(TEMP_STREAM_DEFAULT, 0xffff)->res;
        }
-       ++GC_REFCOUNT(body->res);
+       php_stream_auto_cleanup(php_http_message_body_stream(body));
 
        if (body_ptr) {
                *body_ptr = body;
@@ -91,6 +92,7 @@ void php_http_message_body_free(php_http_message_body_t **body_ptr)
                php_http_message_body_t *body = *body_ptr;
 
                if (!--body->refcount) {
+                       zend_list_delete(body->res);
                        PTR_FREE(body->boundary);
                        efree(body);
                }