1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Commit Graph

111348 Commits

Author SHA1 Message Date
Dmitry Stogov dbb462db5d Merge branch 'PHP-7.4'
* PHP-7.4:
  Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c
2019-03-12 17:36:02 +03:00
Dmitry Stogov 04b67bac32 Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c 2019-03-12 17:35:50 +03:00
Dmitry Stogov 59e954524e Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed ZTS cache usage
2019-03-12 16:58:16 +03:00
Dmitry Stogov 7139c381f1 Fixed ZTS cache usage 2019-03-12 16:58:02 +03:00
Dmitry Stogov d30bd8e6d0 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed ZTS cache usage
2019-03-12 15:25:59 +03:00
Dmitry Stogov cf4ee57dc9 Fixed ZTS cache usage 2019-03-12 15:25:51 +03:00
Dmitry Stogov a29f7e93b4 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed ZTS cache usage
2019-03-12 15:14:00 +03:00
Dmitry Stogov 25d4af9413 Fixed ZTS cache usage 2019-03-12 15:13:52 +03:00
Dmitry Stogov 2b6cbcae06 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed ZTS cache usage
2019-03-12 15:06:11 +03:00
Dmitry Stogov b0d76ed4ad Fixed ZTS cache usage 2019-03-12 15:05:56 +03:00
Dmitry Stogov 5f09db3073 Merge branch 'PHP-7.4'
* PHP-7.4:
  Switch to use ZTS cache
2019-03-12 14:17:14 +03:00
Dmitry Stogov f1b306fe11 Switch to use ZTS cache 2019-03-12 14:15:47 +03:00
Dmitry Stogov c56bd7e220 Merge branch 'PHP-7.4'
* PHP-7.4:
  Cleanup unused module globals
2019-03-12 13:44:25 +03:00
Dmitry Stogov 5aa1176238 Cleanup unused module globals 2019-03-12 13:44:05 +03:00
Dmitry Stogov 403033db5b Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed ZTS cache usage
2019-03-12 12:07:54 +03:00
Dmitry Stogov c48f5fe841 Fixed ZTS cache usage 2019-03-12 12:07:25 +03:00
Nikita Popov 36f875e78e Merge branch 'PHP-7.4' 2019-03-12 09:58:38 +01:00
Nikita Popov 5b778e852e Merge branch 'PHP-7.3' into PHP-7.4 2019-03-12 09:58:29 +01:00
Nikita Popov a7739be22f Fixed bug #77722 2019-03-12 09:58:09 +01:00
Remi Collet f9f422659c Merge branch 'PHP-7.4'
* PHP-7.4:
  add --enable-rtld-now in upgrade info
  use DL_LOAD in litespeed
  add --enable-rtld-now build option to change dlopen behavior
2019-03-12 08:26:36 +01:00
Remi Collet 99ee5db5e0 add --enable-rtld-now in upgrade info 2019-03-12 08:26:22 +01:00
Remi Collet 233888e36a use DL_LOAD in litespeed 2019-03-12 08:23:11 +01:00
Remi Collet d633cbac1c add --enable-rtld-now build option to change dlopen behavior 2019-03-12 08:23:06 +01:00
Joe Watkins 5bf6562bcb Merge branch 'PHP-7.4'
* PHP-7.4:
  weakrefs upgrading note
2019-03-12 06:53:07 +01:00
Joe Watkins b003e0a0f5 weakrefs upgrading note 2019-03-12 06:52:43 +01:00
Joe Watkins 99230784f5 Merge branch 'PHP-7.4'
* PHP-7.4:
  zend_weakrefs
2019-03-12 00:37:28 +01:00
Joe Watkins 6529d7acd9 zend_weakrefs 2019-03-12 00:35:35 +01:00
Anatol Belski dbcdf85796 Merge branch 'PHP-7.4'
* PHP-7.4:
  Die hard if mc.exe or mt.exe not found
2019-03-11 21:00:18 +01:00
Anatol Belski a526a6b4c1 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Die hard if mc.exe or mt.exe not found
2019-03-11 20:59:51 +01:00
Anatol Belski 95c8f67a4c Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Die hard if mc.exe or mt.exe not found
2019-03-11 20:59:23 +01:00
Anatol Belski 6814ba11bc Die hard if mc.exe or mt.exe not found
Even configure would pass, that producess quite subtle build errors
which are better to avoid at configure stage already.
2019-03-11 20:41:45 +01:00
Christoph M. Becker dd6911550f Merge branch 'PHP-7.4'
* PHP-7.4:
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
2019-03-11 16:32:16 +01:00
Christoph M. Becker aefe0dfd61 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
2019-03-11 16:31:26 +01:00
Christoph M. Becker e7ce7c6bb2 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
2019-03-11 16:30:16 +01:00
bohwaz e93259bb23 SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws 2019-03-11 16:26:15 +01:00
Nikita Popov 9c0a3b78e8 Merge branch 'PHP-7.4' 2019-03-11 15:36:48 +01:00
Nikita Popov cc354a0790 Merge branch 'PHP-7.3' into PHP-7.4 2019-03-11 15:36:40 +01:00
Nikita Popov 6818ca3c02 Merge branch 'PHP-7.2' into PHP-7.3 2019-03-11 15:36:27 +01:00
Nikita Popov 1fd32e9c2f Fixed bug #76717
Print INT_MIN as -INT_MAX-1 to avoid it getting parsed as a float
literal due to integer overflow.
2019-03-11 15:35:02 +01:00
Nikita Popov 92291ab726 Merge branch 'PHP-7.4' 2019-03-11 14:33:07 +01:00
Nikita Popov ac79d42ba6 Free trampolines from get_closure in is_callable
Also extract this logic into a function, as it's duplicated a few times.
2019-03-11 14:00:33 +01:00
Dmitry Stogov e279c80247 Merge branch 'PHP-7.4'
* PHP-7.4:
  Closure::fromCallable() supports only regular methods and magic method invoked through __call()/__callStatic(). It doesn't support method of internal classes invoked through C object or class handlers. This commit prevents crash described at bug #77708, but doesn't implement the desired behavior.
2019-03-11 15:42:41 +03:00
Dmitry Stogov 409e0dd29f Closure::fromCallable() supports only regular methods and magic method invoked through __call()/__callStatic().
It doesn't support method of internal classes invoked through C object or class handlers.
This commit prevents crash described at bug #77708, but doesn't implement the desired behavior.
2019-03-11 15:39:34 +03:00
Dmitry Stogov ddf02dc978 Merge branch 'PHP-7.4'
* PHP-7.4:
  Reset fields
2019-03-11 15:39:18 +03:00
Dmitry Stogov e7f0a60d54 Reset fields 2019-03-11 15:38:49 +03:00
Dmitry Stogov 63da56cfc4 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed bug #77707 (FFI loses type information for opaque types)
2019-03-11 14:26:52 +03:00
Dmitry Stogov e623df650f Fixed bug #77707 (FFI loses type information for opaque types) 2019-03-11 14:26:17 +03:00
Nikita Popov 852485d8ec Adjust tests for zpp TypeError change 2019-03-11 11:32:20 +01:00
Nikita Popov 6bfb119e18 Remove some unnecessary error handler setting
A few non-standard exceptions thrown on zpp failures will change to
TypeError due to this.
2019-03-11 11:32:20 +01:00
Nikita Popov 86ef425177 Intl: Don't separately report "bad arguments" errors
zpp will be throwing for these now, don't report them in addition to
that.
2019-03-11 11:32:20 +01:00