php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
141,918 Commits 549 Branches 1,485 Tags
php-8.5.0alpha1
Commit Graph

2013 Commits

Author SHA1 Message Date
DanielEScherzer ddd33fd7e4 Generated arginfo headers: combine preprocessor conditional blocks (2) (#18667) 
When global constants' or class constants' availability is based on some
preprocessor condition, the generated arginfo header files wrap the
declarations in the preprocessor `#if` conditional blocks, one per declaration,
even if they are in the same conditional block based on comments in the stub
file. Instead of having multiple conditional blocks one after the other with
the same condition, combine them into a single conditional block.
 2025-06-22 14:35:28 -07:00
Niels Dossche dbabbe180b Remove dead code from openssl_spki_new() implementation (#18752) 
If s is not NULL, the length can't be <= 0 because we at least append
`spkac` in the string, which is non-empty.
I noticed this condition because if it were actually possible to
execute, then it would leak memory.
 2025-06-10 22:35:56 +02:00
Jakub Zelenka 688fed36ca Merge branch 'PHP-8.4' 2025-06-05 18:05:51 +02:00
Jakub Zelenka 7a15d2a5c0 Merge branch 'PHP-8.3' into PHP-8.4 2025-06-05 18:05:24 +02:00
Jakub Zelenka 444cc78a3e Skip OpenSSL proxy test for bug #74796 on Windows 2025-06-05 16:18:06 +02:00
Jakub Zelenka 9ae5b4e9be Merge branch 'PHP-8.4' 2025-06-05 14:12:48 +02:00
Jakub Zelenka 086a470208 Merge branch 'PHP-8.3' into PHP-8.4 2025-06-05 14:10:57 +02:00
Jakub Zelenka 42f6c15186 Fix bug #74796: Requests through http proxy set peer name 
This issue happens because http wrapper sets peer_name but then does not
remove so it stays in the context. The fix removes the peer name from
the context after enabling crypto.

In addition to bug #74796, this also fixes bug #76196.

In addition it should be a final fix for those SOAP bugs:

bug #69783
bug #52913
bug #61463
 2025-06-05 14:08:28 +02:00
Jakub Zelenka 2f5ef4d2b7 Use custom OpenSSL libctx in md and cipher handling code (#18516) 2025-06-04 18:46:00 +02:00
Niels Dossche 359bb6303d Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix memory leak of X509_STORE in php_openssl_setup_verify() on failure
 2025-06-03 23:50:30 +02:00
Niels Dossche 87ff5479fc Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix memory leak of X509_STORE in php_openssl_setup_verify() on failure
 2025-06-03 23:46:21 +02:00
Niels Dossche 08a9579883 Fix memory leak of X509_STORE in php_openssl_setup_verify() on failure 
Closes GH-18750.
 2025-06-03 23:45:51 +02:00
Niels Dossche e2b47d8483 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Split off php_set_sock_blocking() and s.is_blocked to a separate function
  Fix missing checks against php_set_blocking() in xp_ssl.c
 2025-05-20 08:08:46 +02:00
Niels Dossche 1e94f3423b Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Split off php_set_sock_blocking() and s.is_blocked to a separate function
  Fix missing checks against php_set_blocking() in xp_ssl.c
 2025-05-20 08:08:39 +02:00
Niels Dossche 1863014fbd Split off php_set_sock_blocking() and s.is_blocked to a separate function 
This makes it harder to forget the check and keeps the variable and
function call consistent.

Closes GH-18604.
 2025-05-20 08:08:06 +02:00
Niels Dossche 31ebb42268 Fix missing checks against php_set_blocking() in xp_ssl.c 2025-05-20 08:07:34 +02:00
Jakub Zelenka cb4bafa4c0 Init OpenSSL libctx and use it for pkey (#18282) 2025-05-06 20:14:55 +02:00
Niels Dossche 8c685faa64 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix potential leaks when writing to BIO fails
 2025-04-11 21:04:24 +02:00
Niels Dossche 8a927c284d Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix potential leaks when writing to BIO fails
 2025-04-11 21:02:59 +02:00
Niels Dossche 29f96fb1f1 Fix potential leaks when writing to BIO fails 
When the BIO is created but writing fails, these can leak.

Closes GH-18186.
 2025-04-11 21:02:37 +02:00
Jakub Zelenka 2194ad81f4 Make further OpenSSL 1.0.2 clean up 
Closes GH-18133
 2025-04-08 18:06:56 +02:00
Niels Dossche 5a19e25347 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix inverted call to php_openssl_store_errors()
  Fix openssl_random_pseudo_bytes() always setting strong_result to true
 2025-04-02 20:30:44 +02:00
Niels Dossche a6e76ac010 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix inverted call to php_openssl_store_errors()
  Fix openssl_random_pseudo_bytes() always setting strong_result to true
 2025-04-02 20:25:32 +02:00
Niels Dossche 5e68671f88 Fix inverted call to php_openssl_store_errors() 
This calls php_openssl_store_errors() in the success path right now,
change it to call php_openssl_store_errors() in the error path.
 2025-04-02 20:25:21 +02:00
Niels Dossche 0dc600c69a Fix openssl_random_pseudo_bytes() always setting strong_result to true 
This regressed in 62c7432f, prior to that commit the value was set to
false in case random number generation failed, but now even if an
exception is thrown it is set to true. This likely does not _really_
matter as the user will handle the exception, still the value in
$strong_result is observable.
 2025-04-02 20:25:21 +02:00
Niels Dossche a39725b793 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix memory leak in openssl_sign() when passing invalid algorithm
 2025-04-02 20:24:13 +02:00
Niels Dossche d689ff63e8 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix memory leak in openssl_sign() when passing invalid algorithm
 2025-04-02 20:18:57 +02:00
Niels Dossche 74720a22f3 Fix memory leak in openssl_sign() when passing invalid algorithm 
Closes GH-18185.
 2025-04-02 20:15:53 +02:00
Jakub Zelenka 0d10f7bfe5 Remove OpenSSL 1.0.2 related code (#18032) 
This also removes old LibreSSL checks as minimum that compiles is 3.5.0
 2025-03-13 10:59:26 +01:00
Jakub Zelenka 2e7b6dac31 Merge branch 'PHP-8.4' 2025-02-28 14:52:37 +01:00
Jakub Zelenka 4936c32772 Merge branch 'PHP-8.3' into PHP-8.4 2025-02-28 14:51:52 +01:00
Jakub Zelenka 6bb56fe0cf Change openssl_x509_verify test to use cert generator (#17882) 
This also prevents verifying cert with SHA1 signature
 2025-02-28 14:51:12 +01:00
Gina Peter Banyard 78714d0fc5 ext/openssl: Use zend_result return type instead of int where applicable (#17721) 2025-02-06 16:59:43 +00:00
Jakub Zelenka d662ab5f08 Introduce openssl backend for v1 and v3 API separation (#16918) 
The main purpose of this is to better handle the API difference and add
an inital work to separate PHP and OpenSSL logic. This is really just
the first step and further changes are coming after that.

Closes GH-16918
 2025-02-06 15:50:05 +01:00
Christoph M. Becker 107bd080a5 Fix Clang style nits (GH-17685) 
This addresses all `-Wlogical-op-parentheses` and `-Wmissing-braces`
warnings across the whole code base (all Windows specific code).
 2025-02-05 14:13:56 +01:00
Christoph M. Becker aa76127d01 Address more Clang warnings (GH-17506) 
We prefer clean solutions (such as declaring the proper type in the
first place, or introducing a portable format specifier) where easily
possible, but resort to casts otherwise.

We also port https://github.com/libgd/libgd/commit/f1480ab14bd5e2e4b4d83d8f3e64e786aa810637.
 2025-01-21 20:05:29 +01:00
Jakub Zelenka b072206313 Merge branch 'PHP-8.4' 2024-12-31 15:25:17 +01:00
Jakub Zelenka d2977b026f Merge branch 'PHP-8.3' into PHP-8.4 2024-12-31 15:20:06 +01:00
Jakub Zelenka e0dabe326f Merge branch 'PHP-8.2' into PHP-8.3 2024-12-31 15:05:18 +01:00
Jakub Zelenka 37504f123d Port OpenSSL gh10495, gh13860 and gh9310 test to use ephemeral ports 2024-12-31 15:02:08 +01:00
Jakub Zelenka 44a9154e75 Merge branch 'PHP-8.1' into PHP-8.2 2024-12-31 14:39:59 +01:00
Jakub Zelenka b8731767d8 Fix GH-16955: Use empheral ports for OpenSSL server client tests 
And refactor some client server tests.

Closes GH-17180
 2024-12-31 14:25:19 +01:00
Christoph M. Becker 300811f1e2 Remove support for unsupported MSVC versions (GH-17128) 
As of PHP 8.4.0, MSVC >= 1920 (aka. Visual Studio 2019 RTW 16.0) is
required anyway[1], so we can clean up a bit.

[1] <https://github.com/php/php-src/commit/b3d6414b87cfebf503b5064a78ea1c5120ed638f>
 2024-12-12 19:50:14 +01:00
Niels Dossche ef1e1868ed Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix wrong merge
 2024-11-09 11:49:16 +01:00
Niels Dossche 80dd5a0306 Fix wrong merge 2024-11-09 11:49:08 +01:00
Niels Dossche fd68e9ba2c Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix memory leak in php_openssl_pkey_from_zval()
  Fix various memory leaks related to openssl exports
  Prevent unexpected array entry conversion when reading key
 2024-11-09 11:01:29 +01:00
Niels Dossche 591fe92724 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix memory leak in php_openssl_pkey_from_zval()
  Fix various memory leaks related to openssl exports
  Prevent unexpected array entry conversion when reading key
 2024-11-09 11:01:21 +01:00
Niels Dossche 994e866cf2 Fix memory leak in php_openssl_pkey_from_zval() 
Closes GH-16691.
 2024-11-09 10:58:44 +01:00
Niels Dossche 2f4f09f7e6 Fix various memory leaks related to openssl exports 
Closes GH-16692.
 2024-11-09 10:58:17 +01:00
Niels Dossche ac8d0e57d9 Prevent unexpected array entry conversion when reading key 
When passing an array, the key entry can get converted to a string if it
is an object, but this actually modifies the original array entry.
The test originally outputted:

```
array(2) {
  [0]=>
  string(...) => ...
  [1]=>
  string(0) ""
}
```

This is unexpected. Use zval_try_get_string() to prevent this behaviour.

Closes GH-16693.
 2024-11-09 10:57:50 +01:00