php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
140,239 Commits 545 Branches 1,479 Tags
9241ca42bc483b2f706ae63e8a4d0ef7ff38499d
Commit Graph

140239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Düsterhus
9241ca42bc zend_object_handlers: Use zend_array_release() in zend_release_properties() and zend_free_trampoline() (#17608) 2025-01-28 19:34:41 +01:00
Niels Dossche
286030d532 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix GH-17609: Typo in error message: Dom\NO_DEFAULT_NS instead of Dom\HTML_NO_DEFAULT_NS
  PHP-8.4 is now for PHP 8.4.5-dev
 2025-01-28 19:30:55 +01:00
Niels Dossche
359eb30351 Fix GH-17609: Typo in error message: Dom\NO_DEFAULT_NS instead of Dom\HTML_NO_DEFAULT_NS 2025-01-28 19:30:25 +01:00
Calvin Buckley
ef2c371f13 PHP-8.4 is now for PHP 8.4.5-dev 2025-01-28 13:27:39 -04:00
Ilija Tovilo
ed1e47e325 Fix callable variance check (GH-17613) 
Caused by GH-15492. While the parent might contain callable, it may also
contain other types. zend_is_class_subtype_of_type() may be checking a
member that is not callable itself. Fall back to the normal class
subtype check.

Discovered by a failing Laravel test in nightly.
 2025-01-28 16:45:36 +01:00
Ilija Tovilo
98da67aa9a Merge branch 'PHP-8.4' 
* PHP-8.4:
  [skip ci] Another flaky macOS phar test
 2025-01-28 12:59:31 +01:00
Ilija Tovilo
4d545f91bc Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  [skip ci] Another flaky macOS phar test
 2025-01-28 12:59:25 +01:00
Ilija Tovilo
dc06a52362 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Another flaky macOS phar test
 2025-01-28 12:58:55 +01:00
Ilija Tovilo
c14601cc90 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Another flaky macOS phar test
 2025-01-28 12:58:42 +01:00
Ilija Tovilo
d9744869e6 [skip ci] Another flaky macOS phar test 2025-01-28 12:58:30 +01:00
Ilija Tovilo
68a638d367 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix missing GC_PERSISTENT_LOCAL flag on accel_globals.key
 2025-01-28 12:56:00 +01:00
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
dfd8c0ca05 Merge branch 'PHP-8.4' 
* PHP-8.4:
  [skip ci] Another flaky macOS phar test
 2025-01-28 12:45:43 +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
Christoph M. Becker
06c41ec6c5 Run curl_setopt_ssl.phpt on Windows, too (GH-16086) 
The whole point of using `proc_open()` to execute `openssl s_client` is
that we can terminate the process when we're done.  However, when going
through the shell on Windows, we get a handle to the shell process, and
if we terminate that, the grandchild will stay open.  Since the pipes
of the grandchild will stay open, the PHP process will not terminate
either, so the test stalls.

We solve this by simply bypassing the shell.
 2025-01-28 01:14:10 +01:00
Ilija Tovilo
3992ffa2c2 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix cve-2014-3538 test
 2025-01-27 21:49:16 +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
Christoph M. Becker
ef74ea08ce Drop superfluous php_com_dotnet_object.ce (GH-17603) 
* Drop superfluous php_com_dotnet_object.ce

This is readily available via the `zend_object` (i.e. `zo.ce`), so
there is no need to duplicate it.

There is also no need to assign the ce to the std object,
since this is done be `zend_object_std_init()` anyway.
 2025-01-27 20:26:57 +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
Christoph M. Becker
efcdcd7bde Drop NetWare support from bundled libgd (GH-17596) 
This has been removed from upstream years ago[1], and PHP generally
dropped NetWare support even earlier.

[1] <e6bb110663>
[2] <https://externals.io/message/96838>
 2025-01-27 20:00:34 +01:00
Ilija Tovilo
62b34412dc Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix inline zend_string using struct padding
 2025-01-27 19:51:58 +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
Niels Dossche
f926c5ce81 Fix GH-16883: gzopen() does not use the default stream context when opening HTTP URLs 
Otherwise it's not possible to control the context; it's also consistent
with how the standard open functions work.

Closes GH-17589.
 2025-01-27 19:25:52 +01:00
Calvin Buckley
a7df6a7759 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix crash in PDO_ODBC statement dtor (#17586)
 2025-01-27 13:43:54 -04: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
b14469b36f Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix mysql mysql_native_password error on CircleCI
 2025-01-27 17:14:12 +01: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
47fc970e03 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix `#[\Deprecated]` for `__call()` and `__callStatic()` (#17592)
 2025-01-27 13:41:50 +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
60ee42eb3e Merge branch 'PHP-8.4' 
* PHP-8.4:
  ext/pdo: Fix a UAF when changing default fetch class ctor args
 2025-01-26 23:41:42 +00: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
Christoph M. Becker
ab996934eb Drop misleading comments about undefined behavior (GH-17532) 
There is no undefined behavior here.  If `BitScan*()` returns zero, the
value written to the first parameter is undefined, but we return a
reasonable value.
 2025-01-26 22:50:52 +01:00
David Carlier
d6c6675bfe ext/sodium: general buffer upper bounds adjustments. 
For zend_string allocations, it was tested against SIZE_MAX now using
ZSTR_MAX_LEN to take in account zend_string type's metadata.

close GH-17588
 2025-01-26 19:41:41 +00:00
David Carlier
f82f602ec8 ext/pgsql: few internal changes. 
Z_PARAM_STR*/Z_PARAM_PATH. lo_write checks any null byte.

close GH-17587
 2025-01-26 19:15:36 +00:00
David Carlier
63b6e905fa [skip ci] NEW/UPGRADING 2025-01-26 18:35:57 +00:00
David Carlier
71c19e2921 ext/snmp: internals calls renaming 2025-01-26 18:35:05 +00:00
David Carlier
81458f5dcf ext/snmp: various internals rewrite. 
close GH-17368
 2025-01-26 18:27:53 +00:00
Christoph M. Becker
bd23d3ab6b Remove unused variable (GH-17573) 2025-01-26 17:19:40 +01:00