Repository: trafficserver Updated Branches: refs/heads/master b918d0493 -> a5e6eeeb9
CID #1271336 fix the fix that was bad Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a5e6eeeb Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a5e6eeeb Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a5e6eeeb Branch: refs/heads/master Commit: a5e6eeeb93b95def6e8b5cfc1be00796dc6e085f Parents: b918d04 Author: Leif Hedstrom <[email protected]> Authored: Tue Jun 9 09:52:28 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Tue Jun 9 09:52:28 2015 -0600 ---------------------------------------------------------------------- proxy/http2/Http2ConnectionState.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a5e6eeeb/proxy/http2/Http2ConnectionState.h ---------------------------------------------------------------------- diff --git a/proxy/http2/Http2ConnectionState.h b/proxy/http2/Http2ConnectionState.h index 85b4147..61526f0 100644 --- a/proxy/http2/Http2ConnectionState.h +++ b/proxy/http2/Http2ConnectionState.h @@ -71,9 +71,13 @@ public: unsigned set(Http2SettingsIdentifier id, unsigned value) { - ink_assert(id < HTTP2_SETTINGS_MAX); + if (id < HTTP2_SETTINGS_MAX) { + return this->settings[indexof(id)] = value; + } else { + ink_assert(!"Bad Settings Identifier"); + } - return this->settings[indexof(id)] = value; + return 0; } private:
