mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-01 13:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
89,408 Commits 500 Branches 1,381 Tags 824 MiB
a970ae76e2
Commit Graph

89408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Hristov
a970ae76e2 Add more info to the calls: 
- let the callee knows whether it was called directly or indirectly
- two NULL zval * parameters for future extension in a pecl plugin
 2015-04-07 20:45:17 +02:00
Reeze Xia
624552c3d7 Fixed implicit declaration of function warning 2015-04-07 22:22:42 +08:00
Dmitry Stogov
b8ba3203e5 Cleanup 2015-04-07 14:19:12 +03:00
Dmitry Stogov
55cdde3dd6 Fixed bug #69376 (Wrong ref counting). 2015-04-07 02:35:52 +03:00
Dmitry Stogov
5bd71e9713 Avoid reallocation 2015-04-07 02:35:21 +03:00
Nikita Popov
f53e20e595 Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_language_parser.y
 2015-04-06 22:09:22 +02:00
Nikita Popov
7e9a1c1e3f Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
 2015-04-06 22:06:48 +02:00
Nikita Popov
cc70a46525 Fix bug #60022 2015-04-06 22:03:04 +02:00
Nikita Popov
23c7f19e41 Undef results for new arithmetic exceptions 
For the compound assing case (e.g. $a <<= $b) the result is going
to be dtored, so we have to set *some* value.
 2015-04-06 21:52:20 +02:00
Nikita Popov
78e1885b7d Merge branch 'PHP-5.6' 2015-04-06 21:45:42 +02:00
Nikita Popov
d819b45597 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-06 21:44:52 +02:00
Nikita Popov
160dbe91a9 Fix static member destruction 2015-04-06 21:37:19 +02:00
Dmitry Stogov
1cfc9db0d6 Fixed test 2015-04-06 22:07:18 +03:00
Dmitry Stogov
5820be029a 0.0 / 0.0 = NaN 2015-04-06 22:03:44 +03:00
Dmitry Stogov
9a57379024 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68652 (segmentation fault in destructor)

Conflicts:
	NEWS
 2015-04-06 18:19:07 +03:00
Dmitry Stogov
812106d0c6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68652 (segmentation fault in destructor)

Conflicts:
	NEWS
 2015-04-06 18:16:08 +03:00
Dmitry Stogov
21bb33cc72 Fixed bug #68652 (segmentation fault in destructor) 2015-04-06 18:11:41 +03:00
Dmitry Stogov
a62896783f Removed wrong error messages 2015-04-06 18:10:45 +03:00
Dmitry Stogov
d77950902e Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  catch up with INF handling under VS
 2015-04-06 18:10:34 +03:00
Anatol Belski
d3f1abc27d catch up with INF handling under VS 2015-04-06 17:01:19 +02:00
Dmitry Stogov
9e2c14c121 Fixed error messages 2015-04-06 17:24:32 +03:00
Anatol Belski
f0c533f421 fix build 2015-04-06 13:56:47 +02:00
Dmitry Stogov
cae0147ed3 Fixed weird operators behavior. Division by zero now emits warning and returns +/-INF, modulo by zero and intdid() throws an exception, shifts by negative offset throw exceptions. Compile-time evaluation of division by zero is disabled. 2015-04-06 14:30:05 +03:00
Nikita Popov
caf9219dea Fix EH_THROW replacement in PDO constructor 
Needs to happen for the "goto options" case as well, otherwise
will try to restore error handling that was never replaced.
 2015-04-06 12:15:04 +02:00
Nikita Popov
122d759618 Always throw TypeException on throwing zpp failures 
Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to
report FAILURE errors using a TypeException instead of a Warning,
like it would happen in strict mode.

Adds a zend_parse_parameters_throw() convenience function, which
invokes zpp with this flag.

Converts all cases I could identify, where we currently have
throwing zpp usage in constructors and replaces them with this API.
Error handling is still replaced to EH_THROW in some cases to handle
other, domain-specific errors in constructors.
 2015-04-06 11:27:34 +02:00
Stanislav Malyshev
884b0365db Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68740 (NULL Pointer Dereference)
 2015-04-05 22:49:06 -07:00
Stanislav Malyshev
6a7a03644a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68740 (NULL Pointer Dereference)
 2015-04-05 22:48:37 -07:00
Stanislav Malyshev
890195f85c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #68740 (NULL Pointer Dereference)
 2015-04-05 22:48:27 -07:00
Xinchen Hui
9a404df382 Fixed bug #68740 (NULL Pointer Dereference) 
(cherry picked from commit 124fb22a13)
 2015-04-05 22:48:10 -07:00
Stanislav Malyshev
ff740f16f9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66550 (SQLite prepared statement use-after-free)

Conflicts:
	ext/sqlite3/sqlite3.c
 2015-04-05 22:45:16 -07:00
Stanislav Malyshev
2a81733c87 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66550 (SQLite prepared statement use-after-free)
 2015-04-05 22:38:20 -07:00
Stanislav Malyshev
66b853d426 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66550 (SQLite prepared statement use-after-free)
 2015-04-05 22:37:51 -07:00
Stanislav Malyshev
5ae20c6247 Fix bug #66550 (SQLite prepared statement use-after-free) 2015-04-05 22:36:26 -07:00
Stanislav Malyshev
8976e8d9f0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Better fix for #68601 for perf 81e9a993f2
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
 2015-04-05 17:37:44 -07:00
Stanislav Malyshev
c167029eb6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Better fix for #68601 for perf 81e9a993f2
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
 2015-04-05 17:37:12 -07:00
Stanislav Malyshev
96f5be53f6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Better fix for #68601 for perf 81e9a993f2
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
 2015-04-05 17:36:52 -07:00
Remi Collet
bd31cb7563 Better fix for #68601 for perf 
81e9a993f2
 2015-04-05 17:36:47 -07:00
Remi Collet
afbf725e73 Fix bug #68601 buffer read overflow in gd_gif_in.c 2015-04-05 17:33:52 -07:00
Ferenc Kovacs
f1aa1dcb54 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add travis failure/recover notification for our irc room
 2015-04-05 22:55:28 +02:00
Ferenc Kovacs
e78552f3aa Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add travis failure/recover notification for our irc room
 2015-04-05 22:54:57 +02:00
Ferenc Kovacs
829ea23d34 add travis failure/recover notification for our irc room 2015-04-05 22:54:30 +02:00
Ferenc Kovacs
a978a5eb49 fix build 2015-04-05 22:45:58 +02:00
Anatol Belski
92324b2719 fix nts windows_version_info and reorganize 2015-04-05 19:46:38 +02:00
Xinchen Hui
b6aeab1b91 Fixed bug #69371 (Hash table collision leads to inaccessible array keys) 2015-04-05 18:45:14 +08:00
Kalle Sommer Nielsen
a5a7db8a6a Fix build 2015-04-04 22:11:37 +02:00
Kalle Sommer Nielsen
fe58896638 Merge branch 'master' of https://git.php.net/push/php-src 2015-04-04 22:05:21 +02:00
Kalle Sommer Nielsen
118a2fa8d9 This part here was moved to the EG constructor by Anatol in f51a9c71dd 2015-04-04 22:04:32 +02:00
Anatol Belski
7263297121 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  added test for bug #69354
  revert skipif, this should run everywhere
  further ODBC 3.0 compliance
  more compliance with the ODBC 3.0
  test fixes
 2015-04-04 21:52:35 +02:00
Anatol Belski
c585b4845c updated NEWS 2015-04-04 21:50:50 +02:00
Anatol Belski
b1997278fd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  added test for bug #69354
  revert skipif, this should run everywhere
  further ODBC 3.0 compliance
  more compliance with the ODBC 3.0
  test fixes
 2015-04-04 21:50:18 +02:00