php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-01 13:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
121,968 Commits 547 Branches 1,481 Tags
49faa33ce191bbc970dad3fc33d425066ea99545
Commit Graph

121968 Commits

This Branch
This Branch
All Branches
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
Máté Kocsis
2e4d44509b Merge branch 'PHP-8.0' 2020-11-21 23:17:55 +01:00
Máté Kocsis
40ebfd6730 Remove some incorrect mixed parameter types 2020-11-21 23:17:35 +01:00
Nikita Popov
52b9aae62a Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix typos in php.ini files
 2020-11-20 16:50:57 +01:00
Nikita Popov
0dac69c059 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix typos in php.ini files
 2020-11-20 16:50:52 +01:00
Benjamin Morel
ed949a1973 Fix typos in php.ini files 
Closes GH-6441.

[ci skip]
 2020-11-20 16:50: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
jrfnl
860f46e2f5 UPGRADING: (real) cast has been removed 
.. but the removal wasn't mentioned in the `UPGRADING` docs yet.

Ref:
* https://github.com/php/php-src/pull/5220
* c9db32271a

Closes GH-6440.

[ci-skip]
 2020-11-20 16:48:32 +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
Christoph M. Becker
dc8fb9dc8b Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix #80345: PHPIZE configuration has outdated PHP_RELEASE_VERSION
 2020-11-19 16:28:27 +01:00
Christoph M. Becker
2e27bb8682 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80345: PHPIZE configuration has outdated PHP_RELEASE_VERSION
 2020-11-19 16:26:45 +01:00
Christoph M. Becker
c2b1182879 Fix #80345: PHPIZE configuration has outdated PHP_RELEASE_VERSION 
We must not redefine the version "constants" for phpize builds, because
these have already generated in phpize.js, from where we pass these
variables forward to configure.js.

We also add `PHP_EXTRA_VERSION` and `PHP_VERSION_STRING` to the files
for completeness.

Closes GH-6419.
 2020-11-19 16:23:20 +01:00
Sara Golemon
2efeaca40c Merge branch 'PHP-8.0' 
* PHP-8.0:
  8.0 branch should be prepping for 8.0.1
 2020-11-19 14:38:31 +00:00
Sara Golemon
3c44e9c080 8.0 branch should be prepping for 8.0.1 2020-11-19 14:37:44 +00:00
Sara Golemon
5a25e7d122 Merge branch 'PHP-8.0' 
* PHP-8.0:
  Prepare NEWS file for GA
 2020-11-19 14:34:47 +00:00
Sara Golemon
85c6e9b469 Prepare NEWS file for GA 2020-11-19 14:33:56 +00: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
72ce6a131e Merge branch 'PHP-8.0' 
* PHP-8.0:
  Export zend_is_callable_at_frame
 2020-11-19 10:30:38 +01:00
Nikita Popov
46b9e0c874 Export zend_is_callable_at_frame 
Export the zend_is_callable_impl() function as
zend_is_callable_at_frame() for use by extension. As twose pointed
out, an extension may want to retrieve fcc for a private method.
 2020-11-19 10:29:32 +01: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
Christoph M. Becker
9b5f96e465 Fix inclusion order for phpize builds on Windows 
`configure` for `phpize` builds on Windows creates Makefile and
config.pickle.h and includes the latter via the command line option
`/FI`.  That implies that config.pickle.h is always included before
config.w32.h, which means that standard definitions always override
extension specific definitions, while it should be the other way round.

Therefore, we change the inclusion order by including config.pickle.h
at the end of config.w32.h if the former is available, and also make
sure to avoid any potential C4005 warnings by `#undef`ining the macros
before defining them.

Closes GH-6269.
 2020-11-18 12:50:26 +01:00
Nikita Popov
a6bcad4a9e Merge branch 'PHP-8.0' 
* PHP-8.0:
  Short-circuit get_gc for currently running generator
 2020-11-18 12:46:32 +01:00
Nikita Popov
bbc0dd402a Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Short-circuit get_gc for currently running generator
 2020-11-18 12:46:12 +01:00
Nikita Popov
99a8ec6e24 Short-circuit get_gc for currently running generator 2020-11-18 12:45:29 +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
d96ff29cc2 Merge branch 'PHP-8.0' 
* PHP-8.0:
  Update NEWS for 8.0.0
  Update NEWS for PHP 8.0.0RC5
 2020-11-17 23:54:48 +03:00
Gabriel Caruso
fd75589b1f Update NEWS for 8.0.0 2020-11-17 16:34:55 +00:00
Gabriel Caruso
0a9b688bee Update NEWS for PHP 8.0.0RC5 2020-11-17 16:23:11 +00:00