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/04/03 21:15:50 UTC
[4/4] trafficserver git commit: TS-3470 traffic_server --help
segfaults when SPDY is enabled
TS-3470 traffic_server --help segfaults when SPDY is enabled
(cherry picked from commit e0de1d6edd57130b15c1a4e8f3c2c89f2eced3cb)
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7bfa6664
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7bfa6664
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7bfa6664
Branch: refs/heads/5.3.x
Commit: 7bfa66647a361d5aa370c4da719143f65abc433c
Parents: a02ee84
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Mar 31 11:17:52 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Apr 3 13:02:54 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/7bfa6664/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 6ab80c6..9a6c8ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.3.0
+ *) [TS-3470] traffic_server --help segfaults when SPDY is enabled.
+
*) [TS-3491] background_fetch: Only release URL if we were scheduled.
*) [TS-2709] ATS does not send close-notify on shutdown. Confuses some clients.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7bfa6664/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);
}