Skip to content

Commit 2aeff2c

Browse files
authored
main: update Winsock api version to 2.2 (#14909)
not been updated since php 4 whereas 2.2 is available even in Win2000.
1 parent 3c9ab6e commit 2aeff2c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

main/main.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2073,7 +2073,7 @@ zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additi
20732073
zend_module_entry *module;
20742074

20752075
#ifdef PHP_WIN32
2076-
WORD wVersionRequested = MAKEWORD(2, 0);
2076+
WORD wVersionRequested = MAKEWORD(2, 2);
20772077
WSADATA wsaData;
20782078

20792079
old_invalid_parameter_handler =
@@ -2162,6 +2162,12 @@ zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additi
21622162
fprintf(stderr, "\nwinsock.dll unusable. %d\n", WSAGetLastError());
21632163
return FAILURE;
21642164
}
2165+
2166+
if (UNEXPECTED(HIBYTE(wsaData.wVersion) != 2)) {
2167+
fprintf(stderr, "\nversion not found in winsock.dll. %d\n", WSAGetLastError());
2168+
WSACleanup();
2169+
return FAILURE;
2170+
}
21652171
php_win32_signal_ctrl_handler_init();
21662172
#endif
21672173

0 commit comments

Comments
 (0)