php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
129,968 Commits 549 Branches 1,485 Tags
fc37a8262b5a2ad7908fee3457fa11d41d4671cb
Commit Graph

62880 Commits

Author SHA1 Message Date
Dmitry Stogov e69a3c3e6b Merge branch 'PHP-8.2' 
* PHP-8.2:
  Force exit to VM
 2022-09-29 15:28:28 +03:00
Dmitry Stogov efcffc9d5f Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Force exit to VM
 2022-09-29 15:28:23 +03:00
Dmitry Stogov aa179bf3dd Force exit to VM 2022-09-29 15:27:38 +03:00
Dmitry Stogov 6bb0b705fc Merge branch 'PHP-8.2' 
* PHP-8.2:
  Keep original EG(jit_trace_num) value around __autoload()
 2022-09-29 15:01:50 +03:00
Dmitry Stogov 57a01e3a4a Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Keep original EG(jit_trace_num) value around __autoload()
 2022-09-29 15:01:39 +03:00
Dmitry Stogov f7d0a3e0e0 Keep original EG(jit_trace_num) value around __autoload() 2022-09-29 15:00:52 +03:00
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 dc985723c8 Updated to version 2022.4 (2022d) 2022-09-29 11:52:09 +01:00
Derick Rethans 0360e62cae Updated to version 2022.4 (2022d) 2022-09-29 11:52:08 +01:00
Christoph M. Becker 4a8e35ceed Merge branch 'PHP-8.2' 
* PHP-8.2:
  Revert unintended test expectation change
 2022-09-28 12:15:06 +02: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 4e747599c8 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Skip some OCI tests with repeat
 2022-09-27 23:32:48 +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 518f108b01 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix invalid label before }
 2022-09-27 23:28:22 +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 c649c5f562 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Wrap JIT compiler with zend_try to recover in case of memory overflow
 2022-09-27 22:29:13 +03: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 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