php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity
127,476 Commits 549 Branches 1,485 Tags
f597e4c3cc7df4ed393e32f0c8ccceb5a194e012
Commit Graph

61274 Commits

Author SHA1 Message Date
David Carlier 2440d29efd Merge branch 'PHP-8.0' into PHP-8.1 2022-09-29 20:40:33 +01:00
David Carlier 257f108924 fix php_init_crypt_r/php_shutdown_crypt_r signatures warning. 2022-09-29 20:40:16 +01:00
Dmitry Stogov aa179bf3dd Force exit to VM 2022-09-29 15:27:38 +03:00
Dmitry Stogov f7d0a3e0e0 Keep original EG(jit_trace_num) value around __autoload() 2022-09-29 15:00:52 +03:00
Derick Rethans 0360e62cae Updated to version 2022.4 (2022d) 2022-09-29 11:52:08 +01:00
Derick Rethans d16b5d3803 Updated to version 2022.4 (2022d) 2022-09-29 11:52:06 +01: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 93e509fd8c Skip some OCI tests with repeat 2022-09-27 23:32:15 +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 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 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 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 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
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
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
Dmitry Stogov 3a46f9fd1d Intern string values of internal classes to prevent their future interning during inheritance. 2022-09-20 20:43:29 +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
Anatol Belski 34fa65a6c2 fileinfo: magic: Backport mime type support for woff/woff2 fonts 
Upstream patch: https://github.com/file/file/commit/7a821aedc144f70ec848ea632a64db74b79563c1

Fixes GH-8805.

Signed-off-by: Anatol Belski <ab@php.net>
(cherry picked from commit 8a2ebe069148909a00739c83e9bcc031734bf826)
 2022-09-18 14:39:12 +02:00
Derick Rethans 0dcd098dfa Merge remote-tracking branch 'derickr/timelib-2021-17-integration' into PHP-8.1 2022-09-14 16:25:43 +01:00
Derick Rethans dd365b044a Add 'const' to match actual API 2022-09-14 11:02:26 +01:00
Derick Rethans e5b4624b8b Fixed #9165: strtotime translates a date-time with DST/non-DST hour differently based on default timezone 2022-09-14 10:42:42 +01:00
Derick Rethans 4a5202293b Merge timelib 2021.17 2022-09-14 10:40:59 +01:00
Michael Voříšek 7fd14eb08b Fix oci_success_with_info.phpt test random failures 
Closes GH-9525.
 2022-09-13 17:15:36 +02:00
Christoph M. Becker cd927ef634 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Always skip randomly failing OCI8 extauth tests
 2022-09-13 14:25:11 +02:00
Michael Voříšek 9a73ec0367 Always skip randomly failing OCI8 extauth tests 
This might be caused by an issue with the Oracle Instant Client
libraries[1]; we skip the tests for the time being.

[1] <https://github.com/php/php-src/pull/9524#issuecomment-1244409815>

Closes GH-9524.
 2022-09-13 14:21:23 +02:00
George Peter Banyard 71e198be25 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-13 12:45:42 +01:00
George Peter Banyard 47500f3300 Fix GH-9421 Incorrect argument number for ValueError in NumberFormatter 
Closes GH-9489
 2022-09-13 12:42:58 +01:00
George Peter Banyard 3d5df064ca Merge branch 'PHP-8.0' into PHP-8.1 2022-09-13 11:33:09 +01:00
George Peter Banyard 293e69179d Fix GH-9308 GMP throws the wrong error when a GMP object is passed to gmp_init() 
Closes GH-9490
 2022-09-13 11:24:19 +01:00
Christoph M. Becker 404e8bdb68 Fix #81726: phar wrapper: DOS when using quine gzip file 
The phar wrapper needs to uncompress the file; the uncompressed file
might be compressed, so the wrapper implementation loops. This raises
potential DOS issues regarding too deep or even infinite recursion (the
latter are called compressed file quines[1]). We avoid that by
introducing a recursion limit; we choose the somewhat arbitrary limit
`3`.

This issue has been reported by real_as3617 and gPayl0ad.

[1] <https://honno.dev/gzip-quine/>
 2022-09-09 17:10:04 +01:00
Derick Rethans 0611be4e82 Fix #81727: Don't mangle HTTP variable names that clash with ones that have a specific semantic meaning. 2022-09-09 17:10:04 +01:00
Arnaud Le Blanc 466e4dc2a2 Check return value of zend_jit_trace_get_exit_addr() (#9097) 2022-09-09 10:50:03 +02:00
Ilija Tovilo f8d62b4c4b Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Skip oci tests that leak under asan
  Fix undefined left shift in oci
 2022-09-08 15:57:53 +02:00
Ilija Tovilo 4a8cca241f Skip oci tests that leak under asan 2022-09-08 15:56:13 +02:00
Ilija Tovilo aa7f4497bf Fix undefined left shift in oci 
The bit is shifted into the signed bit which is undefined. Make the
integer explicitly unsigned before shifting.
 2022-09-08 15:56:10 +02:00
Ilija Tovilo a795f3ebc6 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Private method incorrectly marked as "overwrites" in reflection
 2022-09-08 10:44:13 +02:00
Ilija Tovilo 1435fc6262 Private method incorrectly marked as "overwrites" in reflection 
Fix GH-9409
Closes GH-9469
 2022-09-08 10:43:25 +02:00
Christoph M. Becker b5cad508fe Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-9411: PgSQL large object resource is incorrectly closed
 2022-09-05 17:26:13 +02:00
Yurun 6ac3f7c84d Fix GH-9411: PgSQL large object resource is incorrectly closed 
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>

Closes GH-9411.
 2022-09-05 16:37:54 +02:00
Máté Kocsis 59180b50b3 Fix inexistent skipif.inc 2022-09-05 12:37:53 +02:00
Dmitry Stogov c852e0fff9 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix type inference
 2022-09-05 12:56:34 +03:00