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

62856 Commits

Author SHA1 Message Date
Christoph M. Becker
96a46ed3f6 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:32:25 +02: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
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
Christoph M. Becker
bdef504f65 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix regression introduced by fixing bug 81726
2022-09-27 18:25:45 +02: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
4b4a439c62 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix GH-9583: session_create_id() fails with user defined save handler that doesn't have a validateId() method
2022-09-27 15:58:55 +01: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
01677cafae Merge branch 'PHP-8.2' 2022-09-27 14:11:47 +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
Dmitry Stogov
ed7817530e Merge branch 'PHP-8.2'
* PHP-8.2:
  Uniform placing of init_fcall guards.
2022-09-27 11:31:36 +03: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
d4ad9b7289 Throw in FFI::addr() when referencing temporary pointer
Closes GH-9601
2022-09-26 23:15:38 +02:00
Máté Kocsis
c153ec877f Merge branch 'PHP-8.2'
* PHP-8.2:
  Improve string class constant code generation
2022-09-26 23:13:31 +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
e6831dbd82 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fixed type inference
2022-09-26 12:20:45 +03:00
Dmitry Stogov
94b8c2da9f Fixed type inference
Fixes oss-fuzz #51640
2022-09-26 12:19:12 +03:00
Anatol Belski
fbe73ff5b2 Merge branch 'PHP-8.2'
* PHP-8.2:
  fileinfo: tests: Disable times sensitive tests on debug build
2022-09-25 20:44:50 +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
9377c30577 Migrate MSAN build to GitHub actions 2022-09-25 16:18:58 +02:00
Christoph M. Becker
035e22890f Fix typo (from → form)
Closes GH-9609.
2022-09-24 11:39:50 +02:00
Ilija Tovilo
7e8c25f216 Merge branch 'PHP-8.2'
* PHP-8.2:
  Revert "Fix parse_url(): can not recognize port without scheme"
2022-09-23 19:44:58 +02:00
Andy Postnikov
2108d6983f Revert "Fix parse_url(): can not recognize port without scheme"
This reverts commit 72d83709d9.

Closes GH-9569
2022-09-23 19:44:29 +02:00
George Peter Banyard
572f180b8d Merge branch 'PHP-8.2'
* PHP-8.2:
  Use true return type for XML functions which always return true
2022-09-23 13:22:35 +01:00
George Peter Banyard
85d10cc93d Use true return type for XML functions which always return true
And fix xml_parser_set_option() which didn't return false on failure.

Closes GH-9539
2022-09-23 13:22:13 +01:00
Dmitry Stogov
1da0b45ff2 Merge branch 'PHP-8.2'
* PHP-8.2:
  Check "ssa_op" before dereference (it may be NULL for opcache.jit=51)
2022-09-23 13:14:53 +03:00
Dmitry Stogov
95d9e5157f Check "ssa_op" before dereference (it may be NULL for opcache.jit=51) 2022-09-23 13:14:07 +03:00
David Carlier
c0f5d46c03 Merge branch 'PHP-8.2' 2022-09-22 11:26:22 +01:00
David Carlier
fd55b50833 Merge branch 'PHP-8.1' into PHP-8.2 2022-09-22 11:24:37 +01:00
wxue1
52f4ed16e0 Indirect call reduction for Jit code
Changing indirect call to direct call for Jit code
benefits the branch prediction, which gets 1% performance
gain in our workload.
Similarly, we change indirect jump to direct jump.

Signed-off-by: Su, Tao <tao.su@intel.com>
Signed-off-by: Wang, Xue <xue1.wang@intel.com>
2022-09-22 11:22:27 +01:00
Ilija Tovilo
3ad2cc7598 Merge branch 'PHP-8.2'
* PHP-8.2:
  PS(mod_user_class_name) must not leak into next request
2022-09-22 11:38:24 +02:00
Ilija Tovilo
3071d85a6b PS(mod_user_class_name) must not leak into next request
Fixes GH-9584
2022-09-22 11:37:37 +02:00
Nikita Popov
0b2fe40d23 Drop dead ENABLE_TEST_CLASS check 2022-09-21 21:28:21 +02:00
Dmitry Stogov
7d794c0d33 Merge branch 'PHP-8.2'
* PHP-8.2:
  Intern string values of internal classes to prevent their future interning during inheritance.
2022-09-20 20:46:54 +03:00
Dmitry Stogov
bda449afe8 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Intern string values of internal classes to prevent their future interning during inheritance.
2022-09-20 20:46:44 +03:00
Dmitry Stogov
3a46f9fd1d Intern string values of internal classes to prevent their future interning during inheritance. 2022-09-20 20:43:29 +03:00
Tim Düsterhus
3ba7756376 Merge branch 'PHP-8.2'
* PHP-8.2:
  Remove superfluous helper variable in `Randomizer::getBytes()` (#9563)
2022-09-20 17:42:03 +02:00
Joshua Rüsweg
ca399841ad Remove superfluous helper variable in Randomizer::getBytes() (#9563)
* Remove superfluous helper variable in Randomizer::getBytes()

* Reduce the scope of `result` in Randomizer::getBytes()

Co-authored-by: Tim Düsterhus <tim@bastelstu.be>
2022-09-20 17:41:31 +02:00
Remi Collet
c398694e19 Merge branch 'PHP-8.2'
* PHP-8.2:
  declare random globals as public API
2022-09-20 13:20:51 +02:00
Remi Collet
28a4d7676a declare random globals as public API 2022-09-20 13:20:23 +02:00
Dmitry Stogov
8f3c1940f9 Merge branch 'PHP-8.2'
* PHP-8.2:
  Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning.
2022-09-19 17:19:38 +03:00
Dmitry Stogov
5a868022e7 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning.
2022-09-19 17:19:28 +03:00