Commit Graph

93902 Commits

Author SHA1 Message Date
Dmitry Stogov
3d88a64e0c Add another DFA optimization pattern (ASSIGN -> QM_ASSING) 2015-12-24 11:06:02 +03:00
Xinchen Hui
5b916d3dd5 Merge branch 'PHP-7.0'
* PHP-7.0:
  Superfluous semicolon
2015-12-24 10:42:49 +08:00
Xinchen Hui
c2fa01b939 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
  update NEWS
  update NEWS
  fix merge mistake
  Added test for bug #71201
  Bug #71201 round() segfault on 64-bit builds
  Sort 7.0.1 extensions' entries
  Added test for bug #71201
  Bug #71201 round() segfault on 64-bit builds
  Add CVE for #71020 (PHP 7.0.1)
  Update NEWS & Fixed test
  Fixed bug #71204 (segfault if clean spl_autoload_funcs while autoloading)
  This should never fail
  Fixed bug #71202 (Autoload function registered by another not activated immediately)
  Updated NEWS
  Added support for HTTP 451
2015-12-24 10:42:42 +08:00
Xinchen Hui
64071fc531 Superfluous semicolon 2015-12-24 10:41:05 +08:00
Anatol Belski
349927934d Merge branch 'PHP-7.0'
* PHP-7.0:
  update NEWS
  update NEWS
2015-12-23 18:40:16 +01:00
Anatol Belski
85809b969f update NEWS 2015-12-23 18:39:40 +01:00
Anatol Belski
46db3a7320 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
  Added test for bug #71201
  Bug #71201 round() segfault on 64-bit builds

Conflicts:
	ext/standard/math.c
2015-12-23 18:38:54 +01:00
Anatol Belski
0b8c8bfc81 update NEWS 2015-12-23 18:37:05 +01:00
Anatol Belski
f90dd026cb Merge branch 'PHP-7.0'
* PHP-7.0:
  fix merge mistake
2015-12-23 18:31:09 +01:00
Anatol Belski
0ece97e5a4 fix merge mistake 2015-12-23 18:30:32 +01:00
Anatol Belski
3da66d83ca Merge branch 'PHP-7.0'
* PHP-7.0:
  Added test for bug #71201
  Bug #71201 round() segfault on 64-bit builds
  Sort 7.0.1 extensions' entries

Conflicts:
	ext/standard/math.c
2015-12-23 18:29:06 +01:00
Anatol Belski
204faa5c36 Added test for bug #71201 2015-12-23 18:26:56 +01:00
Anatol Belski
95454c448b Bug #71201 round() segfault on 64-bit builds 2015-12-23 18:26:55 +01:00
Anatol Belski
1e7a593b60 Merge branch 'PHP-7.0'
* PHP-7.0:
  Added test for bug #71201
  Bug #71201 round() segfault on 64-bit builds
  Add CVE for #71020 (PHP 7.0.1)
2015-12-23 18:25:28 +01:00
Lior Kaplan
dbda61b19b Sort 7.0.1 extensions' entries 2015-12-23 19:25:02 +02:00
Anatol Belski
d97b161f10 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Added test for bug #71201
  Bug #71201 round() segfault on 64-bit builds
2015-12-23 18:24:56 +01:00
Anatol Belski
50c4be0309 Added test for bug #71201 2015-12-23 18:18:02 +01:00
Anatol Belski
0d822f6df9 Bug #71201 round() segfault on 64-bit builds 2015-12-23 18:16:52 +01:00
Lior Kaplan
5c11f4c489 Add CVE for #71020 (PHP 7.0.1) 2015-12-23 19:16:39 +02:00
Xinchen Hui
656eb1cc00 Merge branch 'master' of git.php.net:/php-src 2015-12-23 08:13:46 -08:00
Xinchen Hui
eaa79de2e5 Merge branch 'PHP-7.0' 2015-12-23 08:13:24 -08:00
Xinchen Hui
825b7f895a Update NEWS & Fixed test 2015-12-23 08:13:13 -08:00
Xinchen Hui
8692a99551 Merge branch 'PHP-5.6' into PHP-7.0 2015-12-23 08:11:09 -08:00
Xinchen Hui
620ccc9b1a Fixed bug #71204 (segfault if clean spl_autoload_funcs while autoloading) 2015-12-23 08:10:59 -08:00
Dmitry Stogov
00a3714e05 Support for optimization introduced in DFA pass (it may change type of instruction return oprand to IS_CV) 2015-12-23 19:02:14 +03:00
Xinchen Hui
62e8eadfa0 Merge branch 'PHP-7.0' 2015-12-23 07:52:36 -08:00
Xinchen Hui
9cc4cdbe57 This should never fail 2015-12-23 07:52:24 -08:00
Xinchen Hui
086eb8c88d Merge branch 'PHP-7.0' 2015-12-23 07:48:16 -08:00
Xinchen Hui
e21cb2daea Fixed bug #71202 (Autoload function registered by another not activated immediately) 2015-12-23 07:48:00 -08:00
Xinchen Hui
70f9ba00f7 This check become useless after 98885bfa1e 2015-12-23 20:56:49 +08:00
Dmitry Stogov
98885bfa1e Consolidate indirect string offset modification checks (Nikita, Dmitry)
Check it once, instead of dozens of times.
2015-12-23 13:52:15 +03:00
Julien Pauli
8520bab128 Merge branch 'PHP-7.0'
* PHP-7.0:
  Updated NEWS
  Added support for HTTP 451
2015-12-23 11:38:16 +01:00
Julien Pauli
72207b5436 Updated NEWS 2015-12-23 11:37:59 +01:00
Julien Pauli
b2ecac9250 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Added support for HTTP 451

Conflicts:
	sapi/cgi/cgi_main.c
	sapi/cli/php_cli_server.c
	sapi/fpm/fpm/fpm_main.c
2015-12-23 11:36:36 +01:00
Julien Pauli
ea12ff149c Added support for HTTP 451 2015-12-23 11:31:18 +01:00
Dmitry Stogov
28a016a6dc Fixed SSA construction for CFG with unreachable BB 2015-12-23 03:52:38 +03:00
Dmitry Stogov
1e3ab15843 Fixed test on 32-bit systems 2015-12-23 03:52:01 +03:00
Dmitry Stogov
e82a73573b Remove live-range if the corresponding definition is deleted 2015-12-23 03:46:40 +03:00
Dmitry Stogov
dd3cb33ef0 Support for incompletely constructed SSA 2015-12-23 03:20:28 +03:00
Dmitry Stogov
aa4a83fec7 Fixed bug #71196 (Memory leak with out-of-order live ranges) 2015-12-23 01:47:38 +03:00
Nikita Popov
fdfbeeb296 Always create ARRAY_ELEM ssa var for ELEM_REF 2015-12-22 23:08:26 +01:00
Dmitry Stogov
5c1c8f1dec Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed incorrect setting on 32-bit systems
2015-12-22 21:33:07 +03:00
Dmitry Stogov
f3bf95eb81 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed incorrect setting on 32-bit systems
2015-12-22 21:32:45 +03:00
Dmitry Stogov
a57a08e791 Fixed incorrect setting on 32-bit systems 2015-12-22 21:31:28 +03:00
Dmitry Stogov
6e6280a388 Corrected error messages:
- we don't use NULL for overlaoded objects for ages
- fixed array/object mess
2015-12-22 20:55:11 +03:00
Julien Pauli
96c1325092 Updated NEWS 2015-12-22 18:12:56 +01:00
Ilia Alshanetsky
b92ae5d7bc Fixed test 2015-12-22 18:12:56 +01:00
Ilia Alshanetsky
f705063e23 Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986 2015-12-22 18:12:56 +01:00
Bob Weinand
2322af28c5 Merge branch 'PHP-7.0' 2015-12-22 17:39:52 +01:00
Bob Weinand
3e3d0290ff Added test for (long-ago fixed) bug #70083 2015-12-22 17:39:36 +01:00