com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_compile.c ext/date/php_date.c ext/phar/ph ar.c
| From: | Anatol Belski | Date: | Sun, 05 Oct 2014 17:26:17 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_compile.c ext/date/php_date.c ext/phar/ph ar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82106@lists.php.net to get a copy of this message | ||
Commit: a91d3580a7c9461729608c4b7e2c193cdf4206ce
Author: Anatol Belski <ab@php.net> Sun, 5 Oct 2014 19:26:17 +0200
Parents: 11cf279196a7edba43080b3497fa04abe5a0e5f5 d58b70622a7e99ceee074e420d9271c2d8de116c
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a91d3580a7c9461729608c4b7e2c193cdf4206ce
Log:
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
properly export tsrm_strtok_r()
Fixed list() behavior inconsistency (string handling is disabled for all cases, ArrayAccess
objects handling is enabled for all cases, ZEND_FETCH_DIM_TMP_VAR opcode is renamed into
ZEND_FETCH_LIST, ZEND_FETCH_ADD_LOCK flag is removed).
Fix accidental edit in previous commit
Fix arginfo
DateTimeZone::getOffset() now accepts a DateTimeInterface
DateTimeZone::getOffset() now accepts a DateTimeInterface
Moved checks and error reporting related to static methods from DO_FCALL inti INTI_FCALL* opcodes
that may really deal with static methods. (In some rare cases it may lead to different order of
warning messages).
Fixed a bug that causes crash when environment variable is access while parsing php.ini
Fixed a bug that causes crash when environment variable is access while parsing php.ini
Changed paths:
MM Zend/zend_compile.c
MM ext/date/php_date.c
MM ext/phar/phar.c
Diff: