1
0
mirror of https://github.com/php/php-src.git synced 2026-04-01 13:12:16 +02:00
Commit Graph

57459 Commits

Author SHA1 Message Date
Remi Collet
49faa33ce1 Merge branch 'PHP-8.0' into master
* PHP-8.0:
  zip extension is 1.19.2
2020-11-23 15:59:23 +01:00
Remi Collet
ce18899b44 zip extension is 1.19.2 2020-11-23 15:59:15 +01:00
Dmitry Stogov
b994237619 Merge branch 'PHP-8.0'
* PHP-8.0:
  zend_jit_trace_stack_frame.stack can't be NULL
2020-11-23 16:19:54 +03:00
Dmitry Stogov
337d2af6ca zend_jit_trace_stack_frame.stack can't be NULL 2020-11-23 16:19:22 +03:00
Dmitry Stogov
7f4b8f1349 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed use-after-free in PHPUnit tests
2020-11-23 14:43:04 +03:00
Dmitry Stogov
586ccfdfd5 Fixed use-after-free in PHPUnit tests 2020-11-23 14:42:38 +03:00
Dmitry Stogov
1c10d18573 Merge branch 'PHP-8.0'
* PHP-8.0:
  Keep value of register before possible side exit
2020-11-23 12:08:23 +03:00
Dmitry Stogov
4cf3da7383 Keep value of register before possible side exit 2020-11-23 12:07:05 +03:00
Christoph M. Becker
4f68662f5b Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix #77594: ob_tidyhandler is never reset
2020-11-22 14:05:52 +01:00
Christoph M. Becker
9b1c02c2df Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix #77594: ob_tidyhandler is never reset
2020-11-22 14:04:59 +01:00
Christoph M. Becker
221345a013 Fix #77594: ob_tidyhandler is never reset
We reset to original INI value on request shutdown.

Closes GH-6425.
2020-11-22 14:02:29 +01:00
Nikita Popov
51b51d5aba Merge branch 'PHP-8.0'
* PHP-8.0:
  UPGRADING: (real) cast has been removed
  Use MIN/MAX when dumping RANGE[]
2020-11-20 16:49:14 +01:00
Nikita Popov
fa67864c13 Use MIN/MAX when dumping RANGE[]
It's very common that one of the bounds is LONG_MIN or LONG_MAX.
Dump them as MIN/MAX instead of the int representation in that
case, as it makes the dump less noisy.
2020-11-20 16:47:46 +01:00
Dmitry Stogov
62526a0725 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed incorrect TRACE_FRAME_MASK_NESTED flag setting
2020-11-20 18:23:11 +03:00
Dmitry Stogov
c0d1dbcb43 Fixed incorrect TRACE_FRAME_MASK_NESTED flag setting 2020-11-20 18:22:21 +03:00
Dmitry Stogov
a5a78f3819 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed 32-bit JIT
2020-11-20 15:12:58 +03:00
Dmitry Stogov
c8df28d276 Fixed 32-bit JIT 2020-11-20 15:12:30 +03:00
Christoph M. Becker
38b80aaf85 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix #72964: White space not unfolded for CC/Bcc headers
2020-11-19 19:27:12 +01:00
Christoph M. Becker
c7343510e4 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix #72964: White space not unfolded for CC/Bcc headers
2020-11-19 19:26:56 +01:00
Christoph M. Becker
881e43a03c Fix #72964: White space not unfolded for CC/Bcc headers
`\r\n` does only terminate a header, if not followed by `\t` or ` `.
We have to cater to that when determining the end position of the
respective headers.

Closes GH-6420.
2020-11-19 19:25:03 +01:00
Dmitry Stogov
02fa213d36 Merge branch 'PHP-8.0'
* PHP-8.0:
  Added missing deoptimization code for trampoline handling
2020-11-19 12:32:49 +03:00
Dmitry Stogov
069f9cbaa5 Added missing deoptimization code for trampoline handling 2020-11-19 12:32:36 +03:00
Nikita Popov
8579f3d331 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix curl_multi_getcontent() parameter name
2020-11-19 10:18:10 +01:00
Nikita Popov
06c4a501fd Fix curl_multi_getcontent() parameter name
While the function name starts with curl_multi_*, the function
actually accepts a CurlHandle. As such, it should also use just
$handle as the parameter name.

Closes GH-6435.
2020-11-19 10:17:17 +01:00
Dmitry Stogov
511a50d0d2 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed register clobbering
2020-11-18 10:22:41 +03:00
Dmitry Stogov
feed041fc8 Fixed register clobbering 2020-11-18 10:22:25 +03:00
Dmitry Stogov
fa7af81c22 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed trampoline handling
2020-11-17 23:56:39 +03:00
Dmitry Stogov
9841e8e411 Fixed trampoline handling 2020-11-17 23:56:05 +03:00
Dmitry Stogov
0ef67ba841 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed allocated register clobbering
2020-11-17 18:32:01 +03:00
Dmitry Stogov
e364af91b5 Fixed allocated register clobbering 2020-11-17 18:31:14 +03:00
Dmitry Stogov
87ae111a5c Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed false pasitive ASAN NULL pointer dereference warning
2020-11-17 16:24:44 +03:00
Dmitry Stogov
1523733bc4 Fixed false pasitive ASAN NULL pointer dereference warning 2020-11-17 16:23:30 +03:00
Nikita Popov
14458ec7e9 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix #80312: change default engine from MyISAM to InnoDB in tests
2020-11-17 13:16:32 +01:00
Nikita Popov
f4a600be04 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix #80312: change default engine from MyISAM to InnoDB in tests
2020-11-17 13:16:17 +01:00
Darek Slusarczyk
79a606bd95 Fix #80312: change default engine from MyISAM to InnoDB in tests
Change mysqli and pdo_mysql tests configuration to use by default
InnoDB instead of MyISAM.

Closes GH-6405.
2020-11-17 13:15:15 +01:00
Nikita Popov
5e84975aed Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed bug #80370: Segmentation fault reflecting attributes of dynamic property
2020-11-17 10:54:38 +01:00
Benjamin Eberlei
1727d96d0e Fixed bug #80370: Segmentation fault reflecting attributes of dynamic property
Closes GH-6428.
2020-11-17 10:54:27 +01:00
Nikita Popov
5bd7305cf0 Merge branch 'PHP-8.0'
* PHP-8.0:
  Provide unused retvals to observers
2020-11-17 10:30:20 +01:00
Sammy Kaye Powers
58d41b8c4f Provide unused retvals to observers
Make sure that the return value is available to observers, even if
it is not used by the caller.

Closes GH-6422.
2020-11-17 10:28:47 +01:00
Nikita Popov
c4b2a40fdd Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix incorrectly optimized out live range
2020-11-17 10:20:52 +01:00
Nikita Popov
9cfb5261e4 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix incorrectly optimized out live range
2020-11-17 10:20:23 +01:00
Nikita Popov
df7417d127 Fix incorrectly optimized out live range
For x ? y : z style structures, the live range starts at z, but
may also hold the value of y. Make sure that the refcounting check
takes this into account, by checking the type of a potential phi
user.
2020-11-17 10:19:57 +01:00
Sammy Kaye Powers
e974becbb1 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fire open observer end handlers after a zend_bailout
2020-11-16 15:13:29 -08:00
Sammy Kaye Powers
0425a6697a Fire open observer end handlers after a zend_bailout
Closes GH-6377
2020-11-16 15:12:57 -08:00
Dmitry Stogov
977134352d Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed MAY_BE_INDIRECT inference
2020-11-16 18:17:17 +03:00
Dmitry Stogov
3fb1b0862c Fixed MAY_BE_INDIRECT inference 2020-11-16 18:17:05 +03:00
Dmitry Stogov
6e50e2abc0 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed alias handling
2020-11-16 16:11:48 +03:00
Dmitry Stogov
e3c63de05b Fixed alias handling 2020-11-16 16:11:25 +03:00
Dmitry Stogov
18d2b7f79a Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed reference-counting
  Fixed incorrect FETCH_THIS optimization
2020-11-16 14:52:18 +03:00
Dmitry Stogov
eb6d496a93 Fixed reference-counting 2020-11-16 14:51:55 +03:00