ed772e1a99
Fixed test
2015-04-01 09:56:55 +08:00
a2752faaa8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix release date
2015-04-01 01:42:26 +02:00
8de838dc26
fix release date
2015-04-01 01:42:12 +02:00
7a84967ba7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.6.9 is up next
2015-04-01 01:31:48 +02:00
a5e68f72a7
5.6.9 is up next
2015-04-01 01:30:51 +02:00
9df685ef90
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68739 (Missing break / control flow in curl)
Fixed bug #68740 (NULL Pointer Dereference)
Fixed bug #68677 (Use After Free in OPcache)
Conflicts:
ext/ereg/regex/regcomp.c
2015-04-01 01:59:21 +03:00
04c9271805
Add changelog entries for #68677 , #68739 & #68740
2015-04-01 01:55:35 +03:00
c22543b3f3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68739 (Missing break / control flow in curl)
Fixed bug #68740 (NULL Pointer Dereference)
Fixed bug #68677 (Use After Free in OPcache)
2015-04-01 01:54:53 +03:00
a32c8ba719
Fixed bug #68739 (Missing break / control flow).
...
Fixed bug #68740 (NULL Pointer Dereference).
Fixed bug #68677 (Use After Free).
2015-04-01 01:45:34 +03:00
1add8401a3
Fixed bug #68739 (Missing break / control flow in curl)
...
(cherry picked from commit 124fb22a13
2015-04-01 01:24:26 +03:00
059e774db0
Fixed bug #68740 (NULL Pointer Dereference)
...
(cherry picked from commit 124fb22a13
2015-04-01 01:24:26 +03:00
0a8f28b432
Fixed bug #68677 (Use After Free in OPcache)
...
(cherry picked from commit 777c39f404
2015-04-01 01:24:16 +03:00
2bf8f29d16
Converted most object handlers fatal errors into EngineExceptions
2015-04-01 00:37:59 +03:00
6ef9216269
Finish PHP 4 constructor deprecation
2015-03-31 17:55:27 +02:00
db76b708cf
Deprecate PHP 4 constructors
2015-03-31 17:55:27 +02:00
d252c9f832
Merge branch 'PHP-5.6'
...
Conflicts:
ext/date/lib/parse_date.c
ext/date/php_date.c
2015-03-31 16:36:51 +01:00
2d3868984c
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-31 16:35:10 +01:00
ffbd380e44
Fixed bug #69336 (Issues with "last day of <monthname>").
2015-03-31 16:35:03 +01:00
1737e44dec
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.5.25 now
2015-03-31 16:00:17 +02:00
133c57198e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.25 now
2015-03-31 15:57:44 +02:00
97a1b34300
5.5.25 now
2015-03-31 15:51:47 +02:00
463ca30c8c
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
force ext/odbc to be shared in snapshot build
2015-03-31 16:36:26 +03:00
685ab95add
Convert fatal errors on improper access to static properties into EngineExceptions
2015-03-31 16:35:27 +03:00
b13df7327f
force ext/odbc to be shared in snapshot build
2015-03-31 12:54:10 +02:00
e8672deefc
Convert "Unsupported operands" fatal error into EngineException (exceptions can't be thrown at compile-time yet, so unsuported operands in constant expressions are still lead to fatal error).
2015-03-31 13:25:26 +03:00
f9d1a47f24
Merge branch 'PHP-5.6'
2015-03-31 11:09:31 +01:00
346c8f7331
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-31 11:09:23 +01:00
2c117a40a7
Export date_get_immutable_ce() so that extensions can make use of it too.
2015-03-31 11:08:56 +01:00
9203608878
Merge branch 'master' of https://git.php.net/repository/php-src
2015-03-31 16:52:43 +08:00
ceb77b6472
Revert "Better to taverse reversely"
...
This reverts commit 51451ab84a
2015-03-31 16:52:30 +08:00
5417f22e99
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Align entries format
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
Add CVE for bug #69207
Align NEWS entries with 5.6.7
Align entries format
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
Add CVE for bug #69207
2015-03-31 09:28:22 +03:00
0c1c7c7ecb
Align entries format
2015-03-31 09:26:34 +03:00
b3d4790976
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
2015-03-31 09:24:56 +03:00
96e33a7e98
Add CVE for bug #69207
2015-03-31 09:23:34 +03:00
e5fd3fc99d
Align NEWS entries with 5.6.7
2015-03-31 09:20:29 +03:00
90329a32dc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Align entries format
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
Add CVE for bug #69207
2015-03-31 09:17:13 +03:00
1bc77559f3
Align entries format
2015-03-31 09:14:06 +03:00
8654fdd884
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
2015-03-31 09:12:05 +03:00
639f92275a
Add CVE for bug #69207
2015-03-31 09:11:21 +03:00
d7835ee224
Using int32_t opposite of uint32_t
2015-03-31 12:40:29 +08:00
b72fd9c258
Merge branch 'master' of https://git.php.net/repository/php-src
2015-03-31 11:54:08 +08:00
fd1a7c5f2d
Add XFAIL test
2015-03-31 11:53:52 +08:00
53a40386bc
Implement additional type reservations
...
* The class names false, true and null are now reserved.
* The code dealing with reserved class names is now decoupled
from scalar type hint handling. It also includes self, parent,
and static, which are class names which were already reserved
previously.
* Reuse existing messages for reserved class names.
Fallout: class_alias() can no longer alias self, parent and static.
However this never really worked in the first place, as the test
which was testing this shows.
2015-03-30 22:59:06 +02:00
607b7d662a
Added missing zend_parse_parameters_none() to restore_error_handler() and restore_exception_handler() (Ferenc)
2015-03-30 17:57:32 +02:00
3ec9d9f3b6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN
Fixed bug #64931
2015-03-30 16:29:18 +02:00
b7389f0f07
BFN
2015-03-30 16:27:08 +02:00
a4490bb0a2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #64931
2015-03-30 16:25:47 +02:00
6480725007
Fixed bug #64931
...
phar_add_file is too restrive on filename
Check for any of '/', '\\', '\0' after ".phar".
2015-03-30 16:24:19 +02:00
8994a5eb1d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN
Fixed Bug #65467
2015-03-30 15:41:53 +02:00
a24aefaac2
BFN
2015-03-30 15:41:36 +02:00
Xinchen Hui