php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-04 14:42:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
129,795 Commits 547 Branches 1,481 Tags
a5fdfc4fc0fad126da3aeb7053323eb99da4aaa4
Commit Graph

62807 Commits

Author SHA1 Message Date
Ilija Tovilo
a5fdfc4fc0 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci ] Rename matrix-include output on old branches
  Updated to version 2022.4 (2022d)
  Updated to version 2022.4 (2022d)
 2022-09-29 13:08:45 +02:00
Derick Rethans
0360e62cae Updated to version 2022.4 (2022d) 2022-09-29 11:52:08 +01:00
Christoph M. Becker
3d2d7d1000 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Revert unintended test expectation change
 2022-09-28 12:14:39 +02:00
Christoph M. Becker
9caa71f94f Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Revert unintended test expectation change
 2022-09-28 12:13:39 +02:00
Athos Ribeiro
e6a822d437 Revert unintended test expectation change 
Commit fbe3059 included an unintended change to the test which checks if
dns_get_record populates its additional parameter. This patch reverts
such change.

The issue was not detected by the CIs because their tests run in
the --offline mode, and the test in question needs internet connection.

Closes GH-9625.
 2022-09-28 12:12:21 +02:00
Ilija Tovilo
81bedb0f7d Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Skip some OCI tests with repeat
 2022-09-27 23:32:37 +02:00
Ilija Tovilo
93e509fd8c Skip some OCI tests with repeat 2022-09-27 23:32:15 +02:00
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
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
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
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
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
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
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
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
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
95d9e5157f Check "ssa_op" before dereference (it may be NULL for opcache.jit=51) 2022-09-23 13:14:07 +03: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
3071d85a6b PS(mod_user_class_name) must not leak into next request 
Fixes GH-9584
 2022-09-22 11:37:37 +02: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
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
28a4d7676a declare random globals as public API 2022-09-20 13:20:23 +02: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
Dmitry Stogov
20d1d234ca Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning.
 2022-09-19 17:19:19 +03:00
Dmitry Stogov
e488f7b0eb Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning. 2022-09-19 17:17:53 +03:00
Dmitry Stogov
7496a400aa Fix SSA construction and type inference 
Fixes oss-fuzz #51476
 2022-09-19 15:45:34 +03:00
Christoph M. Becker
4767b0999d Fix GH-9574: SOCKET_EPROTO constant missing since PHP 8.2 dev 
Closes GH-9575.
 2022-09-19 14:41:30 +02:00
Anatol Belski
796fdb4bcc Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  fileinfo: magic: Backport mime type support for woff/woff2 fonts
 2022-09-18 14:44:00 +02:00
Anatol Belski
34fa65a6c2 fileinfo: magic: Backport mime type support for woff/woff2 fonts 
Upstream patch: 7a821aedc1

Fixes GH-8805.

Signed-off-by: Anatol Belski <ab@php.net>
(cherry picked from commit 8a2ebe069148909a00739c83e9bcc031734bf826)
 2022-09-18 14:39:12 +02:00
Ilija Tovilo
3f1e9235e1 Fix test with POSIX_RLIMIT_FSIZE and gcov 2022-09-16 17:15:17 +02:00