Commit 45b11b93 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

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
parent e3e220f8

CHANGES

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

server/mpm/winnt/child.c

+1 −1
Changes for server/mpm/winnt/child.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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;