Commit 48c8526b authored by Bill Stoddard's avatar Bill Stoddard
Browse files

WinNT MPM: Fix a broken log message at termination. 


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

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.51









  *) WinNT MPM: Fix a broken log message at termination.  PR 28063.









     [Eider Oliveira <eider bol.com.br>]

















  *) Prevent Win32 pool corruption at startup [Allan Edwards]

















  *) mod_ssl: Add "SSLUserName" directive to set r->user based on a


































STATUS



+1
−9



























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



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/08/25 15:20:15 $]









Last modified at [$Date: 2004/08/26 01:03:20 $]



















Release:




















@@ -194,14 +194,6 @@ PATCHES TO BACKPORT FROM 2.1







       0: nd: IMHO that's a public API change then and not applicable for









              2.0, just let 'em in



















    *) Prevent Win32 pool corruption at startup









         server/mpm/winnt/child.c: r1.36 









       +1: ake, trawick, nd, stoddard



















    *) WinNT MPM: Fix a broken log message at termination.  PR 28063.









         server/mpm/winnt/child.c: r1.37









       +1: trawick, nd



















    *) mod_actions: Regression from 1.3: the file referred to must exist.









       Solve this by introducing the "virtual" modifier to the Action









       directive. PR 28553.


































server/mpm/winnt/child.c



+2
−1



























Changes for server/mpm/winnt/child.c: 2 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -1080,7 +1080,8 @@ void child_main(apr_pool_t *pconf)







    /* Kill remaining threads off the hard way */









    if (threads_created) {









        ap_log_error(APLOG_MARK,APLOG_NOTICE, APR_SUCCESS, ap_server_conf, 









                     "Child %d: Terminating %d threads that failed to exit.", my_pid);









                     "Child %d: Terminating %d threads that failed to exit.", 









                     my_pid, threads_created);









    }









    for (i = 0; i < threads_created; i++) {









        int *score_idx;