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

diff --git a/CHANGES b/CHANGES
index eeb6757694969c8750561b7092120f61cf4cf88c..a6e04ed545edd581cf7b24127e90570888d73515 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]

diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c
index e0c9aa43ea71d48c46f47033e7b94641914d6593..7f340300cc5bb407f86afe55eb1e5d5ed3a1c802 100644 (file)
--- a/server/mpm/experimental/event/event.c
+++ b/server/mpm/experimental/event/event.c
@@ -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);