Commit Graph

89388 Commits

Author SHA1 Message Date
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
Anatol Belski
8751e0fe71 updated NEWS
fixes for bug #69354 was cherrypicked from master
2015-04-04 21:49:09 +02:00
Anatol Belski
7eda18514d added test for bug #69354 2015-04-04 21:42:51 +02:00
Anatol Belski
0ae0d0bc53 revert skipif, this should run everywhere 2015-04-04 21:42:43 +02:00
Anatol Belski
d27d9158c9 further ODBC 3.0 compliance 2015-04-04 21:42:33 +02:00
Anatol Belski
5c2aa71e0c more compliance with the ODBC 3.0 2015-04-04 21:42:17 +02:00
Anatol Belski
a5bb37117c test fixes 2015-04-04 21:42:08 +02:00
Anatol Belski
69c2e53419 no more winxp, but really 2015-04-04 20:39:04 +02:00
Anatol Belski
f51a9c71dd initialize EG(windows_version_info)
there are more places refering to this, but seems it was never
initialized
2015-04-04 20:28:58 +02:00
Nikita Popov
30d59aed1c Try fixing PDO MySQL pconnect test
Use less aggressive conversion to exceptions, in particular
do not convert warnings that happen during check_liveness. If the
server has gone away this will just reconnect and we still end up
with a valid connection, so it shouldn't throw.

Also drop some unnecessary checks for malloc returning NULL.
2015-04-04 16:00:17 +02:00
Nikita Popov
f3e3d85bb2 Drop now unnecessary start parameter 2015-04-04 13:10:29 +02:00
Nikita Popov
9a4b7ad9bb Fix parameter parsing for mysqli_stmt_bind_result()
Also drops one unnecessary arg allocation
2015-04-04 13:05:05 +02:00
Nikita Popov
fa15ac4c37 Fix separation in array_multisort
This manifested in Zend/tests/bug52939.phpt when running without
opcache (no immutablization).
2015-04-04 10:52:43 +02:00
Nikita Popov
86906d6a7b Fix typo 2015-04-04 10:38:00 +02:00
Nikita Popov
f920f974c4 Clarify that some zpp errors are just for debugging
These occur when the extension author messed up, not during normal
script execution.

Make these core errors and show them even with PARAMS_QUIET.
2015-04-04 10:28:37 +02:00
Dmitry Stogov
dcaa79546b Don't relay on reference-counter when parameter expected to be a reference, but value given. 2015-04-03 16:35:06 +03:00
Xinchen Hui
75551c3f59 Unused var 2015-04-03 15:55:39 +08:00
Dmitry Stogov
52eac6bf11 Improved "fust shutdown". 2015-04-03 10:48:55 +03:00
Dmitry Stogov
adcf0c6052 Improved reference counting 2015-04-03 01:32:20 +03:00
Anatol Belski
f26592846f added test for bug #69354 2015-04-02 20:19:51 +02:00
Anatol Belski
b244fdfb2f revert skipif, this should run everywhere 2015-04-02 20:19:42 +02:00