Return-Path: Delivered-To: apmail-new-httpd-archive@apache.org Received: (qmail 4589 invoked by uid 500); 15 Jul 2001 06:14:29 -0000 Mailing-List: contact new-httpd-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list new-httpd@apache.org Received: (qmail 4578 invoked from network); 15 Jul 2001 06:14:29 -0000 Date: Sat, 14 Jul 2001 23:14:10 -0700 From: Justin Erenkrantz To: new-httpd@apache.org Subject: Re: [PATCH] Threaded MPM and unserialized accept Message-ID: <20010714231410.J14852@ebuilt.com> References: <20010714230036.I14852@ebuilt.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20010714230036.I14852@ebuilt.com>; from jerenkrantz@ebuilt.com on Sat, Jul 14, 2001 at 11:00:36PM -0700 X-AntiVirus: scanned for viruses by AMaViS 0.2.1-pre3 (http://amavis.org/) X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N On Sat, Jul 14, 2001 at 11:00:36PM -0700, Justin Erenkrantz wrote: > Is this just an oversight? NO_SERIALIZED_ACCEPT is never defined > anywhere. I'm beginning to wonder how maintained threaded MPM is. =) Oops. Disregard the previous patch (but not my comments - they still stand). This is closer - copied from prefork MPM. -- justin Index: server/mpm/threaded/threaded.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v retrieving revision 1.44 diff -u -r1.44 threaded.c --- server/mpm/threaded/threaded.c 2001/07/03 13:58:10 1.44 +++ server/mpm/threaded/threaded.c 2001/07/15 06:11:59 @@ -183,8 +183,8 @@ static apr_lockmech_e_np accept_lock_mech = APR_LOCK_DEFAULT; static const char *lock_fname; -#ifdef NO_SERIALIZED_ACCEPT -#define SAFE_ACCEPT(stmt) APR_SUCCESS +#ifdef SINGLE_LISTEN_UNSERIALIZED_ACCEPT +#define SAFE_ACCEPT(stmt) do {if (ap_listeners->next) {stmt;}} while(0) #else #define SAFE_ACCEPT(stmt) (stmt) #endif