Repository: trafficserver
Updated Branches:
  refs/heads/master e13d8a6e8 -> e0de1d6ed


TS-3470 traffic_server --help segfaults when SPDY is enabled


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e0de1d6e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e0de1d6e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e0de1d6e

Branch: refs/heads/master
Commit: e0de1d6edd57130b15c1a4e8f3c2c89f2eced3cb
Parents: e13d8a6
Author: Leif Hedstrom <[email protected]>
Authored: Tue Mar 31 11:17:52 2015 -0600
Committer: Leif Hedstrom <[email protected]>
Committed: Tue Mar 31 11:17:52 2015 -0600

----------------------------------------------------------------------
 CHANGES            | 2 ++
 lib/ts/ink_args.cc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e0de1d6e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 49325fb..7422d2c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 6.0.0
 
+  *) [TS-3470] traffic_server --help segfaults when SPDY is enabled.
+
   *) [TS-1611] Async request suport in lua plugin.
 
   *) [TS-3456] SSL blind tunnel sometimes not created.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e0de1d6e/lib/ts/ink_args.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_args.cc b/lib/ts/ink_args.cc
index 12ab5c0..91cebd8 100644
--- a/lib/ts/ink_args.cc
+++ b/lib/ts/ink_args.cc
@@ -323,5 +323,5 @@ usage(const ArgumentDescription *argument_descriptions, 
unsigned n_argument_desc
     }
     fprintf(stderr, " %s\n", argument_descriptions[i].description);
   }
-  exit(EX_USAGE);
+  _exit(EX_USAGE);
 }

Reply via email to