winnt_mpm: Restore Win32DisableAcceptEx On directive and Win9x platform

by recreating the bucket allocator each time the trans pool is cleared.

PR: 11427 #16 (follow-on)
Submitted by: Tom Donovan <Tom.Donovan acm.org>
Backport: r609181

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@609184 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0db5b452ba311dbdcecb8812daefd80b64fc72b3..d21fbf16f8274dfa02f62f8b2145cf1ef3dadb61 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.63
 
+  *) winnt_mpm: Restore Win32DisableAcceptEx On directive and Win9x platform
+     by recreating the bucket allocator each time the trans pool is cleared.
+     PR: 11427 #16 (follow-on)  [Tom Donovan <Tom.Donovan acm.org>]
 
 Changes with Apache 2.0.62
 

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 1eccd9a5ec1b8baf21d88e7b2deb9338920e1b2a..266d0b3ce8423b05b061558c3248f4d27f63b82f 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -425,12 +425,12 @@ static PCOMP_CONTEXT win9x_get_connection(PCOMP_CONTEXT context)
         apr_pool_create_ex(&context->ptrans, pchild, NULL, allocator);
         apr_allocator_owner_set(allocator, context->ptrans);
         apr_pool_tag(context->ptrans, "transaction");
-        context->ba = apr_bucket_alloc_create(context->ptrans);
         apr_thread_mutex_unlock(child_lock);
     }
     
     while (1) {
         apr_pool_clear(context->ptrans);        
+        context->ba = apr_bucket_alloc_create(context->ptrans);
         context->accept_socket = remove_job();
         if (context->accept_socket == INVALID_SOCKET) {
             return NULL;