stoddard 2003/12/15 15:19:14
Modified: server/mpm/winnt child.c mpm_winnt.c mpm_winnt.h Log: Win32: Rename WindowsSocketsWorkaround directive to Win32DisableAcceptEx. Clean up code paths.
Index: mpm_winnt.c
-static const char *set_sockets_workaround (cmd_parms *cmd, void *dummy, char *arg) +static const char *set_disable_acceptex(cmd_parms *cmd, void *dummy, char *arg) {
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return err;
}
-
- windows_sockets_workaround = 0;
- if (!strcasecmp(arg, "on")) {
- windows_sockets_workaround = 1;
- }
- else if (strcasecmp(arg, "off")) {
+ if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, - "WARNING: setting WindowsSocketsWorkaround to off");
+ "Ignoring Win32EnableAcceptEx configuration directive. "
+ "The directive is not valid on Windows 9x");
I think you mean "Ignoring Win32DisableAcceptEx configuration" there.
I don't think we need that message though.
+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, + "Disabled use AcceptEx WinSock2 API");
I suggest "Disabled use of AcceptEx..."
I think it would be better if it is written to the error log once the server is initialized, rather than have it appear temporarily on the screen. Somebody looking at the error log to try to understand some misbehavior would want to know this info.
