archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +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:
Jakub Zelenka 2025-01-06 12:18:54 +01:00
commit 5be673d29e
No known key found for this signature in database
GPG key ID: 1C0779DC5C0A9DE4
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/scripts/windows/test_task.bat vendored
View file

@ -126,8 +126,9 @@ rem generate php.ini
echo extension_dir=%PHP_BUILD_DIR% > %PHP_BUILD_DIR%\php.ini echo extension_dir=%PHP_BUILD_DIR% > %PHP_BUILD_DIR%\php.ini
echo opcache.file_cache=%PHP_BUILD_DIR%\test_file_cache >> %PHP_BUILD_DIR%\php.ini echo opcache.file_cache=%PHP_BUILD_DIR%\test_file_cache >> %PHP_BUILD_DIR%\php.ini
if "%OPCACHE%" equ "1" echo zend_extension=php_opcache.dll >> %PHP_BUILD_DIR%\php.ini if "%OPCACHE%" equ "1" echo zend_extension=php_opcache.dll >> %PHP_BUILD_DIR%\php.ini
rem work-around for some spawned PHP processes requiring OpenSSL rem work-around for some spawned PHP processes requiring OpenSSL and sockets
echo extension=php_openssl.dll >> %PHP_BUILD_DIR%\php.ini echo extension=php_openssl.dll >> %PHP_BUILD_DIR%\php.ini
echo extension=php_sockets.dll >> %PHP_BUILD_DIR%\php.ini
rem remove ext dlls for which tests are not supported rem remove ext dlls for which tests are not supported
for %%i in (ldap oci8_12c pdo_oci) do ( for %%i in (ldap oci8_12c pdo_oci) do (

7
ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt
View file

@ -5,9 +5,6 @@ sockets
--SKIPIF-- --SKIPIF--
<?php <?php
if (!function_exists("proc_open")) die("skip no proc_open"); if (!function_exists("proc_open")) die("skip no proc_open");
if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip sockets ext currently does not work in worker on Windows');
}
?> ?>
--FILE-- --FILE--
<?php <?php
@ -32,12 +29,12 @@ CODE;
$clientCode = <<<'CODE' $clientCode = <<<'CODE'
$test = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10); $test = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10);
echo phpt_wait(); echo phpt_wait();
CODE; CODE;
include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__); include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?> ?>
--EXPECT-- --EXPECTF--
server-delay:conn-nodelay server-delay:conn-nodelay