httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
Date Fri, 09 Jan 2004 20:41:06 GMT
stoddard    2004/01/09 12:41:06

  Modified:    server/mpm/winnt mpm_winnt.c
  Log:
  Win32: Simplify. Issue message if the Win32DisableAcceptEx directive toggles the default
setting of use_acceptex. Tnx Jeff.
  
  Revision  Changes    Path
  1.305     +4 -10     httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.304
  retrieving revision 1.305
  diff -u -r1.304 -r1.305
  --- mpm_winnt.c	1 Jan 2004 13:26:25 -0000	1.304
  +++ mpm_winnt.c	9 Jan 2004 20:41:06 -0000	1.305
  @@ -225,17 +225,11 @@
       if (err != NULL) {
           return err;
       }
  -    if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
  -        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
  -                     "Ignoring Win32EnableAcceptEx configuration directive. "
  -                     "The directive is not valid on Windows 9x");
  -        return NULL;
  +    if (use_acceptex) {
  +        use_acceptex = 0;
  +        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL, 
  +                     "Disabled use of AcceptEx() WinSock2 API");
       }
  -
  -    use_acceptex = 0;
  -
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
  -                         "Disabled use AcceptEx WinSock2 API");
       return NULL;
   }
   
  
  
  

Mime
View raw message