httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
Date Fri, 11 Jun 2004 20:27:27 GMT
nd          2004/06/11 13:27:27

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server/mpm/winnt Tag: APACHE_2_0_BRANCH mpm_winnt.c
  Log:
  disable the use of acceptex on Win9x systems automatically
  
  PR: 28529
  Reviewed by: Jeff Tawick, Bill Stoddard
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.301 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.300
  retrieving revision 1.988.2.301
  diff -u -u -r1.988.2.300 -r1.988.2.301
  --- CHANGES	11 Jun 2004 19:39:10 -0000	1.988.2.300
  +++ CHANGES	11 Jun 2004 20:27:25 -0000	1.988.2.301
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.50
   
  +  *) Restore the ability to disable the use of AcceptEx on Win9x systems
  +     automatically (broken in 2.0.49). PR 28529.  [André Malo]
  +
     *) <VirtualHost myhost> now applies to all IP addresses for myhost
        instead of just the first one reported by the resolver.  This
        corrects a regression since 1.3.  [Jeff Trawick]
  
  
  
  1.751.2.918 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.917
  retrieving revision 1.751.2.918
  diff -u -u -r1.751.2.917 -r1.751.2.918
  --- STATUS	11 Jun 2004 19:39:10 -0000	1.751.2.917
  +++ STATUS	11 Jun 2004 20:27:26 -0000	1.751.2.918
  @@ -112,11 +112,6 @@
            modules/mappers/mod_actions.c: r1.32, r1.34
          +1: nd
   
  -    *) Disable AcceptEx on Win9x systems automatically. (broken in 2.0.49)
  -       PR 28529
  -         server/mpm/winnt/mpm_winnt.c: 1.311
  -       +1: nd, trawick, stoddard
  -
       *) export ap_set_sub_req_protocol and ap_finalize_sub_req_protocol on Win32 and NetWare.
          (should be a minor MMN bump). PR 28523.
            server/protocol.c: r1.147
  
  
  
  No                   revision
  No                   revision
  1.296.2.8 +5 -0      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.296.2.7
  retrieving revision 1.296.2.8
  diff -u -u -r1.296.2.7 -r1.296.2.8
  --- mpm_winnt.c	29 Feb 2004 14:53:01 -0000	1.296.2.7
  +++ mpm_winnt.c	11 Jun 2004 20:27:27 -0000	1.296.2.8
  @@ -1361,6 +1361,11 @@
           exit(APEXIT_INIT);
       }
   
  +    /* Win9x: disable AcceptEx */
  +    if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
  +        use_acceptex = 0;
  +    }
  +
       ap_listen_pre_config();
       ap_threads_per_child = DEFAULT_THREADS_PER_CHILD;
       ap_pid_fname = DEFAULT_PIDLOG;
  
  
  

Mime
View raw message