php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Code Issues Packages Projects Releases Wiki Activity
126,325 Commits 549 Branches 1,485 Tags
46f182eef83d5c12f6ea817f6f765bbe9ee2bd19
Commit Graph

126325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kamil Tekiela 46f182eef8 Typo 2021-10-05 10:34:42 +01:00
Nikita Popov 85cb417d37 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix COPY_TMP live range construction after optimization
 2021-10-05 11:28:55 +02:00
Nikita Popov 8360e9d6d1 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix COPY_TMP live range construction after optimization
 2021-10-05 11:28:41 +02:00
Nikita Popov bbd3f714d7 Fix COPY_TMP live range construction after optimization 
If we optimize the FREE away, we should switch to constructing
a normal live range, rather than a split live range.

Fixes oss-fuzz #39548.
 2021-10-05 11:28:16 +02:00
Kamil Tekiela 10f102d790 Fix 'can not' in error messages 2021-10-05 09:51:58 +01:00
Kamil Tekiela c3dda473cc Fix 'can not' in test data and in code comments 2021-10-05 09:51:58 +01:00
Nikita Popov 0a831423f7 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Restore CE_CACHE clear on persist
 2021-10-05 10:33:46 +02:00
Nikita Popov e8e4852ebb Restore CE_CACHE clear on persist 
We still need to do this in case early binding succeeds and caches
the class. We could guard that by !in_compilation as well, but in
this case the previous cache clearing should be reliable, so
restore it.
 2021-10-05 10:31:46 +02:00
Joe Watkins e829284b53 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix #81496: CLI server logs wrong request method
 2021-10-05 08:43:38 +02:00
Joe Watkins 03e9bed5b5 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix #81496: CLI server logs wrong request method
 2021-10-05 08:43:09 +02:00
Lauri Kenttä cdcdb33080 Fix #81496: CLI server logs wrong request method 2021-10-05 08:42:38 +02:00
Nikita Popov 0c6c882b92 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Disable failing FPM test
 2021-10-04 23:31:48 +02:00
Nikita Popov cd84480e54 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Disable failing FPM test
 2021-10-04 23:31:40 +02:00
Nikita Popov a00d933242 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Disable failing FPM test
 2021-10-04 23:31:31 +02:00
Nikita Popov 4c01bd2ade Disable failing FPM test 
Test fails intermittently, e.g.:

https://dev.azure.com/phpazuredevops/PHP/_build/results?buildId=20597&view=ms.vss-test-web.build-test-results-tab&runId=475324&resultId=115501&paneView=debug

Possibly this is because the two requests end up being processed
in sequence and no second process is spawned.
 2021-10-04 23:30:14 +02:00
Jakub Zelenka 582cd2ca7f Merge branch 'PHP-8.1' 2021-10-04 21:57:25 +01:00
Jakub Zelenka 7dd87b2343 Merge branch 'PHP-8.0' into PHP-8.1 2021-10-04 21:56:06 +01:00
Jakub Zelenka 9ed95846a3 Merge branch 'PHP-7.4' into PHP-8.0 2021-10-04 21:55:21 +01:00
Jakub Zelenka 66a655fdf4 Add the actual test for FPM prod idle timeout test with 6s sleep 2021-10-04 21:54:32 +01:00
Jakub Zelenka 2cd69115d5 Merge branch 'PHP-7.4' into PHP-8.0 2021-10-04 21:53:34 +01:00
Jakub Zelenka edfb347019 Add FPM prod idle timeout test with 6s sleep 2021-10-04 21:50:57 +01:00
Dmitry Stogov 859abd3126 Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Eliminate useless EG(exception) checks after FETCH_DIM_*
 2021-10-04 22:29:16 +03:00
Dmitry Stogov 2c95c945be JIT: Eliminate useless EG(exception) checks after FETCH_DIM_* 2021-10-04 22:28:26 +03:00
Nikita Popov d1aff29a04 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Start new block after loop free
 2021-10-04 17:02:40 +02:00
Nikita Popov 493c91c742 Start new block after loop free 
In the attached test case we ended up not updating a leftover
MATCH jump in the unreachable_free block. There's different ways
this can be addressed, but in this case we can just make sure that
a new block is started after the loop free, which will allow it
to be dropped as unreachable. We only need to retain the free
itself for live-range reconstruction.

Fixes oss-fuzz #39516.
 2021-10-04 16:59:46 +02:00
Dmitry Stogov 2e00dec34a Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Avoid duplicate EX(opline) assignment
 2021-10-04 17:50:55 +03:00
Dmitry Stogov 724c4fb2e5 JIT: Avoid duplicate EX(opline) assignment 2021-10-04 17:50:26 +03:00
Nikita Popov d4368b88b6 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Don't populate CE_CACHE during compilation
 2021-10-04 15:38:15 +02:00
Nikita Popov ac70bb362e Don't populate CE_CACHE during compilation 
It's possible for CE_CACHE slots to be populated during compilation
(e.g. due to an early binding attempt). When opcache then persists
the class, it clears the CE_CACHE slot for the class name as declared,
but not for different spellings (that only differ in case). As such,
a pointer to the old, non-persistent class entry may be retained.

Fix this by not populating CE_CACHE if in_compilation is set.

Closes GH-7542.
 2021-10-04 15:38:01 +02:00
Dmitry Stogov 0beb21e27e Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Use zend_compare() instead of comapre_function()
 2021-10-04 15:50:00 +03:00
Dmitry Stogov 066f543cac JIT: Use zend_compare() instead of comapre_function() 2021-10-04 15:49:41 +03:00
Rod Elias 7028c818ca Fix typo in README (#7544) 
[ci skip]
 2021-10-04 14:42:23 +02:00
Nikita Popov b8a98907dd Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix bug #81474: Make ReflectionAttribute non-final
 2021-10-04 14:40:46 +02:00
Nikita Popov 70fa1d4d65 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix bug #81474: Make ReflectionAttribute non-final
 2021-10-04 14:40:30 +02:00
sasezaki e286313fa7 Fix bug #81474: Make ReflectionAttribute non-final 
This backports GH-7520 to PHP 8.0.

Closes GH-7545.
 2021-10-04 14:39:46 +02:00
Christoph M. Becker 6e55bd9a4f Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix #77978: Dirname ending in colon unzips to wrong dir
 2021-10-04 12:59:00 +02:00
Christoph M. Becker 9faa11d346 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix #77978: Dirname ending in colon unzips to wrong dir
 2021-10-04 12:58:38 +02:00
Christoph M. Becker 57a32c6a69 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #77978: Dirname ending in colon unzips to wrong dir
 2021-10-04 12:57:01 +02:00
Christoph M. Becker e0c0de003b Fix #77978: Dirname ending in colon unzips to wrong dir 
When making the relative path, we must not stop on a `:\` sequence in
the middle of the filename.  This is only significant on Windows as it
may indicate an absolute filename, but this is already checked at the
beginning of the function.

Note that the bug and this patch affects all systems.  However, on
Windows the file is no longer extracted at all, since Windows NTSF does
not allow filenames containing colons.

Closes GH-7528.
 2021-10-04 12:55:34 +02:00
Nikita Popov 17a237a561 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Revert "Add FPM prod idle timeout test"
 2021-10-04 10:17:18 +02:00
Nikita Popov 0431bd3137 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Revert "Add FPM prod idle timeout test"
  [ci skip] Fix missing NEWS
  [ci skip] Add missing NEWS
 2021-10-04 10:17:07 +02:00
Nikita Popov 987aee10a9 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Revert "Add FPM prod idle timeout test"
 2021-10-04 10:16:53 +02:00
Nikita Popov 69514e6ffb Revert "Add FPM prod idle timeout test" 
This reverts commit 08f52b1643.

The newly added test fails.
 2021-10-04 10:16:20 +02:00
Stanislav Malyshev aa4c4454a9 Merge branch 'PHP-8.0' 
* PHP-8.0:
  [ci skip] Fix missing NEWS
 2021-10-03 20:48:26 -07:00
Stanislav Malyshev e9853e4f0c [ci skip] Fix missing NEWS 2021-10-03 20:48:03 -07:00
Stanislav Malyshev 131d042082 Merge branch 'PHP-8.0' 
* PHP-8.0:
  [ci skip] Add missing NEWS
 2021-10-03 20:44:49 -07:00
Stanislav Malyshev 6eac476de1 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  [ci skip] Add missing NEWS
 2021-10-03 20:44:01 -07:00
Stanislav Malyshev 02778cddee [ci skip] Add missing NEWS 2021-10-03 20:42:47 -07:00
Jakub Zelenka cbdcb0e46f Merge branch 'PHP-8.1' 2021-10-02 18:32:20 +01:00
Jakub Zelenka 4ef6280b9a Fix conflicting pattern wrapping in FPM openmetrics test 2021-10-02 18:31:49 +01:00