clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 22:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,154 Commits 494 Branches 1,367 Tags 797 MiB
193de2a679
Commit Graph

89154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
193de2a679 Fixed memleak 
ext/standard/tests/serialize/bug69210.phpt
 2015-03-28 14:35:14 +08:00
Xinchen Hui
e60b380c55 Merge branch 'bug69315' of https://github.com/laruence/php-src 2015-03-28 14:10:41 +08:00
Xinchen Hui
4328999d2c Merge branch 'master' of https://git.php.net/repository/php-src 2015-03-28 11:02:23 +08:00
Kalle Sommer Nielsen
8153286efe Drop zend_indent() as it was never used, complete or working 2015-03-27 20:04:46 +01:00
Nikita Popov
c64f5e3332 Disallow direct incdec of function return value 
Matching PHP 5 behavior.

We may want to support this for by-reference returns, but that
requires implementing further checks.
 2015-03-27 16:40:04 +01:00
Kalle Sommer Nielsen
f678519a63 Merge branch 'master' of https://git.php.net/push/php-src 2015-03-27 15:21:52 +01:00
Kalle Sommer Nielsen
dd601e661c Remove these CFLAGS for ereg in opcache, we don't use them anymore (as opcache uses PCRE) together with ereg being gone 2015-03-27 15:01:31 +01:00
Leigh
456f4a78d2 Add RAND_egd check for compiling against LibreSSL 2015-03-27 13:33:22 +01:00
Xinchen Hui
84d9426730 Fixed bug #69315 2015-03-27 17:50:36 +08:00
Xinchen Hui
4ef3f4e76a Useless comment 2015-03-26 13:50:43 +08:00
Kalle Sommer Nielsen
d9d74d37ac Fix test on Windows 2015-03-26 03:29:18 +01:00
Kalle Sommer Nielsen
9dfe033ae4 Fix test on Windows 2015-03-26 03:22:57 +01:00
Kalle Sommer Nielsen
5e9036a2a1 Another CRLF test fix 2015-03-26 03:18:42 +01:00
Kalle Sommer Nielsen
71734d64c8 Fix tests on Windows 
CRLF takes +2 bytes when running the tests, making it yield 13 instead of 11
 2015-03-26 03:13:50 +01:00
Kalle Sommer Nielsen
10e1b13ac5 Minor cosmetics for our test functions in the debug build 2015-03-26 02:03:55 +01:00
Kalle Sommer Nielsen
1c5994184f Added tests for the naming collision error message to handle all possible conditions 2015-03-26 01:59:23 +01:00
Kalle Sommer Nielsen
67b907f059 Change the error message for colliding class/interface/trait names to be a little more clearer. 
C:\> php -r "interface stdClass { }"
  Error: Cannot declare interface stdClass, because the name is already in use in Command Line Code on line 1
 2015-03-26 01:44:23 +01:00
Anatol Belski
2cd07c377d remove recognition for no more supported OSes 2015-03-25 19:31:50 +01:00
Xinchen Hui
d55d10c7fd Fixed bug #69299 (Regression in array_filter's $flag argument in PHP 7) 2015-03-25 23:50:54 +08:00
Xinchen Hui
6aaee5fc14 Merge branch 'PHP-5.6' 
Conflicts:
	ext/opcache/Optimizer/pass1_5.c
 2015-03-25 23:35:56 +08:00
Xinchen Hui
c7da95e5ab Merge branch 'master' of https://git.php.net/repository/php-src 2015-03-25 23:29:31 +08:00
Xinchen Hui
e46e9a3d22 Fixed Bug #69297 (function_exists strange behavior with OPCache on disabled function) 
is_callable returns true for disable_functions, but function_exists
return false for it.
 2015-03-25 23:29:18 +08:00
Anatol Belski
1f84e29506 integrate static tsrm_ls cache for ext/odbc 2015-03-25 15:32:36 +01:00
Anatol Belski
774b113b32 fix datatype mismatches 2015-03-25 15:32:36 +01:00
Anatol Belski
fe36285de2 fix datatype mismatches 2015-03-25 15:32:35 +01:00
Michael Wallner
0ae011f3a7 RFC:continue_ob accepted 2015-03-25 15:22:49 +01:00
Remi Collet
2fe6acd8f5 expose destroy_uploaded_files_hash in the API (used by apfd extension) 2015-03-25 14:33:47 +01:00
Anatol Belski
d16a900731 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
  fix dir separator in test
 2015-03-25 13:17:19 +01:00
Anatol Belski
c87aee8a8a updated bundled libsqlite to 3.8.8.3 2015-03-25 13:16:56 +01:00
Anatol Belski
7461c52248 updated NEWS 2015-03-25 13:14:42 +01:00
Anatol Belski
c9550e81da Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
  fix dir separator in test
 2015-03-25 13:13:42 +01:00
Anatol Belski
1b41dcf9c5 Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3 2015-03-25 13:13:03 +01:00
Anatol Belski
8f9cb39cad fix dir separator in test 2015-03-25 13:11:27 +01:00
Remi Collet
23336d77a6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
  Fixed typo
  Fixed typo
 2015-03-25 10:33:39 +01:00
Remi Collet
3924548bcb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
 2015-03-25 10:33:31 +01:00
Remi Collet
1174b399ad revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared 2015-03-25 10:33:08 +01:00
Kalle Sommer Nielsen
02be73b5fa Constness to zend_get_object_type(), thanks Michael! 2015-03-25 07:01:04 +01:00
Xinchen Hui
f2e6b86fdc Merge branch 'PHP-5.6' 2015-03-25 13:54:49 +08:00
Xinchen Hui
eb98366642 Fixed typo 2015-03-25 13:54:42 +08:00
Xinchen Hui
3ab1513ac9 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-25 13:54:30 +08:00
Xinchen Hui
23520d7957 Fixed typo 2015-03-25 13:54:12 +08:00
Kalle Sommer Nielsen
c340b186f8 Merge branch 'master' of https://git.php.net/push/php-src 2015-03-25 06:32:29 +01:00
Kalle Sommer Nielsen
927d53fda4 Change "Cannot redeclare class X" into "Cannot redeclare class/interface/trait X", meaning that the following: 
C:\> php -r "trait A { } trait A { }"

Will now properly print "Cannot redeclare trait A" instead of "Cannot redeclare class A" to make error messages a tiny bit clearer. Admittedly, a better solution can most likely be made by actually telling what the colliding object is a type of.

Internally this adds a new function:
 zend_get_object_type()
 2015-03-25 06:31:11 +01:00
Kalle Sommer Nielsen
a3d2f9b600 The error message is actually "Cannot", not "Can't" 2015-03-25 05:20:58 +01:00
Xinchen Hui
db76b8c01f Merge branch 'PHP-5.6' 
Conflicts:
	ext/soap/php_encoding.c
 2015-03-25 12:10:54 +08:00
Xinchen Hui
3eb893396a Update NEWS 2015-03-25 12:10:25 +08:00
Xinchen Hui
86bbacfd53 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-25 12:09:35 +08:00
Xinchen Hui
0e1024f25a UPdate NEWS 2015-03-25 12:09:21 +08:00
Xinchen Hui
76c1ec5e96 Bug #69293 NEW segfault when using SoapClient::__setSoapHeader (bisected, regression) 
This was a typo introduced in c8eaca013a
 2015-03-25 12:07:25 +08:00
Dmitry Stogov
550b07ae1b cleanup 2015-03-25 01:57:05 +03:00