va_start(args, format);
#ifdef ZEND_ENGINE_2
- if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
+ if ((type == E_THROW) || (GLOBAL_ERROR_HANDLING == EH_THROW)) {
char *message;
zend_class_entry *ce = http_exception_get_for_code(code);
vspprintf(&message, 0, format, args);
zend_throw_exception(ce, message, code TSRMLS_CC);
efree(message);
- } http_catch(PG(exception_class) ? PG(exception_class) : HTTP_EX_DEF_CE);
+ } http_catch(GLOBAL_EXCEPTION_CLASS ? GLOBAL_EXCEPTION_CLASS : HTTP_EX_DEF_CE);
} else
#endif
php_verror(NULL, "", type, format, args TSRMLS_CC);
/* }}} */
/* {{{ array_join */
-int apply_array_append_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
+int apply_array_append_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
{
int flags;
char *key = NULL;
return ZEND_HASH_APPLY_KEEP;
}
-int apply_array_merge_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
+int apply_array_merge_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
{
int flags;
char *key = NULL;