Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 21990 invoked from network); 25 Feb 2006 00:59:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Feb 2006 00:59:29 -0000 Received: (qmail 32341 invoked by uid 500); 25 Feb 2006 00:59:28 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 32297 invoked by uid 500); 25 Feb 2006 00:59:28 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 32286 invoked by uid 99); 25 Feb 2006 00:59:27 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2006 16:59:27 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 24 Feb 2006 16:59:27 -0800 Received: (qmail 21924 invoked by uid 65534); 25 Feb 2006 00:59:06 -0000 Message-ID: <20060225005906.21923.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r380878 - in /httpd/httpd/trunk: CHANGES server/mpm/experimental/event/event.c Date: Sat, 25 Feb 2006 00:59:06 -0000 To: cvs@httpd.apache.org From: rooneg@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rooneg Date: Fri Feb 24 16:59:04 2006 New Revision: 380878 URL: http://svn.apache.org/viewcvs?rev=380878&view=rev Log: Fill in the scoreboard's tid field in the event MPM, just like we do in other MPMs. Submitted by: Chris Darroch Issue: 38736 * server/mpm/experimental/event/event.c (worker_thread): Fill in the scoreboard's tid field. * CHANGES: Note change. Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/server/mpm/experimental/event/event.c Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=380878&r1=380877&r2=380878&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Fri Feb 24 16:59:04 2006 @@ -2,6 +2,9 @@ Changes with Apache 2.3.0 [Remove entries to the current 2.0 and 2.2 section below, when backported] + *) Event MPM: Fill in the scoreboard's tid field. PR 38736. + [Chris Darroch ] + *) mod_charset_lite: Remove Content-Length when output filter can invalidate it. Warn when input filter can invalidate it. [Jeff Trawick] Modified: httpd/httpd/trunk/server/mpm/experimental/event/event.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/experimental/event/event.c?rev=380878&r1=380877&r2=380878&view=diff ============================================================================== --- httpd/httpd/trunk/server/mpm/experimental/event/event.c (original) +++ httpd/httpd/trunk/server/mpm/experimental/event/event.c Fri Feb 24 16:59:04 2006 @@ -1137,6 +1137,7 @@ free(ti); ap_scoreboard_image->servers[process_slot][thread_slot].pid = ap_my_pid; + ap_scoreboard_image->servers[process_slot][thread_slot].tid = apr_os_thread_current(); ap_scoreboard_image->servers[process_slot][thread_slot].generation = ap_my_generation; ap_update_child_status_from_indexes(process_slot, thread_slot, SERVER_STARTING, NULL);