diff options
| author | Stanley Sufficool <ssufficool@php.net> | 2014-10-20 21:33:32 -0700 |
|---|---|---|
| committer | Stanley Sufficool <ssufficool@php.net> | 2014-10-20 21:33:32 -0700 |
| commit | 8defcb855ab01d9c8ab4759cb793d80149b55a8c (patch) | |
| tree | ed51eb30a2cbc92b102557498fb3e4113da1bb07 /ext/intl/php_intl.c | |
| parent | 9c7dbb0487f5991fde03873ea8f5e66d6688415f (diff) | |
| parent | baddb1c73a170ef1d2c31bd54cddbc6e1ab596b9 (diff) | |
| download | php-git-8defcb855ab01d9c8ab4759cb793d80149b55a8c.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (6215 commits)
Extra comma
Moved proxy object support in ASSIGN_ADD (and family) from VM to slow paths of corresponding operators
Simplification
zend_get_property_info_quick() cleanup and optimization
initialize lineno before calling compile file file in phar
Use ADDREF instead of DUP, it must be enough.
Removed old irrelevant comment
fixed compilation error
Fix bug #68262: Broken reference across cloned objects
export functions needed for phpdbg
Fixed compilation
Optimized property access handlers. Removed EG(std_property_info).
Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
Don't make difference between undefined and unaccessible properies when call __get() and family
Don't make useless CSE
array_pop/array_shift optimization
check for zlib headers as well as lib for mysqlnd
a realpath cache key can be int or float, catching this
News entry for new curl constants
News entry for new curl constants
...
Diffstat (limited to 'ext/intl/php_intl.c')
| -rw-r--r-- | ext/intl/php_intl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 65e53c8b5e..2c5e74809d 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -445,7 +445,7 @@ ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_idarg_static, 0, 0, 1 ) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_from_date_time_zone, 0, 0, 1 ) - ZEND_ARG_OBJ_INFO( 0, dateTimeZone, IntlDateTimeZone, 0 ) + ZEND_ARG_OBJ_INFO( 0, dateTimeZone, DateTimeZone, 0 ) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_create_enumeration, 0, 0, 0 ) @@ -910,7 +910,7 @@ PHP_MINIT_FUNCTION( intl ) /* For the default locale php.ini setting */ REGISTER_INI_ENTRIES(); - REGISTER_LONG_CONSTANT("INTL_MAX_LOCALE_LEN", INTL_MAX_LOCALE_LEN, CONST_CS); + REGISTER_LONG_CONSTANT("INTL_MAX_LOCALE_LEN", INTL_MAX_LOCALE_LEN, CONST_PERSISTENT | CONST_CS); REGISTER_STRING_CONSTANT("INTL_ICU_VERSION", U_ICU_VERSION, CONST_PERSISTENT | CONST_CS); #ifdef U_ICU_DATA_VERSION REGISTER_STRING_CONSTANT("INTL_ICU_DATA_VERSION", U_ICU_DATA_VERSION, CONST_PERSISTENT | CONST_CS); @@ -1032,8 +1032,8 @@ PHP_RINIT_FUNCTION( intl ) */ PHP_RSHUTDOWN_FUNCTION( intl ) { - if(INTL_G(current_collator)) { - INTL_G(current_collator) = NULL; + if(!Z_ISUNDEF(INTL_G(current_collator))) { + ZVAL_UNDEF(&INTL_G(current_collator)); } if (INTL_G(grapheme_iterator)) { grapheme_close_global_iterator( TSRMLS_C ); |