Merge branch 'R_2_5'

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

diff --git a/src/php_http_exception.c b/src/php_http_exception.c
index 25a33e6f9c93e80d7126c3dc0ca6b6f1337fa677..bae09f983dfdca4a74ce8e64abe072ca910334a1 100644 (file)
--- a/src/php_http_exception.c
+++ b/src/php_http_exception.c
@@ -19,10 +19,10 @@
 #endif
 
 #if PHP_HTTP_DBG_EXCEPTIONS
-static void php_http_exception_hook(zval *ex TSRMLS_DC)
+static void php_http_exception_hook(zval *ex)
 {
        if (ex) {
-               zval *m = zend_read_property(Z_OBJCE_P(ex), ex, "message", lenof("message"), 0 TSRMLS_CC);
+               zval *m = zend_read_property(Z_OBJCE_P(ex), ex, "message", lenof("message"), 0);
                fprintf(stderr, "*** Threw exception '%s'\n", Z_STRVAL_P(m));
        } else {
                fprintf(stderr, "*** Threw NULL exception\n");
@@ -46,7 +46,7 @@ PHP_MINIT_FUNCTION(http_exception)
        zend_class_entry *cep, ce = {0};
 
        INIT_NS_CLASS_ENTRY(ce, "http", "Exception", NULL);
-       php_http_exception_interface_class_entry = zend_register_internal_interface(&ce TSRMLS_CC);
+       php_http_exception_interface_class_entry = zend_register_internal_interface(&ce);
        
        /*
         * Would be great to only have a few exceptions and rather more identifying
@@ -55,56 +55,56 @@ PHP_MINIT_FUNCTION(http_exception)
 
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "RuntimeException", NULL);
-       cep = zend_register_internal_class_ex(&ce, spl_ce_RuntimeException, NULL TSRMLS_CC);
-       zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry);
+       cep = zend_register_internal_class_ex(&ce, spl_ce_RuntimeException);
+       zend_class_implements(cep, 1, php_http_exception_interface_class_entry);
        php_http_exception_runtime_class_entry = cep;
 
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "UnexpectedValueException", NULL);
-       cep = zend_register_internal_class_ex(&ce, spl_ce_UnexpectedValueException, NULL TSRMLS_CC);
-       zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry);
+       cep = zend_register_internal_class_ex(&ce, spl_ce_UnexpectedValueException);
+       zend_class_implements(cep, 1, php_http_exception_interface_class_entry);
        php_http_exception_unexpected_val_class_entry = cep;
 
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadMethodCallException", NULL);
-       cep = zend_register_internal_class_ex(&ce, spl_ce_BadMethodCallException, NULL TSRMLS_CC);
-       zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry);
+       cep = zend_register_internal_class_ex(&ce, spl_ce_BadMethodCallException);
+       zend_class_implements(cep, 1, php_http_exception_interface_class_entry);
        php_http_exception_bad_method_call_class_entry = cep;
 
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "InvalidArgumentException", NULL);
-       cep = zend_register_internal_class_ex(&ce, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
-       zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry);
+       cep = zend_register_internal_class_ex(&ce, spl_ce_InvalidArgumentException);
+       zend_class_implements(cep, 1, php_http_exception_interface_class_entry);
        php_http_exception_invalid_arg_class_entry = cep;
 
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadHeaderException", NULL);
-       cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException, NULL TSRMLS_CC);
-       zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry);
+       cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException);
+       zend_class_implements(cep, 1, php_http_exception_interface_class_entry);
        php_http_exception_bad_header_class_entry = cep;
 
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadUrlException", NULL);
-       cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException, NULL TSRMLS_CC);
-       zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry);
+       cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException);
+       zend_class_implements(cep, 1, php_http_exception_interface_class_entry);
        php_http_exception_bad_url_class_entry = cep;
 
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadMessageException", NULL);
-       cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException, NULL TSRMLS_CC);
-       zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry);
+       cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException);
+       zend_class_implements(cep, 1, php_http_exception_interface_class_entry);
        php_http_exception_bad_message_class_entry = cep;
 
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadConversionException", NULL);
-       cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException, NULL TSRMLS_CC);
-       zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry);
+       cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException);
+       zend_class_implements(cep, 1, php_http_exception_interface_class_entry);
        php_http_exception_bad_conversion_class_entry = cep;
 
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadQueryStringException", NULL);
-       cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException, NULL TSRMLS_CC);
-       zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry);
+       cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException);
+       zend_class_implements(cep, 1, php_http_exception_interface_class_entry);
        php_http_exception_bad_querystring_class_entry = cep;
 
 #if PHP_HTTP_DBG_EXCEPTIONS