Commit Graph

90182 Commits

Author SHA1 Message Date
Anatol Belski
a6190359ad add vim modelines 2015-05-20 19:14:05 +02:00
Anatol Belski
a233af16b9 add vim modeline 2015-05-20 19:14:04 +02:00
Anatol Belski
5dc7db8ee7 disable unused members in struct rusage 2015-05-20 19:14:02 +02:00
Christoph M. Becker
b654aa4606 added SKIPIF section to test to make sure that GLOB_BRACE is supported 2015-05-20 18:39:07 +02:00
Nikita Popov
b081da657e Expose pdo stmt ctor args to gc
These very commonly contain a reference to the PDO object itself.
2015-05-20 18:28:09 +02:00
Nikita Popov
4e03ba4a6e Add GC support for ArrayObject
gc_024 test changes because the array that ArrayObject holds is
now counted separately from the ArrayObject.
2015-05-20 18:28:09 +02:00
Nikita Popov
4ea1d8a9c7 Show argument causing TypeException in trace
Not sure why that check was there, did I miss something?
2015-05-20 18:28:09 +02:00
Kalle Sommer Nielsen
e60c119695 Merge branch 'master' of https://git.php.net/push/php-src 2015-05-20 16:15:40 +02:00
Kalle Sommer Nielsen
958d9505aa long > zend_long (Thanks Anatol) 2015-05-20 16:15:11 +02:00
Anatol Belski
8dbd39d96e fixed test 2015-05-20 15:56:16 +02:00
Kalle Sommer Nielsen
e634f07f1e Merge branch 'master' of https://git.php.net/push/php-src 2015-05-20 15:50:00 +02:00
Kalle Sommer Nielsen
22fc3baa7a Windows support for getrusage()
* See getrusage.c/h for implementation details and limitations
* Tests passes and have had their SKIPIF updated
* psapi.lib is now linked to by default
2015-05-20 15:45:37 +02:00
Remi Collet
e0cd1823ec Merge branch 'PHP-5.6'
* PHP-5.6:
  move test
2015-05-20 14:03:01 +02:00
Remi Collet
59a78d48f0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  move test
2015-05-20 14:02:25 +02:00
Remi Collet
3be4e5d71a move test 2015-05-20 14:02:13 +02:00
Xinchen Hui
c4129694a8 Merge branch 'patch-5' of https://github.com/ovr/php-src 2015-05-20 16:56:28 +08:00
Remi Collet
f7bfeac419 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix new test
2015-05-20 08:31:46 +02:00
Remi Collet
f228bc5230 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix new test
2015-05-20 08:30:44 +02:00
Remi Collet
716fe10d97 fix new test 2015-05-20 08:30:27 +02:00
Remi Collet
8ad4a21c44 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS 5.6
  NEWS 5.5
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  fix test output (32bits)

Conflicts:
	ext/pgsql/pgsql.c
2015-05-20 08:14:02 +02:00
Remi Collet
6da4feac35 NEWS 5.6 2015-05-20 08:11:55 +02:00
Remi Collet
e41a2009d6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS 5.5
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  fix test output (32bits)
2015-05-20 08:11:24 +02:00
Remi Collet
4bda39b81d NEWS 5.5 2015-05-20 08:11:14 +02:00
Remi Collet
2cc4e69cc6 Fixed Bug #69667 segfault in php_pgsql_meta_data
Incomplete fix for #68741
2015-05-20 08:08:41 +02:00
Anatol Belski
890a28d4b9 Fixed bug #69511 Off-by-one bufferoverflow in php_sys_readlink 2015-05-19 15:44:55 +02:00
Dmitry Patsura
b6f8b4e949 [Math] ceil, floor added FAST_ZPP parameters pass 2015-05-19 21:19:13 +08:00
Dmitry Stogov
eebab8282b Improved hash table copying 2015-05-19 13:23:13 +03:00
Dmitry Stogov
6c8d49b6b0 Improved hash table copying 2015-05-19 13:22:58 +03:00
Kalle Sommer Nielsen
27b83079fe This shouldn't have been a part of the previous commit 2015-05-19 12:20:25 +02:00
Kalle Sommer Nielsen
7017fcdb38 Merge branch 'master' of https://git.php.net/push/php-src 2015-05-19 12:13:19 +02:00
Kalle Sommer Nielsen
dd527806e9 * Make ext/dba compile with newer versions of Oracle's Berkeley (in my case 6.1)
* Make the db3 driver work with 4.3+
2015-05-19 12:12:24 +02:00
Remi Collet
a861019b7f Add consistency check in FAST_ZPP call
So ensure Z_PARAM_OPTIONAL is correctly call at the right place
Only in DEBUG build

Will raise 'Assertion `_i > _min_num_args || _optional==0' failed.'
or         'Assertion `_i <= _min_num_args || _optional==1' failed.'
Thus will allow to detect bad code early.
2015-05-19 10:54:10 +02:00
Xinchen Hui
ba5ecf355f Use logger pointer 2015-05-19 16:34:08 +08:00
Dmitry Stogov
b3d053b036 Eliminated useless check in FAST_ZPP (this also fixed few wrong -Wmaybe-uninitialized compilation warnings) (Remi) 2015-05-19 11:06:01 +03:00
Xinchen Hui
e383cb4493 Move fastcgi.c to main 2015-05-19 16:04:35 +08:00
Anatol Belski
f378b9a998 fix test title 2015-05-18 22:37:31 +02:00
Anatol Belski
6fe4f18dcd fork test for ICU >= 55.1 compat 2015-05-18 22:37:29 +02:00
Anatol Belski
8af0de914f sync test with exception currently thrown 2015-05-18 22:37:28 +02:00
Anatol Belski
d3515bdef0 fork test for ICU >= 55.1 compat 2015-05-18 22:37:26 +02:00
Anatol Belski
bb27f4ca8b fork test for ICU >= 55.1 compat 2015-05-18 22:37:25 +02:00
Anatol Belski
83f98277c2 skip test for ICU >= 55.1, a newer test is available and passes 2015-05-18 22:37:23 +02:00
Anatol Belski
3658412814 fork test for ICU >= 55.1 compat 2015-05-18 22:37:22 +02:00
Anatol Belski
30be2e654e fork test for ICU >= 55.1 compat 2015-05-18 22:37:21 +02:00
Anatol Belski
0f766a28cb fix mbrlen prototype availability 2015-05-18 22:37:19 +02:00
Dmitry Stogov
fb8891d9fc Reset heap usage statistics on request shutdown 2015-05-18 23:06:23 +03:00
Dmitry Stogov
cee88571d9 Fixed bug #69649 (segfault with --enable-dtrace) 2015-05-18 12:44:40 +03:00
Reeze Xia
104f6c5ec6 Avoid possible uninitialized value assignment 2015-05-18 12:49:42 +08:00
Xinchen Hui
ab680e7f6e Added Test (the lineno should be fixed) 2015-05-18 11:16:57 +08:00
Xinchen Hui
a5f408c91b 1. Fixed bug #69640 Unhandled EngineExceptions thrown from userland do not produce any output
2. Fixed Segfault introduced by latest changes
2015-05-18 11:13:55 +08:00
Reeze Xia
d02deee677 Prefer isfinite to finite
Since finite() is not part of ANSI C

@see http://bytes.com/topic/c/answers/217761-finite-ansi-c
2015-05-18 10:44:42 +08:00