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

Merge branch 'PHP-8.1' into PHP-8.2

Browse source
This commit is contained in:
David Carlier 2023-02-26 08:18:09 +00:00
commit bf2e778c71
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -60,6 +60,9 @@ PHP NEWS
- Opcache:
. Fix incorrect page_size check. (nielsdos)
- OpenSSL:
. Fixed php_openssl_set_server_dh_param() DH params errors handling. (nielsdos)
- PDO OCI:
. Fixed bug #60994 (Reading a multibyte CLOB caps at 8192 chars).
(Michael Voříšek)

2
ext/opcache/ZendAccelerator.c
View file

@ -3037,7 +3037,7 @@ static void accel_move_code_to_huge_pages(void)
int ret;
while (1) {
ret = fscanf(f, "%lx-%lx %4s %lx %9s %ld %s\n", &start, &end, perm, &offset, dev, &inode, name);
ret = fscanf(f, "%lx-%lx %4s %lx %9s %lu %s\n", &start, &end, perm, &offset, dev, &inode, name);
if (ret == 7) {
if (perm[0] == 'r' && perm[1] == '-' && perm[2] == 'x' && name[0] == '/') {
long unsigned int seg_start = ZEND_MM_ALIGNED_SIZE_EX(start, huge_page_size);

9
ext/openssl/xp_ssl.c
View file

@ -1237,7 +1237,7 @@ static int php_openssl_set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /*
return FAILURE;
}
if (SSL_CTX_set0_tmp_dh_pkey(ctx, pkey) < 0) {
if (SSL_CTX_set0_tmp_dh_pkey(ctx, pkey) == 0) {
php_error_docref(NULL, E_WARNING, "Failed assigning DH params");
EVP_PKEY_free(pkey);
return FAILURE;
@ -1251,7 +1251,7 @@ static int php_openssl_set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /*
return FAILURE;
}
if (SSL_CTX_set_tmp_dh(ctx, dh) < 0) {
if (SSL_CTX_set_tmp_dh(ctx, dh) == 0) {
php_error_docref(NULL, E_WARNING, "Failed assigning DH params");
DH_free(dh);
return FAILURE;
@ -1320,7 +1320,10 @@ static int php_openssl_set_server_specific_opts(php_stream *stream, SSL_CTX *ctx
php_error_docref(NULL, E_WARNING, "rsa_key_size context option has been removed");
}
php_openssl_set_server_dh_param(stream, ctx);
if (php_openssl_set_server_dh_param(stream, ctx) == FAILURE) {
return FAILURE;
}
zv = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "single_dh_use");
if (zv == NULL || zend_is_true(zv)) {
ssl_ctx_options |= SSL_OP_SINGLE_DH_USE;