1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00
Commit Graph

92725 Commits

Author SHA1 Message Date
Anatol Belski f313d438b4 Merge branch 'PHP-7.0'
* PHP-7.0:
  Implemented file_cache_fallback mechanism
2015-10-09 23:49:09 +02:00
Anatol Belski ffb5d0aca3 Implemented file_cache_fallback mechanism
which is essential as an attempt to fix the "failed to reattach"
error on Windows. If file_cache is enabled, Opcache will
automaticaly switch to file_cache_only mode in the case a process
failed to map the shared segment at the required address. The
important small part of the SHM will still be mapped, which
allows information exchange between normal processes using SHM
and those using the fallback mechanism.

This is based on Dmitry's, Matt's and mine ideas. So many thanks for
support!
2015-10-09 23:47:59 +02:00
Nikita Popov 1547d245a3 Merge branch 'PHP-7.0' 2015-10-09 23:30:34 +02:00
Nikita Popov d677b25b1c Merge branch 'PHP-5.6' into PHP-7.0 2015-10-09 23:28:58 +02:00
Nikita Popov e19423f3cb Improve previous fix
Don't forbid null binding on plain functions.
2015-10-09 23:28:24 +02:00
Nikita Popov c7b9a07ea2 Merge branch 'PHP-7.0' 2015-10-09 23:07:10 +02:00
Nikita Popov f6ae19f158 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-09 23:06:32 +02:00
Nikita Popov bbae7ddf29 Fixed bug #70681 2015-10-09 23:01:23 +02:00
Anatol Belski ac750e091e Merge branch 'PHP-7.0'
* PHP-7.0:
  update NEWS
  update NEWS
  fix coverage report for datelib
2015-10-09 12:37:00 +02:00
Anatol Belski be09d1c262 update NEWS 2015-10-09 12:36:40 +02:00
Anatol Belski d468390353 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
  fix coverage report for datelib
2015-10-09 12:35:48 +02:00
Anatol Belski 505c9c3742 update NEWS 2015-10-09 12:35:06 +02:00
Dmitry Stogov 046e056e89 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
2015-10-09 11:49:00 +03:00
Dmitry Stogov 0847681b1a Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure()) 2015-10-09 11:48:13 +03:00
Dmitry Stogov 5a793a68b0 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures)
2015-10-09 02:40:11 +03:00
Dmitry Stogov c6af0aa33f Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures) 2015-10-09 02:39:07 +03:00
Dmitry Stogov 2a796a0881 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed infinity recurion if we create closure on top of other closure.
2015-10-09 02:38:47 +03:00
Dmitry Stogov 93748bf9dd Fixed infinity recurion if we create closure on top of other closure. 2015-10-09 02:37:51 +03:00
Dmitry Stogov 6fd4eeb90c Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed use after free
2015-10-09 01:09:36 +03:00
Dmitry Stogov 05bd331c6a Fixed use after free 2015-10-09 01:09:22 +03:00
Dmitry Stogov d3d7c5a52e Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #70674 (ReflectionFunction::getClosure() leaks memory when used for internal functions)
2015-10-09 00:45:45 +03:00
Dmitry Stogov 91fb3a7b27 Fixed bug #70674 (ReflectionFunction::getClosure() leaks memory when used for internal functions) 2015-10-09 00:45:02 +03:00
Dmitry Stogov 6571038093 Merge branch 'PHP-7.0'
* PHP-7.0:
  Correct intdiv() argument names and description
2015-10-09 00:42:26 +03:00
Andrea Faulds fa23bebe94 Correct intdiv() argument names and description 2015-10-08 15:45:22 +01:00
Dmitry Stogov ff4f3094e7 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #70668 (array_keys() doesn't respect references when $strict is true)
2015-10-08 14:59:55 +03:00
Dmitry Stogov 3815e97136 Fixed bug #70668 (array_keys() doesn't respect references when $strict is true) 2015-10-08 14:59:02 +03:00
Dmitry Stogov 4d1d097aca Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #70667 (strtr() causes invalid writes and a crashes)
2015-10-08 14:33:03 +03:00
Dmitry Stogov 9af07e7119 Fixed bug #70667 (strtr() causes invalid writes and a crashes) 2015-10-08 14:30:43 +03:00
Nikita Popov 9ffe44cb46 Merge branch 'PHP-7.0' 2015-10-08 11:04:45 +02:00
Nikita Popov cc3c425af8 Fix bug #70662
This replaces add_new with update for the RW case. This should not
be problematic for performance, as this branch throws a notice.

Alternatively add_new could also be replaced with add. I went with
update, because it makes $a[0] += 1 behavior the same as
$a[0] = $a[0] + 1.
2015-10-08 11:03:39 +02:00
Ferenc Kovacs 0e7ce86d03 update NEWS/UPGRADING 2015-10-08 10:38:46 +02:00
Ferenc Kovacs 1e66f1b9ad Merge branch 'pr-1204'
* pr-1204:
  no need for default value
  allow passing null as the third param
  Implemented FR #55716 - Add an option to pass a custom stream context
2015-10-08 10:23:24 +02:00
Nikita Popov 478e8d6b6d Merge branch 'PHP-7.0' 2015-10-07 16:26:58 +02:00
Márcio Almada ddb6d7801e Fix bug #70650 2015-10-07 16:25:59 +02:00
Ferenc Kovacs 7d0c04c1e9 Merge branch 'PHP-7.0'
* PHP-7.0:
  pear 1.10 was released and the go-pear and install pear phars are now php7 compatible
2015-10-07 16:15:59 +02:00
Ferenc Kovacs f9e3461c02 pear 1.10 was released and the go-pear and install pear phars are now php7 compatible 2015-10-07 13:56:47 +02:00
Dmitry Stogov 33c89e2bb4 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed test. MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes. Probably we need to add yet another condition to also check MariaDB version.
2015-10-07 14:12:43 +03:00
Dmitry Stogov 5d2813edce Fixed test.
MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes.
Probably we need to add yet another condition to also check MariaDB version.
2015-10-07 14:09:37 +03:00
Christopher Jones 969072c1bd Merge branch 'PHP-7.0'
* PHP-7.0:
2015-10-07 20:31:02 +11:00
Christopher Jones 06f99d14e4 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fixed test running on MarinaDB.
2015-10-07 20:27:40 +11:00
Christopher Jones 19e461b07d Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
* 'PHP-7.0' of https://git.php.net/repository/php-src:
  Fixed test running on MarinaDB.
2015-10-07 20:27:38 +11:00
Christopher Jones 9b2c26b8d5 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fix mem leak and improve test portability (Senthil)
2015-10-07 20:25:35 +11:00
Christopher Jones 4a57f1821b Fix mem leak and improve test portability (Senthil) 2015-10-07 20:24:49 +11:00
Dmitry Stogov dbb0ed0c1b Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed test running on MarinaDB.
2015-10-07 12:22:17 +03:00
Dmitry Stogov ccb677ece8 Fixed test running on MarinaDB. 2015-10-07 12:21:43 +03:00
Anatol Belski 5339a5c49c Merge branch 'PHP-7.0'
* PHP-7.0:
  add comment to test
2015-10-07 09:44:15 +02:00
Anatol Belski c0ca731d7a add comment to test 2015-10-07 09:43:28 +02:00
Dmitry Stogov e3c8d4758b Merge branch 'PHP-7.0'
* PHP-7.0:
  Restored the original (php-5) behavior of convert_to_cstring(). It was broken in php7 by mistake and caused problems in ext/pgsql/tests/bug46408.phpt.
2015-10-07 04:28:43 +03:00
Dmitry Stogov b8b335c492 Restored the original (php-5) behavior of convert_to_cstring(). It was broken in php7 by mistake and caused problems in ext/pgsql/tests/bug46408.phpt. 2015-10-07 04:26:26 +03:00
Dmitry Stogov 311a3dbdab Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed test (system error messages may be different).
2015-10-07 03:26:24 +03:00