Commit a0e92e2f authored by Garrett Rooney's avatar Garrett Rooney
Browse files

Fill in the scoreboard's tid field in the event MPM, just like we do in

other MPMs.

Submitted by: Chris Darroch <chrisd pearsoncmg.com>
Issue: 38736

* server/mpm/experimental/event/event.c
  (worker_thread): Fill in the scoreboard's tid field.

* CHANGES: Note change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@380878 13f79535-47bb-0310-9956-ffa450edef68
parent 9c97962e
Loading
Loading
Loading
Loading
+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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 <chrisd pearsoncmg.com>]
  *) mod_charset_lite: Remove Content-Length when output filter can 
     invalidate it.  Warn when input filter can invalidate it.
     [Jeff Trawick]
+1 −0
Changes for server/mpm/experimental/event/event.c: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -1137,6 +1137,7 @@ static void *APR_THREAD_FUNC worker_thread(apr_thread_t * thd, void *dummy)
    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);