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

129762 Commits

Author SHA1 Message Date
Ilija Tovilo
980c2edbe2 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix invalid label before }
2022-09-27 23:28:07 +02:00
Ilija Tovilo
0aa5adb143 Fix invalid label before }
Will be fixed in C23 :)

Closes GH-9624
2022-09-27 23:27:17 +02:00
Dmitry Stogov
8dc689ecfd Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Wrap JIT compiler with zend_try to recover in case of memory overflow
2022-09-27 22:29:01 +03:00
Dmitry Stogov
2568db287d Wrap JIT compiler with zend_try to recover in case of memory overflow 2022-09-27 22:28:16 +03:00
Christoph M. Becker
bad8c8efc6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:46:32 +02:00
Christoph M. Becker
d981def074 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:45:54 +02:00
Christoph M. Becker
809176dab0 Fix new bug81726.phpt for PHP 8.0
The error message has slightly changed, so we adapt our expectations.
2022-09-27 18:40:02 +02:00
Jakub Zelenka
b1d38fdbb3 Merge branch 'PHP-8.2' of github.com:php/php-src into PHP-8.2 2022-09-27 17:35:34 +01:00
Jakub Zelenka
f41eb54a5e Merge branch 'PHP-8.1' into PHP-8.2 2022-09-27 17:33:58 +01:00
Christoph M. Becker
bb34bc445e Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:32:09 +02:00
Christoph M. Becker
4f79dbd745 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:31:44 +02:00
Jakub Zelenka
54cb2cdcd3 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-27 17:31:08 +01:00
Christoph M. Becker
1a3c9b0542 Fix new bug81726.phpt for PHP 8.0
The error message has slightly changed, so we adapt our expectations.

Closes GH-9621.
2022-09-27 18:30:04 +02:00
Jakub Zelenka
1e8fa6607d Rework FPM tests logging for better debugging 2022-09-27 17:27:43 +01:00
Christoph M. Becker
8ba8383916 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix regression introduced by fixing bug 81726
2022-09-27 18:25:13 +02:00
Christoph M. Becker
4552f62911 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix regression introduced by fixing bug 81726
2022-09-27 18:24:07 +02:00
Christoph M. Becker
3477499d26 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix regression introduced by fixing bug 81726
2022-09-27 18:22:57 +02:00
Christoph M. Becker
432bf196d5 Fix regression introduced by fixing bug 81726
When a tar phar is created, `phar_open_from_fp()` is also called, but
since the file has just been created, none of the format checks can
succeed, so we continue to loop, but must not check again for the
format.  Therefore, we bring back the old `test` variable.

Closes GH-9620.
2022-09-27 18:21:32 +02:00
George Peter Banyard
3579ddaace Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix GH-9583: session_create_id() fails with user defined save handler that doesn't have a validateId() method
2022-09-27 15:58:30 +01:00
George Peter Banyard
72cb47338e Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix GH-9583: session_create_id() fails with user defined save handler that doesn't have a validateId() method
2022-09-27 15:54:37 +01:00
George Peter Banyard
8b115254c0 Fix GH-9583: session_create_id() fails with user defined save handler that doesn't have a validateId() method 2022-09-27 15:52:21 +01:00
Derick Rethans
25290cd25c Merge branch 'PHP-8.1' into PHP-8.2 2022-09-27 14:11:40 +01:00
Derick Rethans
cfee252a95 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-27 14:11:31 +01:00
Derick Rethans
def8c8d174 Merge branch 'PHP-7.4' into PHP-8.0 2022-09-27 14:11:14 +01:00
Derick Rethans
6f586ef90f Add CVEs 2022-09-27 14:10:02 +01:00
Dmitry Stogov
ca93e48b77 Uniform placing of init_fcall guards.
This fixes trcing JIT with opcache.jit=51
2022-09-27 11:30:36 +03:00
Ilija Tovilo
81f7ef4058 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Switch to sanitize CFLAGS for community build
2022-09-26 23:39:42 +02:00
Ilija Tovilo
ebe4467a42 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Switch to sanitize CFLAGS for community build
2022-09-26 23:39:25 +02:00
Ilija Tovilo
12afd0cba8 Switch to sanitize CFLAGS for community build
PHP-8.0 doesn't support those flags, we can switch once we drop that
build.
2022-09-26 23:39:03 +02:00
Máté Kocsis
e4f2376919 Improve string class constant code generation (#9577)
Using strlen() will make sure that non-constant values can also be used.
2022-09-26 23:12:34 +02:00
Dmitry Stogov
94b8c2da9f Fixed type inference
Fixes oss-fuzz #51640
2022-09-26 12:19:12 +03:00
Dmitry Stogov
2ed103f733 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix memory leak
2022-09-26 12:02:43 +03:00
Dmitry Stogov
a4a9a69edb Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix memory leak
2022-09-26 12:02:31 +03:00
Dmitry Stogov
c083efb779 Fix memory leak
Fixes oss-fuzz #51622
2022-09-26 12:02:03 +03:00
Dmitry Stogov
5ad8b3bcfa Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix memory leak
2022-09-26 11:47:32 +03:00
Dmitry Stogov
b20568d4fa Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix memory leak
2022-09-26 11:44:38 +03:00
Dmitry Stogov
8258b7731b Fix memory leak
Fixes oss-fuzz #51622
2022-09-26 11:43:38 +03:00
Ilija Tovilo
8c20ad1081 Add travis_wait to travis for test.sh
We no longer print skipped tests which can make travis fail due to no
output for longer than 20 minutes.
2022-09-25 21:51:32 +02:00
Anatol Belski
50fc9970f3 Merge branch 'PHP-8.1' into PHP-8.2 2022-09-25 20:44:16 +02:00
Anatol Belski
cab2f05f5a fileinfo: tests: Disable times sensitive tests on debug build
Signed-off-by: Anatol Belski <ab@php.net>
2022-09-25 20:43:31 +02:00
Ilija Tovilo
2aa10a6c0e Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Backport community build to PHP-8.0 branch
2022-09-25 17:23:25 +02:00
Ilija Tovilo
f368ecab83 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Backport community build to PHP-8.0 branch
2022-09-25 17:23:20 +02:00
Ilija Tovilo
b655451439 Backport community build to PHP-8.0 branch
It doesn't make sense to keep it on azure because it will be run for the
PHP-8.0 branch on nightly anyway, as the workflow is triggered on the
master branch which will then invoke it for each branch.
2022-09-25 17:22:45 +02:00
Ilija Tovilo
cc1b4051e7 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Remove unused azure pipelines files from PHP-8.1 branch
2022-09-25 17:00:34 +02:00
Ilija Tovilo
1265115640 Remove unused azure pipelines files from PHP-8.1 branch 2022-09-25 16:57:47 +02:00
Ilija Tovilo
ae2d377758 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Remove unused azure pipelines templates
2022-09-25 16:52:46 +02:00
Ilija Tovilo
575ca2bd97 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Remove unused azure pipelines templates
2022-09-25 16:52:38 +02:00
Ilija Tovilo
a9c66f0064 Remove unused azure pipelines templates 2022-09-25 16:51:11 +02:00
Ilija Tovilo
31dbbc598e Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Remove symfony and laravel from PHP-8.0 community job
2022-09-25 16:46:02 +02:00
Ilija Tovilo
5fc7eeb9de Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Remove symfony and laravel from PHP-8.0 community job
2022-09-25 16:45:57 +02:00