Skip to content

fix(windows): repair MSVC build after new async API additions #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EdmondDantes merged 1 commit into from
May 18, 2026
Merged

fix(windows): repair MSVC build after new async API additions #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ if (PHP_TRUE_ASYNC_SERVER == "yes") {
var http_server_core =
"conn_arena.c " +
"body_pool.c " +
"async_plain_event.c " +
"http_connection.c " +
"http_connection_tls.c " +
"http_protocol_handlers.c " +
Expand All @@ -59,7 +60,8 @@ if (PHP_TRUE_ASYNC_SERVER == "yes") {
"http3_callbacks.c " +
"http3_dispatch.c " +
"http3_stream.c " +
"http3_stream_pool.c ";
"http3_stream_pool.c " +
"http3_static_response.c ";

var http_server_formats =
"multipart_parser.c " +
Expand Down Expand Up @@ -207,6 +209,7 @@ if (PHP_TRUE_ASYNC_SERVER == "yes") {
var http_server_compression =
"http_compression.c " +
"http_compression_gzip.c " +
"http_compression_pool.c " +
"http_compression_defaults.c " +
"http_compression_negotiate.c " +
"http_compression_response.c " +
Expand Down
21 changes: 10 additions & 11 deletions scripts/run-tests-windows.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,17 @@ rem ---- project root (parent of this scripts\ folder) ----
set "PROJECT_ROOT=%~dp0.."

rem ---- defaults ----
if "%PHP_SRC%"=="" set "PHP_SRC=E:\php\php-src"
if "%PHP_BUILD%"=="" set "PHP_BUILD=%PHP_SRC%\x64\Debug_TS"
if "%DEPS_BIN%"=="" set "DEPS_BIN=E:\php\deps\bin"
if "%TEST_INI%"=="" set "TEST_INI=%TEMP%\php-http-server-test.ini"
if "%PHP_SRC%"=="" set "PHP_SRC=E:\php\php-src"
if "%PHP_BUILD%"=="" set "PHP_BUILD=%PHP_SRC%\x64\Debug_TS"
if "%EXT_BUILD%"=="" set "EXT_BUILD=E:\php\true-async-server\x64\Debug_TS"
if "%DEPS_BIN%"=="" set "DEPS_BIN=E:\php\deps\bin"
if "%TEST_INI%"=="" set "TEST_INI=%TEMP%\php-http-server-test.ini"

rem ---- generate ini if missing ----
if not exist "%TEST_INI%" (
> "%TEST_INI%" echo extension_dir=%PHP_BUILD%
>> "%TEST_INI%" echo extension=php_openssl.dll
>> "%TEST_INI%" echo extension=php_http_server.dll
echo Generated %TEST_INI%
)
rem ---- always regenerate ini so extension_dir and dll name stay correct ----
> "%TEST_INI%" echo extension_dir=%EXT_BUILD%
>> "%TEST_INI%" echo extension=%PHP_BUILD%\php_openssl.dll
>> "%TEST_INI%" echo extension=%EXT_BUILD%\php_true_async_server.dll
echo Generated %TEST_INI%

rem ---- add deps\bin so openssl + curl are on PATH ----
set "PATH=%DEPS_BIN%;%PATH%"
Expand Down
10 changes: 5 additions & 5 deletions src/core/tls_layer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,13 @@ static bool tls_apply_security_defaults(SSL_CTX *ssl_ctx,

/* PARTIAL_WRITE + MOVING_WRITE_BUFFER: required by h2 emit retry loop.
* RELEASE_BUFFERS: drop record bufs between I/O — saves ~32 KB/idle conn. */
SSL_CTX_set_mode(ssl_ctx,
SSL_MODE_ENABLE_PARTIAL_WRITE
| SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER
{
long ssl_mode = SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER;
#ifdef SSL_MODE_RELEASE_BUFFERS
| SSL_MODE_RELEASE_BUFFERS
ssl_mode |= SSL_MODE_RELEASE_BUFFERS;
#endif
);
SSL_CTX_set_mode(ssl_ctx, ssl_mode);
}

/* Reject SHA1 in chains, RSA <2048, and other <112-bit primitives.
* OpenSSL default is level 1 (legacy). */
Expand Down
Loading