1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Commit Graph

93818 Commits

Author SHA1 Message Date
Nikita Popov 420ff42bc0 Protect against overflows in pi constraints 2015-12-20 12:56:05 +01:00
Xinchen Hui 825b5901df Merge branch 'master' of git.php.net:/php-src 2015-12-19 18:53:34 -08:00
Xinchen Hui 098af9e559 typo agian :< 2015-12-19 18:40:58 -08:00
Yasuo Ohgaki 0cf7143441 Add session module test 2015-12-20 11:39:57 +09:00
Nikita Popov 0da1378a88 long -> zend_long in range inference 2015-12-20 00:06:12 +01:00
Nikita Popov 549d7d4876 Fix Pi constraint for -LONG_MIN adjustments
-LONG_MIN == LONG_MIN so bad things will happen.
Example of JIT miscompile:

    function test($n) {
	if ($n + PHP_INT_MIN == 0) {
	    $n2 = (int) ($n + PHP_INT_MAX);
	    var_dump($n2);
	}
    }
    test(PHP_INT_MAX + 1);
2015-12-20 00:06:12 +01:00
Nikita Popov c9ea8fef96 Extrace find_adjusted_tmp_var() function
This code was duplicated for op1 and op2
2015-12-20 00:06:12 +01:00
Nikita Popov fc68094497 Simplify bf/bt computation in pi placement
The meaning of the successors is well-defined, no need to check it.
2015-12-20 00:03:52 +01:00
Nikita Popov d7424a5b04 Fix typo in pi placement 2015-12-20 00:03:52 +01:00
Xinchen Hui 9591468a49 Added note to upgrading 2015-12-19 05:45:44 -08:00
Xinchen Hui f834e72c5a Merge branch 'PHP-7.0' 2015-12-18 21:55:04 -08:00
Xinchen Hui baf7ad1555 Fixed NEWS 2015-12-18 21:54:57 -08:00
Xinchen Hui 860764114f Merge branch 'PHP-7.0' 2015-12-18 21:52:15 -08:00
Xinchen Hui a21b0942fa Fixed bug #71165 (-DGC_BENCH=1 doesn't work on PHP7) 2015-12-18 21:52:05 -08:00
Xinchen Hui 8f91b24b07 Merge branch 'PHP-7.0' 2015-12-18 21:43:08 -08:00
Xinchen Hui 1d79011fb9 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-12-18 21:40:48 -08:00
Xinchen Hui eb4ce3f1a8 Fixed bug #71163 (Segmentation Fault: cleanup_unfinished_calls) 2015-12-18 21:40:20 -08:00
Andrea Faulds 5d0dfda60c Merge branch 'PHP-7.0' 2015-12-19 02:35:19 +00:00
Andrea Faulds 42c8f5e91d Fix bug #70804
This follows on from a4648ded43 and
4e01269082.
Both -(+0.0) and +(-0.0) behaved incorrectly for the same reason.
2015-12-19 02:25:44 +00:00
Andrea Faulds 78155068e2 Merge branch 'PHP-7.0' 2015-12-18 19:32:20 +00:00
Andrea Faulds 8d217db369 Fix bug #66179
This also fixes ext/standard/tests/general_functions/var_export-locale.phpt
to actually run the floating-point section.
2015-12-18 19:31:21 +00:00
Nikita Popov 7cc3089d8f Clone cannot return reference 2015-12-18 17:37:13 +01:00
Nikita Popov 8ca21876e1 Fix zend_get_func_info() 2015-12-18 17:37:13 +01:00
Xinchen Hui 56b8f47491 Merge branch 'PHP-7.0'
Conflicts:
	NEWS
2015-12-19 00:30:35 +08:00
Xinchen Hui 8f9af36da3 Fixed bug #71144 (Sementation fault when using cURL with ZTS) 2015-12-19 00:29:19 +08:00
Xinchen Hui 916f10ac31 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-12-19 00:20:18 +08:00
Xinchen Hui 750da15bc7 Merge branch 'PHP-7.0' 2015-12-19 00:19:34 +08:00
Xinchen Hui 512498d083 Fixed test skip 2015-12-19 00:19:21 +08:00
Xinchen Hui c555d90f4f Implemented FR #71159 (Upgraed bundled SQLite lib to 3.9.2) 2015-12-18 23:49:59 +08:00
Dmitry Stogov 8136e4572e Fixed dump format 2015-12-18 17:18:13 +03:00
Dmitry Stogov f9b5345a98 Fixed compilation 2015-12-18 16:53:31 +03:00
Xinchen Hui b715845650 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
2015-12-18 17:44:05 +08:00
Xinchen Hui 361b5814de Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:/php-src:
  Align news entry format: Implement FR -> Implemented FR
2015-12-18 17:43:25 +08:00
Xinchen Hui af871f61dc Merge branch 'PHP-7.0'
* PHP-7.0:
  Improved fix for #71127
2015-12-18 17:42:11 +08:00
Xinchen Hui 2f47e9872e Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Improved fix for #71127

Conflicts:
	ext/opcache/Optimizer/pass1_5.c
2015-12-18 17:41:42 +08:00
Xinchen Hui 40702799b5 Improved fix for #71127 2015-12-18 17:37:40 +08:00
Yasuo Ohgaki 283cbebe5b Improve FR #48532 implementation (Allow pg_fetch_all() to index numerically).
Made result type option be consistent with pg_fetch_row().
2015-12-18 15:50:57 +09:00
Yasuo Ohgaki 7517a62428 Fix typo in NEWS 2015-12-18 13:09:30 +09:00
Yasuo Ohgaki 5835593dfc Improve FR #31021 implementation (pg_last_notice() is needed to get all notice messages).
Now pg_last_notice() can clear stored notices.
2015-12-18 13:04:34 +09:00
Andrea Faulds 1abbdcd9a4 Merge branch 'PHP-7.0' 2015-12-17 23:36:20 +00:00
Andrea Faulds 4e01269082 Fix tests broken by 'Fix bug #52355'
a4648ded43 broke some tests
2015-12-17 23:33:24 +00:00
Andrea Faulds 8d355bff85 Merge branch 'PHP-7.0' 2015-12-17 22:40:55 +00:00
Andrea Faulds a4648ded43 Fix bug #52355 2015-12-17 22:39:29 +00:00
Nikita Popov 679fa3e03d Merge branch 'PHP-7.0' 2015-12-17 23:23:59 +01:00
Nikita Popov a917840f38 Fixed iter leak on by-ref foreach over const/tmp array
FE_FREE does not unregister the iter for plain arrays. So always
wrap into a REF wrapper, even if not strictly necessary, in
RESET_RW. Alternatively we could use a flag to distinguish plain
positions and interators.

Also added a check for leaked iterators in shutdown_executor.
2015-12-17 23:21:48 +01:00
Nikita Popov 4555294392 Merge branch 'PHP-7.0' 2015-12-17 22:20:40 +01:00
Nikita Popov 6a4c02e107 Fixed bug #71154 2015-12-17 22:20:29 +01:00
George Wang 21eaa5a47d Merge branch 'master' of git.php.net:php-src 2015-12-17 15:25:39 -05:00
George Wang 70addd33d0 Fixed a bug in apache_request_headers() that adds an extra \0 to header name. 2015-12-17 15:24:59 -05:00
George Wang 0a1a4dc033 Fixed a bug in apache_request_headers() that adds an extra \0 to header name. 2015-12-17 15:20:08 -05:00