Repository: trafficserver Updated Branches: refs/heads/master b3009146b -> a214393da
TS-2826: SPDY implementation does not support OPTIONS and TRACE methods Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a214393d Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a214393d Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a214393d Branch: refs/heads/master Commit: a214393daf91b4c261a2ead8e1a434f85a873f5c Parents: b300914 Author: Sudheer Vinukonda <[email protected]> Authored: Wed May 21 15:26:40 2014 -0700 Committer: Bryan Call <[email protected]> Committed: Wed May 21 15:26:40 2014 -0700 ---------------------------------------------------------------------- proxy/FetchSM.cc | 2 ++ proxy/api/ts/experimental.h | 2 ++ proxy/spdy/SpdyCallbacks.cc | 4 ++++ 3 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a214393d/proxy/FetchSM.cc ---------------------------------------------------------------------- diff --git a/proxy/FetchSM.cc b/proxy/FetchSM.cc index dc2ef49..e9af1f9 100644 --- a/proxy/FetchSM.cc +++ b/proxy/FetchSM.cc @@ -36,6 +36,8 @@ static const char *http_method[] = { "HEAD", "PURGE", "PUT", + "OPTIONS", + "TRACE", "LAST", }; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a214393d/proxy/api/ts/experimental.h ---------------------------------------------------------------------- diff --git a/proxy/api/ts/experimental.h b/proxy/api/ts/experimental.h index a36dc3e..8118df5 100644 --- a/proxy/api/ts/experimental.h +++ b/proxy/api/ts/experimental.h @@ -47,6 +47,8 @@ extern "C" TS_FETCH_METHOD_HEAD, TS_FETCH_METHOD_PURGE, TS_FETCH_METHOD_PUT, + TS_FETCH_METHOD_OPTIONS, + TS_FETCH_METHOD_TRACE, TS_FETCH_METHOD_LAST } TSFetchMethod; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a214393d/proxy/spdy/SpdyCallbacks.cc ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyCallbacks.cc b/proxy/spdy/SpdyCallbacks.cc index 898e49e..c5712f4 100644 --- a/proxy/spdy/SpdyCallbacks.cc +++ b/proxy/spdy/SpdyCallbacks.cc @@ -309,6 +309,10 @@ spdy_process_syn_stream_frame(SpdyClientSession *sm, SpdyRequest *req) spdy_fetcher_launch(req, TS_FETCH_METHOD_CONNECT); else if (req->method == "DELETE") spdy_fetcher_launch(req, TS_FETCH_METHOD_DELETE); + else if (req->method == "OPTIONS") + spdy_fetcher_launch(req, TS_FETCH_METHOD_OPTIONS); + else if (req->method == "TRACE") + spdy_fetcher_launch(req, TS_FETCH_METHOD_TRACE); else if (req->method == "LAST") spdy_fetcher_launch(req, TS_FETCH_METHOD_LAST); else
