d58b70622a
properly export tsrm_strtok_r()
...
for this particular case fixing phar shared build, but for the
general usage anyway
2014-10-05 13:20:27 +02:00
7c7b9184b1
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).
2014-10-05 13:02:58 +04:00
429e1b45a7
Merge branch 'PHP-5.6'
2014-10-04 20:07:00 +02:00
79ca53b62b
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-04 20:06:44 +02:00
b386991471
Fix accidental edit in previous commit
2014-10-04 20:06:02 +02:00
a1347a0190
Merge branch 'PHP-5.6'
2014-10-04 20:00:40 +02:00
61d29990b4
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-04 20:00:10 +02:00
136dd53ac2
Fix arginfo
2014-10-04 19:59:21 +02:00
9680829389
DateTimeZone::getOffset() now accepts a DateTimeInterface
...
Fixes #68062
Should be backported to PHP-5.6 and PHP-5.5.
Conflicts:
ext/date/tests/bug67118.phpt
2014-10-04 16:06:04 +01:00
e326377824
Merge branch 'PHP-5.6'
2014-10-04 16:00:29 +01:00
0e5f475f5e
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-04 15:59:17 +01:00
0874ef624c
Merge branch 'PHP-5.4' into PHP-5.5
2014-10-04 15:58:40 +01:00
046c345de5
DateTimeZone::getOffset() now accepts a DateTimeInterface
...
Fixes #68062
2014-10-04 15:58:24 +01:00
2e1b8ba4b7
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).
2014-10-04 14:55:44 +04:00
f1e21c4979
Fix test gc_029_zts.phpt
...
In ZTS the default properties are duplicated (instead of copied),
so the array has one lower RC than on NTS and as such gets destroyed
during GC, increasing the cycle count by 3. PHP 5.6 didn't always
copy default properties on ZTS, which is where the difference comes
from.
2014-10-04 00:37:15 +02:00
2fd7d60ea0
Merge branch 'master' of git.php.net:php-src
2014-10-03 16:43:58 -04:00
0e18003374
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-10-03 16:43:35 -04:00
ef0eed7f5f
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-10-03 16:43:08 -04:00
a7d2747890
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:42 -04:00
5b08e56eca
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:27 -04:00
0cc2600ec6
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:15 -04:00
e9b2340151
fix asinh delivering -0 when the arg is 0
2014-10-03 22:18:21 +02:00
b68886f7b5
Mark test for full GC root buffer as XFAIL
2014-10-03 22:02:02 +02:00
4e33f40445
Fix two date tests
...
New behavior seems much more reasonable - nothing should be able
to touch the $this value like that.
2014-10-03 22:02:02 +02:00
5831cca957
Mark three foreach tests as XFAIL
...
A lot of work is needed to properly handle all foreach edge cases,
which is not going to happen anytime soon. So marking these tests
as XFAIL for now.
2014-10-03 22:02:02 +02:00
d2161c8104
reveal some newer libcurl features in MINFO
2014-10-03 21:47:00 +02:00
c6b982a55d
Merge branch 'PHP-5.6'
2014-10-03 21:42:35 +02:00
56da3638c4
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-03 21:42:28 +02:00
d67c05bb89
Fix bug number
2014-10-03 21:41:58 +02:00
443374675e
Merge branch 'PHP-5.6'
...
Conflicts:
Zend/zend_object_handlers.c
2014-10-03 21:30:06 +02:00
8617f2fa8d
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-03 21:27:07 +02:00
93288d0095
Fix bug #68188
2014-10-03 21:26:39 +02:00
e7623f470f
Fix bug #68133 and bug #68135
2014-10-03 21:06:26 +02:00
1ff094deb4
remove the remains of dsp files handling
2014-10-03 19:38:40 +02:00
ea5f6eaf19
fix EX usage
2014-10-03 19:23:34 +02:00
647ebe6bf2
remove misprint parentheses
2014-10-03 19:23:33 +02:00
55c6737b73
remove misprint parentheses
2014-10-03 19:23:32 +02:00
bd9a234645
Replaced EG(This) and EX(object) with EX(This).
...
Internal functions now recieves zend_execute_data as the first argument.
2014-10-03 19:32:46 +04:00
5e39d0c19c
And this one...
2014-10-03 19:07:02 +08:00
aa5f937958
It should be in extern c
2014-10-03 18:35:57 +08:00
f54f5368e4
Merge branch 'master' of https://git.php.net/repository/php-src
2014-10-03 18:35:18 +08:00
54bad8bf57
Remove useless condition
2014-10-03 18:35:05 +08:00
e13e305b93
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS entry for previous commit
NEWS entry for previous commit
add IPv6 support to php-fpm
2014-10-03 11:40:05 +02:00
79e05bf557
NEWS entry for previous commit
2014-10-03 11:39:53 +02:00
200e407b24
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS entry for previous commit
add IPv6 support to php-fpm
2014-10-03 11:39:09 +02:00
25e65a7599
NEWS entry for previous commit
2014-10-03 11:38:32 +02:00
15ba757a2b
add IPv6 support to php-fpm
2014-10-03 11:35:27 +02:00
5c63a4f72b
Micro optimization for the most frequency case
2014-10-03 12:18:15 +04:00
1fab968a90
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add hash to EXTENSIONS file
2014-10-02 18:55:39 -07:00
f41a7b926a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add hash to EXTENSIONS file
2014-10-02 18:55:29 -07:00
Anatol Belski