You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2015/09/03 04:39:11 UTC
[07/13] trafficserver git commit: TS-3618: crashes in traffic_cop on
shutdown
TS-3618: crashes in traffic_cop on shutdown
(cherry picked from commit edc8fbc923a62111c15965499d9b2b91a212fc57)
(cherry picked from commit 3ea9ccc302557a308549fc23cb0d078cbcd9ec1d)
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c022285f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c022285f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c022285f
Branch: refs/heads/5.3.x
Commit: c022285f985c01a40dd14f92ec783250e54d2b48
Parents: ce9e335
Author: Brian Geffon <br...@apache.org>
Authored: Wed May 20 18:25:45 2015 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Wed Sep 2 20:05:08 2015 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
cmd/traffic_cop/traffic_cop.cc | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c022285f/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 63ed0e7..8d22d93 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.3.2
+ *) [TS-3618] Crashes in traffic_cop on shutdown / restart.
+
*) [TS-3823] Fix ASAN build support.
*) [TS-3824] Fix #include of pcre for a couple of plugins.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c022285f/cmd/traffic_cop/traffic_cop.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index 20b73b9..9665dde 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -270,7 +270,7 @@ sig_term(int signum)
child_status = status;
}
cop_log_trace("Leaving sig_term(%d), exiting traffic_cop\n", signum);
- exit(0);
+ _exit(0);
}
static void