Xinchen Hui
aadf7366e0
Merge branch 'PHP-5.6'
...
Conflicts:
ext/spl/spl_observer.c
2015-02-25 18:23:54 +08:00
Xinchen Hui
d05575afd0
Update NEWs
2015-02-25 18:22:41 +08:00
Xinchen Hui
9641bac0f5
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-25 18:22:18 +08:00
Xinchen Hui
ffdc5728c8
Fixed bug #69108 ("Segmentation fault" when (de)serializing SplObjectStorage)
2015-02-25 18:21:59 +08:00
Dmitry Stogov
c2c78dc963
Added specialized versions of DO_FCALL handler:
...
DO_ICALL - for internal functions
DO_UCALL - for user functions
DO_FCALL_BY_NAME - plain, most probably user, funcstions (not methods)
2015-02-25 10:37:21 +03:00
Dmitry Stogov
5f278e4d3a
Use cache_slot offsets instead of indexes (simplify run-time instructions)
2015-02-25 01:52:35 +03:00
Dmitry Stogov
dcb96c2e03
Split INIT_FCALL_BY_NAME inti INIT_FCALL_BY_NAME(CONST+STRING) and INIT_DYNAMIC_CALL(CONST-STRING|TMPVAR|CV)
2015-02-24 22:29:47 +03:00
Nikita Popov
bdf1430eeb
Support list($a, $b) = $a
...
By compiling the RHS $a as a non-CV fetch.
This worked as expected in PHP 5, but broke in PHP 7 due to the
different assign order. However the new implementation is more
general, in that it allows $a on the LHS in any place, not just
the first element.
2015-02-24 19:08:23 +01:00
Dmitry Stogov
0ef5a6b409
Avoid unnecassary check
2015-02-24 19:21:21 +03:00
Dmitry Stogov
e97ae4fee8
Make zend_array_destroy() to free the corresponding zend_array
2015-02-24 18:34:37 +03:00
Dmitry Stogov
26be614400
Eliminate check on the fast path
2015-02-24 18:34:15 +03:00
Dmitry Stogov
745504ea2a
Make current() and key() receive argument by value.
2015-02-24 17:40:25 +03:00
Popa Adrian Marius
3e6380d64b
Use Firebird default home folder, replace Interbase with Firebird
2015-02-24 13:58:14 +02:00
Julien Pauli
09c43bd398
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
updated NEWS
curl: add new proxy constants
2015-02-23 11:23:57 +01:00
Julien Pauli
caacaee681
Updated NEWS
2015-02-23 11:23:48 +01:00
Julien Pauli
5256ffd4fe
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
curl: add new proxy constants
2015-02-23 11:23:00 +01:00
Julien Pauli
1bfbb546f7
updated NEWS
2015-02-23 11:22:44 +01:00
Linus Unnebäck
63ab6d8249
curl: add new proxy constants
2015-02-23 11:19:36 +01:00
Julien Pauli
4f399a7c36
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed test fails for bug68557
2015-02-23 10:40:45 +01:00
Julien Pauli
ee2f749a22
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test fails for bug68557
2015-02-23 10:35:35 +01:00
Xinchen Hui
d5a1a3342b
Fixed test fails for bug68557
2015-02-23 10:35:16 +01:00
Derick Rethans
a18ffe407c
Merge branch 'pr/1103'
2015-02-23 08:57:20 +00:00
Jakub Zelenka
ad2b751985
Merge branch 'PHP-5.6'
...
The fix for master is a bit different (it's fixed in encoder)
2015-02-22 20:54:05 +00:00
Jakub Zelenka
97d809a8a5
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/json/json.c
2015-02-22 20:35:03 +00:00
Jakub Zelenka
591dbcabe5
Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e)
2015-02-22 20:22:47 +00:00
Rasmus Lerdorf
7ea5b3f71c
NEWS entry
2015-02-22 08:32:32 -08:00
Rasmus Lerdorf
ffd2fda0f3
NEWS entry
2015-02-22 08:31:17 -08:00
Rasmus Lerdorf
a9ba407ce1
Fix bug #68166
...
We can't always efree here
php_escape_html_entities can return an interned_empty_string
2015-02-22 08:25:56 -08:00
Rasmus Lerdorf
e12b72d3f7
Fix bug #68166
...
We can't always efree here
php_escape_html_entities can return an interned_empty_string
2015-02-22 08:14:41 -08:00
Anatol Belski
485345a7f1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
2015-02-22 16:48:22 +01:00
Anatol Belski
98959f6220
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
2015-02-22 16:47:56 +01:00
Anatol Belski
871d51929b
updated NEWS
2015-02-22 16:47:44 +01:00
Anatol Belski
8f6a013c97
updated NEWS
2015-02-22 16:46:39 +01:00
Anatol Belski
a31f4ef884
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix Win32 SSPI initialization for digest authentication in cURL
2015-02-22 16:27:27 +01:00
Anatol Belski
e656932d0e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix Win32 SSPI initialization for digest authentication in cURL
2015-02-22 16:26:52 +01:00
Anatol Belski
68afd75ecd
Merge branch 'pull-request/1112' into PHP-5.5
2015-02-22 16:26:02 +01:00
Grant Pannell
7988f703f8
Fix Win32 SSPI initialization for digest authentication in cURL
2015-02-22 23:34:55 +10:30
Xinchen Hui
078340b563
correct title
2015-02-22 00:22:20 +08:00
Xinchen Hui
e3416beb03
Fixed segfault because resource is freed prematurely
2015-02-22 00:19:06 +08:00
Xinchen Hui
f25419f8e3
Only do this in debug build
2015-02-21 22:44:51 +08:00
Xinchen Hui
865a719a3f
Fixed mem issue with internal return type hinting assert
2015-02-21 22:17:17 +08:00
Anatol Belski
3fd613effb
removed duplicated code
...
the exact same function is already used in ext/standard/flock_compat.*
2015-02-21 14:27:14 +01:00
Anatol Belski
7aec946ddb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
revisit fix for bug #65272
Conflicts:
ext/standard/file.c
2015-02-21 14:16:06 +01:00
Anatol Belski
3cf2b7cc2b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
revisit fix for bug #65272
Conflicts:
ext/standard/file.c
2015-02-21 14:14:24 +01:00
Anatol Belski
6751f8b314
revisit fix for bug #65272
2015-02-21 14:10:59 +01:00
Xinchen Hui
ea94be490a
Fixed test fails for bug68557
2015-02-21 12:36:38 +08:00
Xinchen Hui
4629f8978e
Cleanup globals initialization
...
No needs explicit inititlize zero for globals in no-zts build.
executor_globals should be initialized in zend side.
2015-02-21 11:35:16 +08:00
Xinchen Hui
2a724becc1
Unused vars
2015-02-21 11:02:20 +08:00
Xinchen Hui
1c31ad4f0d
Unused var
2015-02-21 10:58:23 +08:00
Dmitry Stogov
e142e31137
Fixed memory leak
2015-02-20 20:50:01 +03:00
