diff options
| author | Mladen Turk <mturk@apache.org> | 2006-08-02 17:31:24 +0200 |
|---|---|---|
| committer | Mladen Turk <mturk@apache.org> | 2006-08-02 17:31:24 +0200 |
| commit | 36db918bc8d17a23ca013e7dad5e328baf3b2de4 (patch) | |
| tree | da8a0ae125a5501a744aebdc425c18653a6b0804 /server/mpm/winnt/child.c | |
| parent | Revert the patch. Although the problem still exists (diff) | |
| download | apache2-36db918bc8d17a23ca013e7dad5e328baf3b2de4.tar.xz apache2-36db918bc8d17a23ca013e7dad5e328baf3b2de4.zip | |
Fix return values from wait_for_many_objects.
The return value is index to the signaled thread in
the creted_threads array.
We can not use WAIT_TIMEOUT as return value
because its value is defined as 258, thus limiting
the MaxThreads to that value that leads to the
assertion errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428029 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | server/mpm/winnt/child.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index d950869806..4d83252157 100644 --- a/server/mpm/winnt/child.c +++ b/server/mpm/winnt/child.c @@ -1119,8 +1119,7 @@ void child_main(apr_pool_t *pconf) end_time = time(NULL) + 180; while (threads_created) { rv = wait_for_many_objects(threads_created, child_handles, (DWORD)(end_time - time(NULL))); - if (rv != WAIT_TIMEOUT) { - rv = rv - WAIT_OBJECT_0; + if (rv != WAIT_FAILED) { ap_assert((rv >= 0) && (rv < threads_created)); cleanup_thread(child_handles, &threads_created, rv); continue; |