Commit fb8d4292 authored by Andre Malo's avatar Andre Malo
Browse files

disable the use of acceptex on Win9x systems automatically 

PR: 28529
Reviewed by: Jeff Tawick, Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103915 13f79535-47bb-0310-9956-ffa450edef68
parent 1f70062c

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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]


































STATUS



+1
−6



























Changes for STATUS: 1 added line, 6 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/06/11 19:39:10 $]









Last modified at [$Date: 2004/06/11 20:27:26 $]



















Release:




















@@ -112,11 +112,6 @@ PATCHES TO BACKPORT FROM 2.1







         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


































server/mpm/winnt/mpm_winnt.c



+5
−0



























Changes for server/mpm/winnt/mpm_winnt.c: 5 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -1361,6 +1361,11 @@ static int winnt_pre_config(apr_pool_t *pconf_, apr_pool_t *plog, apr_pool_t *pt







        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;