httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r609184 - in /httpd/httpd/branches/2.0.x: CHANGES server/mpm/winnt/child.c
Date Sat, 05 Jan 2008 18:23:44 GMT
Author: wrowe
Date: Sat Jan  5 10:23:43 2008
New Revision: 609184

URL: http://svn.apache.org/viewvc?rev=609184&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/server/mpm/winnt/child.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?rev=609184&r1=609183&r2=609184&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Sat Jan  5 10:23:43 2008
@@ -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
 

Modified: httpd/httpd/branches/2.0.x/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/server/mpm/winnt/child.c?rev=609184&r1=609183&r2=609184&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/server/mpm/winnt/child.c (original)
+++ httpd/httpd/branches/2.0.x/server/mpm/winnt/child.c Sat Jan  5 10:23:43 2008
@@ -425,12 +425,12 @@
         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;



Mime
View raw message