com php-src: remaining backports for ext/*: ext/dba/dba_inifi le.c ext/dom/php_dom.c ext/json/json.c ext/pcntl/ pcntl.c ext/soap/php_encoding.c
ext/xsl/php_xsl.c

Commit: fdc8dbe9d942e57b8983b78b71de60f736f9205a Author: Anatol Belski <ab@php.net> Sat, 15 Feb 2014 23:48:05 +0100 Parents: 98f03086bbea21e0f4fff76001079b7b41527f6c Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fdc8dbe9d942e57b8983b78b71de60f736f9205a Log: remaining backports for ext/* Changed paths: M ext/dba/dba_inifile.c M ext/dom/php_dom.c M ext/json/json.c M ext/pcntl/pcntl.c M ext/soap/php_encoding.c M ext/xsl/php_xsl.c Diff: diff --git a/ext/dba/dba_inifile.c b/ext/dba/dba_inifile.c index 6067e99..4d8eae7 100644 --- a/ext/dba/dba_inifile.c +++ b/ext/dba/dba_inifile.c @@ -124,15 +124,14 @@ DBA_EXISTS_FUNC(inifile) DBA_DELETE_FUNC(inifile) { int res; - zend_bool found = 0; INIFILE_DATA; INIFILE_GKEY; - res = inifile_delete_ex(dba, &ini_key, &found TSRMLS_CC); + res = inifile_delete(dba, &ini_key TSRMLS_CC); INIFILE_DONE; - return (res == -1 || !found ? FAILURE : SUCCESS); + return (res == -1 ? FAILURE : SUCCESS); } DBA_FIRSTKEY_FUNC(inifile) diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index d0b5229..b1bf8ce 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -448,7 +448,7 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, cons Z_SET_REFCOUNT_P(tmp, 1); Z_UNSET_ISREF_P(tmp); if (check_empty == 1) { - retval = zend_is_true(tmp TSRMLS_CC); + retval = zend_is_true(tmp); } else if (check_empty == 0) { retval = (Z_TYPE_P(tmp) != IS_NULL); } diff --git a/ext/json/json.c b/ext/json/json.c index 72fb5f8..7450bb4 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -190,10 +190,10 @@ static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */ } if (i == HASH_KEY_IS_STRING) { - return PHP_JSON_OUTPUT_OBJECT; + return 1; } else { if (index != idx) { - return PHP_JSON_OUTPUT_OBJECT; + return 1; } } idx++; diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index b85f255..53c340d 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -499,7 +499,7 @@ PHP_MINIT_FUNCTION(pcntl) { php_register_signal_constants(INIT_FUNC_ARGS_PASSTHRU); php_pcntl_register_errno_constants(INIT_FUNC_ARGS_PASSTHRU); - php_add_tick_function(pcntl_signal_dispatch TSRMLS_CC); + php_add_tick_function(pcntl_signal_dispatch); return SUCCESS; } diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index db9800a..8a37817 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -1189,7 +1189,7 @@ static xmlNodePtr to_xml_bool(encodeTypePtr type, zval *data, int style, xmlNode xmlAddChild(parent, ret); FIND_ZVAL_NULL(data, ret, style); - if (zend_is_true(data TSRMLS_CC)) { + if (zend_is_true(data)) { xmlNodeSetContent(ret, BAD_CAST("true")); } else { xmlNodeSetContent(ret, BAD_CAST("false")); diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index 700344a..ee12562 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -57,8 +57,8 @@ zend_module_entry xsl_module_entry = { xsl_functions, PHP_MINIT(xsl), PHP_MSHUTDOWN(xsl), - NULL, - NULL, + PHP_RINIT(xsl), /* Replace with NULL if there's nothing to do at request start */ + PHP_RSHUTDOWN(xsl), /* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(xsl), #if ZEND_MODULE_API_NO >= 20010901 "0.1", /* Replace with version number for your extension */ @@ -170,7 +170,6 @@ PHP_MINIT_FUNCTION(xsl) xsltRegisterExtModuleFunction ((const xmlChar *) "function", (const xmlChar *) "http://php.net/xsl", xsl_ext_function_object_php); - xsltSetGenericErrorFunc(NULL, php_libxml_error_handler); REGISTER_INT_CONSTANT("XSL_CLONE_AUTO", 0, CONST_CS | CONST_PERSISTENT); REGISTER_INT_CONSTANT("XSL_CLONE_NEVER", -1, CONST_CS | CONST_PERSISTENT); @@ -274,7 +273,7 @@ PHP_MSHUTDOWN_FUNCTION(xsl) (const xmlChar *) "http://php.net/xsl"); xsltUnregisterExtModuleFunction ((const xmlChar *) "function", (const xmlChar *) "http://php.net/xsl"); - xsltSetGenericErrorFunc(NULL, NULL); + xsltCleanupGlobals(); UNREGISTER_INI_ENTRIES(); @@ -283,6 +282,24 @@ PHP_MSHUTDOWN_FUNCTION(xsl) } /* }}} */ +/* {{{ PHP_RINIT_FUNCTION + */ +PHP_RINIT_FUNCTION(xsl) +{ + xsltSetGenericErrorFunc(NULL, php_libxml_error_handler); + return SUCCESS; +} +/* }}} */ + +/* {{{ PHP_RSHUTDOWN_FUNCTION + */ +PHP_RSHUTDOWN_FUNCTION(xsl) +{ + xsltSetGenericErrorFunc(NULL, NULL); + return SUCCESS; +} +/* }}} */ + /* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(xsl)