clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,330 Commits 494 Branches 1,367 Tags 801 MiB
a8bf1c5d8f
Commit Graph

89330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitry Stogov
2afca9f179 Fixed test 2015-03-30 21:48:54 +03: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
Dmitry Stogov
1018f462d8 Patch improvement: 
Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.
 2015-03-30 18:53:38 +03: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
Dmitry Stogov
9155a267ad Merge branch 'InternalClassClean' of github.com:Danack/php-src into InternalClassClean 
* 'InternalClassClean' of github.com:Danack/php-src:
  Fixed indentation. Fixed comment style. Fixed commented out code.
  Reverted change to function name and added note of why it is different from the class it is actually changing.
  Made UConverter throw an exception if the constructor fails.
  Fixed PDO constructor to not return null.
  Fixed fileinfo behaviour.
  Made Phar throw exception on bad constructor.
  Converted intl extension to use IntlException in constructors.
  Fixed SplFixedArray and tests.
  Fixed ReflectionExtension and ReflectionProperty.
  Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
  Fixed PDORow behaviour and message.
 2015-03-30 12:14:43 +03: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
Kalle Sommer Nielsen
19bc9a8dd8 Update credits 2015-03-29 10:15:43 +02:00
Kalle Sommer Nielsen
de2d244f8e We can re-use the already existing EG(windows_version_info) here and save a little bit of memory too! 2015-03-29 09:47:14 +02:00
Kalle Sommer Nielsen
c48611772d Remove the special disabled functions on Windows, since we don't even support those versions of Windows anymore hence it makes no sense to even check for it 2015-03-29 09:41:47 +02:00
Kalle Sommer Nielsen
a141ccb4ff Another minor cleanup, drop ENFORCE_SAFE_MODE (all except pdo_pgsql have #if's for checking already) 2015-03-29 09:34:05 +02:00
Kalle Sommer Nielsen
7845bcd827 Shameless self credit for the Windows support for contributions in the almost past decade (How time flies when you are having fun) 2015-03-29 08:11:08 +02:00
Kalle Sommer Nielsen
a7b4f32519 This should be the last of the old VC stuff in the Windows build system, also up the check to require VC11 now 2015-03-29 08:05:42 +02:00
Kalle Sommer Nielsen
0ca8ffa2b8 Forgot this one in the last commit, removes old VC support from ext/fileinfo 2015-03-29 07:54:18 +02:00
Kalle Sommer Nielsen
60cbef19a2 Drop the VC6 portable version of strtoi64, as it is no longer needed 2015-03-29 07:49:35 +02:00
Kalle Sommer Nielsen
88b9d485d6 Drop old VC support for ext/fileinfo. 
@Anatol, I generated the updated patch file against file 5.22, since you are the one that usually updates it, can you please confirm it works?
 2015-03-29 07:48:48 +02:00
Kalle Sommer Nielsen
75e86b44fc Drop this redundant check, since the minimum version of VC we support is VC11 (_MSC_VER == 1700) in ext/date 2015-03-29 07:14:54 +02:00
Kalle Sommer Nielsen
313d01f30a Drop old VC support in Zend Engine, this also kills the remaining MessageBox fix for Windows 9x that Anatol changed a while back 2015-03-29 07:10:39 +02:00
Kalle Sommer Nielsen
43457f960f Drop old VC support (VC <= 9), for dns.c, this means that DNS_TYPE_NAPTR always is available 2015-03-29 06:57:11 +02:00