archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
139219 commits 526 branches 1434 tags 864 MiB
Commit graph

139219 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ilija Tovilo
ac42a8de75
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix missing GC_PERSISTENT_LOCAL flag on accel_globals.key
 2025-01-28 12:55:55 +01:00
Ilija Tovilo
2ad778bc76
Fix missing GC_PERSISTENT_LOCAL flag on accel_globals.key 2025-01-28 12:55:09 +01:00
Ilija Tovilo
c63460c92c
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  [skip ci] Another flaky macOS phar test
 2025-01-28 12:45:35 +01:00
Ilija Tovilo
b598dbf822
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Another flaky macOS phar test
 2025-01-28 12:45:17 +01:00
Ilija Tovilo
01309961bb
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Another flaky macOS phar test
 2025-01-28 12:45:10 +01:00
Ilija Tovilo
65b990a1e0
[skip ci] Another flaky macOS phar test 2025-01-28 12:44:24 +01:00
Ilija Tovilo
c1b151020a
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix cve-2014-3538 test
 2025-01-27 21:49:10 +01:00
Ilija Tovilo
cee3687180
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix cve-2014-3538 test
 2025-01-27 21:49:03 +01:00
Ilija Tovilo
7bda7ad31d
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix cve-2014-3538 test
 2025-01-27 21:48:47 +01:00
Ilija Tovilo
d17d58a982
Fix cve-2014-3538 test 
Make sure we have a unique test file to work with, and increase the time
for the nojit version to match the default version.

Closes GH-17600
 2025-01-27 20:01:13 +01:00
Ilija Tovilo
1432a13413
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix inline zend_string using struct padding
 2025-01-27 19:51:47 +01:00
Ilija Tovilo
8ea9b04a23
Fix inline zend_string using struct padding 
As explained by Snape3058: On 64-bit machines, we typically have 7 bytes
of padding between the zend_string.val[0] char and the following char[].
This means that zend_string.val[1-7] write to and read from the struct
padding, which is a bad idea.

Allocate the given string separately instead.

Fixes GH-17564
Closes GH-17576
 2025-01-27 19:50:38 +01:00
Calvin Buckley
25bdbf96cf Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix crash in PDO_ODBC statement dtor (#17586)
 2025-01-27 13:43:21 -04:00
Calvin Buckley
556def741c
Fix crash in PDO_ODBC statement dtor (#17586) 
Port of 2ae897fff7 to PDO_ODBC.
 2025-01-27 13:41:11 -04:00
Ilija Tovilo
199e42644a
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix mysql mysql_native_password error on CircleCI
 2025-01-27 17:13:41 +01:00
Ilija Tovilo
1a4810a23d
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix mysql mysql_native_password error on CircleCI
 2025-01-27 17:13:30 +01:00
Ilija Tovilo
ad8ba85903
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix mysql mysql_native_password error on CircleCI
 2025-01-27 17:13:20 +01:00
Ilija Tovilo
c99fb05929
Fix mysql mysql_native_password error on CircleCI 
This is already fixed in higher branches. We'll need to fix this
properly when upgrading to MySQL 8.4, which we should do soon as 8.3 is
already EOL.

Closes GH-17560
 2025-01-27 17:11:29 +01:00
Tim Düsterhus
f37b165403
Fix #[\Deprecated] for __call() and __callStatic() (#17592) 
* Fix `#[\Deprecated]` for `__call()` and `__callStatic()`

Fixes php/php-src#17597.

* Do not duplicate the `attributes` table in `zend_get_call_trampoline_func()`
 2025-01-27 13:41:41 +01:00
Gina Peter Banyard
7f321a1313
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  ext/pdo: Fix a UAF when changing default fetch class ctor args
 2025-01-26 23:37:14 +00:00
Gina Peter Banyard
3027600ffc
ext/pdo: Fix a UAF when changing default fetch class ctor args 
Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
 2025-01-26 23:32:35 +00:00
Niels Dossche
fc7c353519
Fix GH-17572: getElementsByTagName returns collections with tagName-based indexing, causing loss of elements when converted to arrays 
Only (dtd) named node maps should have string-based indexing.
The ce check is fragile, just check for the presence of an xml hash
table.

Closes GH-17580.
 2025-01-26 16:21:54 +01:00
Christoph M. Becker
5c066e04b2
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix NULL arithmetic in System V shared memory emulation
 2025-01-25 18:59:00 +01:00
Christoph M. Becker
2e02cdfb5f
Fix NULL arithmetic in System V shared memory emulation 
For the first child process execution, `TWG(shm)` is `NULL`; we need to
catch that to avoid undefined behavior.

Closes GH-17550.
 2025-01-25 18:57:30 +01:00
Christoph M. Becker
be11d97ec7
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Use preinstalled MySQL for Windows CI
 2025-01-25 17:42:37 +01:00
Christoph M. Becker
3a52aba20c
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Use preinstalled MySQL for Windows CI
 2025-01-25 17:41:33 +01:00
Christoph M. Becker
2692b483db
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Use preinstalled MySQL for Windows CI
 2025-01-25 17:40:48 +01:00
Christoph M. Becker
a403b76e88
Use preinstalled MySQL for Windows CI 
Recent hosted GH Windows runners already have MySQL preinstalled, so
there is no particular need to install it again via Chocolatey or other
means.

If we ever need to address more specific needs, we may want to have a
look at <https://github.com/ankane/setup-mysql>.

Closes GH-17561.
Closes GH-17570.
 2025-01-25 17:40:00 +01:00
Niels Dossche
27187bd1da
[ci skip] NEWS for GH-17122 2025-01-24 23:31:11 +01:00
Niels Dossche
77130794a3
Update test expectation for different Firebird version 
libfbclient 5.0.1 with server 4.0.1 has a different error message and
code.
> Read only sql transaction

Closes GH-17565.
 2025-01-24 22:10:08 +01:00
Gina Peter Banyard
5b06a066f6
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Add NEWS entries
  Fix crash in firebird statement dtor
  ext/pdo: Fix memory leak if GC needs to free PDO Statement
 2025-01-24 20:22:13 +00:00
Gina Peter Banyard
e6d917e4c9
Add NEWS entries 
Closes GH-17539
 2025-01-24 20:16:12 +00:00
Niels Dossche
2ae897fff7
Fix crash in firebird statement dtor 
If both the driver object and statement end up in the GC buffer and are
freed by the GC, then the destruction order is not deterministic and it
is possible that the driver object is freed before the statement. In
that case, accessing S->H will cause a UAF. As the resources are already
released we simply skip the destruction if the driver object is already
destroyed.
 2025-01-24 20:16:12 +00:00
Gina Peter Banyard
99f8ec33d9
ext/pdo: Fix memory leak if GC needs to free PDO Statement 2025-01-24 20:16:12 +00:00
Ilija Tovilo
135cabb48f
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix GHA config yml error
 2025-01-24 15:44:41 +01:00
Ilija Tovilo
7068357906
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GHA config yml error
 2025-01-24 15:44:30 +01:00
Ilija Tovilo
f281e89cd1
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GHA config yml error
 2025-01-24 15:44:12 +01:00
Ilija Tovilo
3e6f4702ba
Fix GHA config yml error 2025-01-24 15:43:22 +01:00
Gina Peter Banyard
d35904adf2
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  ext/session: Fix GH-17541 (ext/session NULL pointer dereferencement during ID reset)
 2025-01-24 14:10:00 +00:00
Gina Peter Banyard
a85666c17b
ext/session: Fix GH-17541 (ext/session NULL pointer dereferencement during ID reset) 
Closes GH-17541
Closes GH-17546
 2025-01-24 14:04:58 +00:00
Ilija Tovilo
64be3296e8
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  [skip ci] Use !cancelled() over always() in GHA config
 2025-01-24 14:27:49 +01:00
Ilija Tovilo
cf973421f4
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Use !cancelled() over always() in GHA config
 2025-01-24 14:27:38 +01:00
Ilija Tovilo
4b867d495a
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Use !cancelled() over always() in GHA config
 2025-01-24 14:27:29 +01:00
Ilija Tovilo
5b32011fb5
[skip ci] Use !cancelled() over always() in GHA config 
According to the documentation, !cancelled() should be used over
always() when the step should be executed regardless of success of
failure, but canceled when the workflow is canceled.

See https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/evaluate-expressions-in-workflows-and-actions#always
 2025-01-24 14:27:15 +01:00
Ilija Tovilo
cbeb95f7ea
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Skip Symfony/Wordpress in 8.1 build
  Backport nightly.yml
 2025-01-24 14:15:02 +01:00
Ilija Tovilo
61d4bd573b
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Skip Symfony/Wordpress in 8.1 build
  Backport nightly.yml
 2025-01-24 14:14:51 +01:00
Ilija Tovilo
d90475dee1
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Skip Symfony/Wordpress in 8.1 build
  Backport nightly.yml
 2025-01-24 14:14:42 +01:00
Ilija Tovilo
5b8c960c9f
Skip Symfony/Wordpress in 8.1 build 
There are two issues: The latest Symfony branches don't support 8.1
anymore. This could ber mitigated by switching to LTS for security
builds. However, there are also some JIT bugs that are hard to backport.
We'll skip these builds on 8.1 instead.
 2025-01-24 14:11:55 +01:00
Ilija Tovilo
f26250c7c7
Backport nightly.yml 
This file should stay up-to-date for consistent behavior across workflow
triggers.
 2025-01-24 12:24:39 +01:00
Niels Dossche
b448d540c2
Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix type confusion with session SID constant
 2025-01-23 19:03:35 +01:00