- new negotiator + test

[m6w6/ext-http] / php_http_std_defs.h

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index abe8777a47a3a573e41ebb91c7974fcdc4a665c7..a2b753faf789eded880711c838dce4ddee1cb84b 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -223,6 +223,7 @@ typedef int STATUS;
 #      define DCL_STATIC_PROP_N(a, n)                  zend_declare_property_null(ce, (#n), sizeof(#n)-1, (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
 #      define GET_STATIC_PROP_EX(ce, n)                zend_std_get_static_property(ce, (#n), sizeof(#n)-1, 0 TSRMLS_CC)
 #      define UPD_STATIC_PROP_EX(ce, t, n, v)  zend_update_static_property_ ##t(ce, #n, sizeof(#n)-1, (v) TSRMLS_CC)
+#      define UPD_STATIC_STRL_EX(ce, n, v, l)  zend_update_static_property_stringl(ce, #n, sizeof(#n)-1, (v), (l) TSRMLS_CC)
 #      define SET_STATIC_PROP_EX(ce, n, v)             zend_update_static_property(ce, #n, sizeof(#n)-1, v TSRMLS_CC)
 
 #      define DCL_PROP(a, t, n, v)                             zend_declare_property_ ##t(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC)
@@ -230,6 +231,7 @@ typedef int STATUS;
 #      define DCL_PROP_N(a, n)                                 zend_declare_property_null(ce, (#n), sizeof(#n)-1, (ZEND_ACC_ ##a) TSRMLS_CC)
 #      define UPD_PROP(o, t, n, v)                             UPD_PROP_EX(o, getThis(), t, n, v)
 #      define UPD_PROP_EX(o, this, t, n, v)    zend_update_property_ ##t(o->zo.ce, this, (#n), sizeof(#n)-1, (v) TSRMLS_CC)
+#      define UPD_STRL(o, n, v, l)                             zend_update_property_stringl(o->zo.ce, getThis(), (#n), sizeof(#n)-1, (v), (l) TSRMLS_CC)
 #      define SET_PROP(o, n, z)                                SET_PROP_EX(o, getThis(), n, z)
 #      define SET_PROP_EX(o, this, n, z)               zend_update_property(o->zo.ce, this, (#n), sizeof(#n)-1, (z) TSRMLS_CC)
 #      define GET_PROP(o, n)                                   GET_PROP_EX(o, getThis(), n)
@@ -271,17 +273,16 @@ typedef int STATUS;
 #ifndef E_THROW
 #      define E_THROW 0
 #endif
-#define HE_THROW       E_THROW
 #ifdef ZEND_ENGINE_2
-#      define HE_THROE         E_THROW
-#      define HE_NOTICE        (HTTP_G(only_exceptions) ? E_THROW : E_NOTICE)
-#      define HE_WARNING       (HTTP_G(only_exceptions) ? E_THROW : E_WARNING)
-#      define HE_ERROR         (HTTP_G(only_exceptions) ? E_THROW : E_ERROR)
+#      define HE_THROW         E_THROW TSRMLS_CC
+#      define HE_NOTICE        (HTTP_G(only_exceptions) ? E_THROW : E_NOTICE) TSRMLS_CC
+#      define HE_WARNING       (HTTP_G(only_exceptions) ? E_THROW : E_WARNING) TSRMLS_CC
+#      define HE_ERROR         (HTTP_G(only_exceptions) ? E_THROW : E_ERROR) TSRMLS_CC
 #else
-#      define HE_THROW         E_WARNING
-#      define HE_NOTICE        E_NOTICE
-#      define HE_WARNING       E_WARNING
-#      define HE_ERROR         E_ERROR
+#      define HE_THROW         E_WARNING TSRMLS_CC
+#      define HE_NOTICE        E_NOTICE TSRMLS_CC
+#      define HE_WARNING       E_WARNING TSRMLS_CC
+#      define HE_ERROR         E_ERROR TSRMLS_CC
 #endif
 
 #define HTTP_E_RUNTIME                         1L
@@ -304,7 +305,13 @@ typedef int STATUS;
 #      define HTTP_EMPTY_ARGS_EX(class, method, ret_ref)                       HTTP_BEGIN_ARGS_EX(class, method, ret_ref, 0) HTTP_END_ARGS
 #      define HTTP_ARGS(class, method)                                                         args_for_ ##class## _ ##method
 #      define HTTP_ARG_VAL(name, pass_ref)                                                     ZEND_ARG_INFO(pass_ref, name)
-#      define HTTP_ARG_OBJ(class, name, allow_null)                            ZEND_ARG_OBJ_INFO(1, name, class, allow_null)
+#      define HTTP_ARG_OBJ(class, name, allow_null)                            ZEND_ARG_OBJ_INFO(0, name, class, allow_null)
+#endif
+
+#ifdef ZEND_ENGINE_2
+#      define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL, 0, 0}
+#else
+#      define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL}
 #endif
 
 #ifdef HTTP_HAVE_CURL