- fix behaviour of http_build_url() when second parameter is NULL

[m6w6/ext-http] / php_http_std_defs.h

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index a3a3056f168e49ca52608f4162d3305fce859ac8..9f22bcf5c26f0d44cc65ae8155a2470bf6ee8c91 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -292,6 +292,20 @@ typedef int STATUS;
 #endif /* ZEND_ENGINE_2 */
 /* }}} */
 
+#ifdef ZEND_ENGINE_2
+#      define with_error_handling(eh, ec) \
+       { \
+               error_handling_t __eh = PG(error_handling); \
+               zend_class_entry *__ec= PG(exception_class); \
+               php_set_error_handling(eh, ec TSRMLS_CC);
+#      define end_error_handling() \
+               php_set_error_handling(__eh, __ec TSRMLS_CC); \
+       }
+#else
+#      define with_error_handling(eh, ec)
+#      define end_error_handling()
+#endif
+
 #ifndef E_THROW
 #      define E_THROW 0
 #endif