fcd195aa64
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix SOAP for uninitialzed object
2014-07-28 11:38:20 -07:00
180db42a90
fix SOAP for uninitialzed object
2014-07-28 11:38:06 -07:00
f281a315f7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix NEWS
Fix missing type checks in various functions
2014-07-28 00:39:24 -07:00
7f865ffdd8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix NEWS
2014-07-28 00:39:00 -07:00
f782ea5b42
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2014-07-28 00:38:50 -07:00
3e167ba990
fix NEWS
2014-07-28 00:38:10 -07:00
c41ca94824
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix missing type checks in various functions
Conflicts:
ext/openssl/openssl.c
2014-07-28 00:37:32 -07:00
531be9662f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix missing type checks in various functions
2014-07-28 00:34:27 -07:00
b4a4db467b
Fix missing type checks in various functions
2014-07-27 02:42:49 -07:00
47a12117c3
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix SPL objects initialization checks
2014-07-26 19:37:37 -07:00
90a0d58af8
Fix SPL objects initialization checks
2014-07-26 18:59:16 -07:00
faaa0ffdc4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add object initialization checks for sqlite3 classes
2014-07-26 16:58:09 -07:00
403eca4173
Add object initialization checks for sqlite3 classes
2014-07-26 16:57:45 -07:00
03dcdf5742
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert "Fix bug #66568 : the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
2014-07-25 13:16:31 +02:00
a68ef0a117
Revert "Fix bug #66568 : the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
...
This reverts commit aefc8f22b3
2014-07-25 13:15:27 +02:00
7abaac41fd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
Fixed Bug #67538 (SPL Iterators use-after-free)
2014-07-24 22:59:01 -07:00
3345722354
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
Fixed Bug #67538 (SPL Iterators use-after-free)
2014-07-24 22:58:29 -07:00
fedc799344
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
Fixed Bug #67538 (SPL Iterators use-after-free)
2014-07-24 22:58:06 -07:00
d0a244f1f3
update NEWS
2014-07-24 22:55:39 -07:00
51c38a0997
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
2014-07-24 22:54:14 -07:00
61e0f8599d
Fixed Bug #67538 (SPL Iterators use-after-free)
2014-07-24 22:53:46 -07:00
ec441ff4ed
Merge branch 'PHP-5.6'
2014-07-25 10:52:57 +08:00
bad5502ca9
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
2014-07-25 10:52:46 +08:00
235d0241d1
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-25 10:52:41 +08:00
4ae1d5d1bd
Add CVE no
2014-07-25 10:52:27 +08:00
0ac3d8d4f4
Merge branch 'PHP-5.6'
2014-07-24 18:02:00 +02:00
8d1ec3814e
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-24 18:01:35 +02:00
acfa8c770c
BFN
2014-07-24 18:00:58 +02:00
432bd117a9
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-24 18:00:06 +02:00
d491b2f916
Fix bug #67496 Save command history when exiting interactive shell with control-c
2014-07-24 17:58:39 +02:00
6fdbb4601f
Merge branch 'PHP-5.6'
2014-07-24 16:59:37 +02:00
210315d5a5
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-24 16:58:50 +02:00
899b369e15
BFN
2014-07-24 16:58:05 +02:00
ffc1d25b37
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-24 16:56:05 +02:00
71d3a69425
Fix bug #55496 Interactive mode doesn't force a newline before the prompt
2014-07-24 16:53:51 +02:00
4b41009064
Merge branch 'PHP-5.6'
2014-07-24 14:40:30 +08:00
aab23cf38e
Updated NEWS for #67666
2014-07-24 14:39:18 +08:00
38e714ece5
Fixed #67666 - Subject altName doesn't match wildcards
2014-07-24 14:36:31 +08:00
8fb7c4dc08
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Removed second zval_copy_ctor()
2014-07-24 01:16:28 +04:00
ea1d5dcacb
Removed second zval_copy_ctor()
2014-07-24 01:16:00 +04:00
39740a33e5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed crash on self-referencing constant expression (part of a constant AST)
2014-07-24 00:59:42 +04:00
d909b6330e
Fixed crash on self-referencing constant expression (part of a constant AST)
2014-07-24 00:37:15 +04:00
4c37e69957
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set)
2014-07-23 22:49:46 +04:00
c49a06168e
Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set)
2014-07-23 22:47:58 +04:00
b39f98cf81
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix nmake snap when ext name is different in target dll
2014-07-21 14:48:06 +02:00
a6ecb873b9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix nmake snap when ext name is different in target dll
2014-07-21 14:47:40 +02:00
6fcd8e5865
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix nmake snap when ext name is different in target dll
2014-07-21 14:46:57 +02:00
dc3a5d783f
fix nmake snap when ext name is different in target dll
2014-07-21 14:45:49 +02:00
833e466983
Merge branch 'PHP-5.6'
...
* PHP-5.6:
force atoll macro usage on windows
2014-07-21 10:01:48 +02:00
f6d941e4b4
force atoll macro usage on windows
2014-07-21 09:52:52 +02:00
Stanislav Malyshev