- multiple send seems to work now without bigger problems

[m6w6/ext-http] / php_http_std_defs.h

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 00246859584ce7a7228f7010ed7613c57d770240..d41ba00d1aa39161296166fbf98fe893cb5ba093 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -46,10 +46,7 @@ typedef int STATUS;
 #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
 /* return object(values) */
 #define RETVAL_OBJECT(o) \
-       return_value->is_ref = 1; \
-       return_value->type = IS_OBJECT; \
-       return_value->value.obj = (o)->value.obj; \
-       zval_add_ref(&return_value)
+       RETVAL_OBJVAL((o)->value.obj)
 #define RETURN_OBJECT(o) \
        RETVAL_OBJECT(o); \
        return
@@ -57,6 +54,7 @@ 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); \
@@ -289,6 +287,24 @@ typedef int STATUS;
 #endif /* HTTP_HAVE_CURL */
 
 
+#ifndef TSRMLS_FETCH_FROM_CTX
+#      ifdef ZTS
+#              define TSRMLS_FETCH_FROM_CTX(ctx)       void ***tsrm_ls = (void ***) ctx
+#      else
+#              define TSRMLS_FETCH_FROM_CTX(ctx)
+#      endif
+#endif
+
+#ifndef TSRMLS_SET_CTX
+#      ifdef ZTS
+#              define TSRMLS_SET_CTX(ctx)      (void ***) ctx = tsrm_ls
+#      else
+#              define TSRMLS_SET_CTX(ctx)
+#      endif
+#endif
+
+
+
 #endif /* PHP_HTTP_STD_DEFS_H */
 
 /*