Derick Rethans
f9d1a47f24
Merge branch 'PHP-5.6'
2015-03-31 11:09:31 +01:00
Derick Rethans
346c8f7331
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-31 11:09:23 +01:00
Derick Rethans
2c117a40a7
Export date_get_immutable_ce() so that extensions can make use of it too.
2015-03-31 11:08:56 +01:00
Xinchen Hui
9203608878
Merge branch 'master' of https://git.php.net/repository/php-src
2015-03-31 16:52:43 +08:00
Xinchen Hui
ceb77b6472
Revert "Better to taverse reversely"
...
This reverts commit 51451ab84a
.
2015-03-31 16:52:30 +08:00
Lior Kaplan
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
Lior Kaplan
0c1c7c7ecb
Align entries format
2015-03-31 09:26:34 +03:00
Lior Kaplan
b3d4790976
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
2015-03-31 09:24:56 +03:00
Lior Kaplan
96e33a7e98
Add CVE for bug #69207
2015-03-31 09:23:34 +03:00
Lior Kaplan
e5fd3fc99d
Align NEWS entries with 5.6.7
2015-03-31 09:20:29 +03:00
Lior Kaplan
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
Lior Kaplan
1bc77559f3
Align entries format
2015-03-31 09:14:06 +03:00
Lior Kaplan
8654fdd884
Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
2015-03-31 09:12:05 +03:00
Lior Kaplan
639f92275a
Add CVE for bug #69207
2015-03-31 09:11:21 +03:00
Xinchen Hui
d7835ee224
Using int32_t opposite of uint32_t
2015-03-31 12:40:29 +08:00
Xinchen Hui
b72fd9c258
Merge branch 'master' of https://git.php.net/repository/php-src
2015-03-31 11:54:08 +08:00
Xinchen Hui
fd1a7c5f2d
Add XFAIL test
2015-03-31 11:53:52 +08:00
Nikita Popov
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
Kalle Sommer Nielsen
607b7d662a
Added missing zend_parse_parameters_none() to restore_error_handler() and restore_exception_handler() (Ferenc)
2015-03-30 17:57:32 +02:00
Michael Wallner
3ec9d9f3b6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN
Fixed bug #64931
2015-03-30 16:29:18 +02:00
Michael Wallner
b7389f0f07
BFN
2015-03-30 16:27:08 +02:00
Michael Wallner
a4490bb0a2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #64931
2015-03-30 16:25:47 +02:00
Michael Wallner
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
Michael Wallner
8994a5eb1d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN
Fixed Bug #65467
2015-03-30 15:41:53 +02:00
Michael Wallner
a24aefaac2
BFN
2015-03-30 15:41:36 +02:00
Michael Wallner
3c22449649
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #65467
2015-03-30 15:41:03 +02:00
Michael Wallner
6de25c155e
Fixed Bug #65467
...
Call to undefined method cli_arg_typ_string
Use cli_arg_typ_filecontent instead.
2015-03-30 15:39:30 +02:00
Michael Wallner
e148fff61d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN
fix bug #67761
2015-03-30 14:45:38 +02:00
Michael Wallner
64d9c98fa9
BFN
2015-03-30 14:43:02 +02:00
Michael Wallner
90a8b59e9c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix bug #67761
2015-03-30 14:42:37 +02:00
Michael Wallner
8f7e378b9f
fix bug #67761
...
Phar::mapPhar fails for Phars inside a path containing ".tar".
Strengthen the silly .tar file extension check.
2015-03-30 14:41:30 +02:00
Xinchen Hui
74090539c1
It's lowercase now
2015-03-30 20:32:02 +08:00
Xinchen Hui
ab4f120c6a
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
ext/opcache/Optimizer/pass1_5.c
2015-03-30 20:20:55 +08:00
Michael Wallner
3a660bf3a5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug 64343
; Lesson learned: do not rebase on a merge commit
2015-03-30 13:48:57 +02:00
Michael Wallner
ef52e44053
Fixed bug 64343
...
PharData::extractTo fails for tarball created by BSD tar
Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.
2015-03-30 13:20:09 +02:00
Michael Wallner
f4264ebc64
Fixed bug 64343
...
PharData::extractTo fails for tarball created by BSD tar
Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.
2015-03-30 13:11:06 +02:00
Xinchen Hui
3ad9ff197d
Fixed typos
2015-03-30 16:56:12 +08:00
Xinchen Hui
97956a5d08
Fixed tests
2015-03-30 16:25:41 +08:00
Xinchen Hui
51451ab84a
Better to taverse reversely
2015-03-30 15:26:59 +08:00
Xinchen Hui
c71c97e101
Fixed test
2015-03-30 14:18:23 +08:00
Kalle Sommer Nielsen
298a0554a7
This check here is not needed anymore for Windows (Unsupported Windows version check)
2015-03-30 04:13:43 +02:00
Kalle Sommer Nielsen
6a8ab3d7c6
Fix additional NULL byte added to string keys in get_header(), spotted by Ferenc
2015-03-30 00:52:28 +02:00
Anatol Belski
a7e6687df6
updated libmagic.patch
2015-03-29 18:22:42 +02:00
Anatol Belski
5b6427c40f
further sync with libmagic.orig
2015-03-29 18:17:02 +02:00
Anatol Belski
f51d78a35d
catch up with libmagic.orig
...
that'll simplify future merges
2015-03-29 18:11:11 +02:00
Anatol Belski
662c439087
fix typo
2015-03-29 17:59:28 +02:00
Anatol Belski
5e773b4ce5
catch up with libmagic.orig
2015-03-29 17:57:22 +02:00
Anatol Belski
a935c02210
added test for bug #69320
2015-03-29 17:52:38 +02:00
Anatol Belski
aeabea4aa9
Fixed bug #69320 libmagic crash when running laravel tests
...
Basically reverted the part of the new patch to what we have in 5.6
as the current change seems to have bad side effects. Hovere the
in buffer used for PCRE is still doubled (1 << 14), this might or
might not be optimal, so lets observe.
2015-03-29 17:42:59 +02:00
Anatol Belski
2accf544cb
ifdef win only api
2015-03-29 13:18:25 +02:00