- avoid leak in RETURN_OBJECT

- fix HttpRequest_002.phpt

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index f0e862e04c5814255e88220673360de67ac1e625..87bd58ebb2a43e44cadc5a9e12e779e85cc0cde2 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -54,7 +54,6 @@ typedef int STATUS;
        return_value->is_ref = 1; \
        return_value->type = IS_OBJECT; \
        return_value->value.obj = (ov); \
-       zval_add_ref(&return_value); \
        zend_objects_store_add_ref(return_value TSRMLS_CC)
 #define RETURN_OBJVAL(ov) \
        RETVAL_OBJVAL(ov); \

diff --git a/tests/HttpRequest_002.phpt b/tests/HttpRequest_002.phpt
index 9c9c49ac80004e12629040d9f8c6e94a5793115c..c0766b0f376ed92fd9b877d0c5ac7c9924015c96 100644 (file)
--- a/tests/HttpRequest_002.phpt
+++ b/tests/HttpRequest_002.phpt
@@ -46,8 +46,7 @@ Array
     [content_length_upload] => %d
     [content_type] => %s
     [httpauth_avail] => %d
-    [proxyauth_avail] => %d
-    [num_connects] => %d
+    [proxyauth_avail] => %s
 )
 int(501)
 int(501)