Skip to content

Commit e0d0a14

Browse files
bukkacharmitro
authored andcommitted
Test stream_context_tcp_nodelay_server on Windows
Closes phpGH-17308
1 parent 0652960 commit e0d0a14

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/scripts/windows/test_task.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,9 @@ rem generate php.ini
125125
echo extension_dir=%PHP_BUILD_DIR% > %PHP_BUILD_DIR%\php.ini
126126
echo opcache.file_cache=%PHP_BUILD_DIR%\test_file_cache >> %PHP_BUILD_DIR%\php.ini
127127
if "%OPCACHE%" equ "1" echo zend_extension=php_opcache.dll >> %PHP_BUILD_DIR%\php.ini
128-
rem work-around for some spawned PHP processes requiring OpenSSL
128+
rem work-around for some spawned PHP processes requiring OpenSSL and sockets
129129
echo extension=php_openssl.dll >> %PHP_BUILD_DIR%\php.ini
130+
echo extension=php_sockets.dll >> %PHP_BUILD_DIR%\php.ini
130131

131132
rem remove ext dlls for which tests are not supported
132133
for %%i in (ldap) do (

ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ sockets
55
--SKIPIF--
66
<?php
77
if (!function_exists("proc_open")) die("skip no proc_open");
8-
if (substr(PHP_OS, 0, 3) == 'WIN') {
9-
die('skip sockets ext currently does not work in worker on Windows');
10-
}
118
?>
129
--FILE--
1310
<?php
@@ -32,12 +29,12 @@ CODE;
3229

3330
$clientCode = <<<'CODE'
3431
$test = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10);
35-
3632
echo phpt_wait();
3733
CODE;
3834

3935
include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
4036
ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
4137
?>
42-
--EXPECT--
38+
--EXPECTF--
4339
server-delay:conn-nodelay
40+

0 commit comments

Comments
 (0)