Updated Branches: refs/heads/master 8812c2225 -> 4b43ca7f9
TS-2487: export PUSH HTTP method constants to the TS API Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4b43ca7f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4b43ca7f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4b43ca7f Branch: refs/heads/master Commit: 4b43ca7f97a883c1bfd2b1f7155139edb11c2c3e Parents: 8812c22 Author: James Peach <[email protected]> Authored: Mon Jan 6 15:33:01 2014 -0800 Committer: James Peach <[email protected]> Committed: Wed Jan 8 13:45:09 2014 -0800 ---------------------------------------------------------------------- CHANGES | 2 ++ doc/sdk/http-headers/http-headers.en.rst | 3 +++ lib/atscppapi/src/HttpMethod.cc | 3 ++- lib/atscppapi/src/include/atscppapi/HttpMethod.h | 3 ++- proxy/InkAPI.cc | 4 ++++ proxy/api/ts/ts.h.in | 2 ++ 6 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4b43ca7f/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index a8b1c13..93e0af7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.0 + *) [TS-2487] Export PUSH HTTP method constants to the TS API. + *) [TS-2486] Eliminate SIMPLE_MEMCPY_INIT define. *) [TS-2483] Add a new metric, proxy.node.restarts.proxy.cache_ready_time, http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4b43ca7f/doc/sdk/http-headers/http-headers.en.rst ---------------------------------------------------------------------- diff --git a/doc/sdk/http-headers/http-headers.en.rst b/doc/sdk/http-headers/http-headers.en.rst index 0bf67c9..7208840 100644 --- a/doc/sdk/http-headers/http-headers.en.rst +++ b/doc/sdk/http-headers/http-headers.en.rst @@ -77,6 +77,9 @@ the methods defined in the HTTP 1.1 specification ``TS_HTTP_METHOD_TRACE`` "TRACE" +``TS_HTTP_METHOD_PUSH`` + "PUSH" + Traffic Server also defines several common values that appear in HTTP headers. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4b43ca7f/lib/atscppapi/src/HttpMethod.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/HttpMethod.cc b/lib/atscppapi/src/HttpMethod.cc index c8a6051..0ce5c5f 100644 --- a/lib/atscppapi/src/HttpMethod.cc +++ b/lib/atscppapi/src/HttpMethod.cc @@ -32,5 +32,6 @@ const std::string atscppapi::HTTP_METHOD_STRINGS[] = { std::string("UNKNOWN"), std::string("OPTIONS"), std::string("PURGE"), std::string("PUT"), - std::string("TRACE") }; + std::string("TRACE"), + std::string("PUSH") }; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4b43ca7f/lib/atscppapi/src/include/atscppapi/HttpMethod.h ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/include/atscppapi/HttpMethod.h b/lib/atscppapi/src/include/atscppapi/HttpMethod.h index c07c673..44029f7 100644 --- a/lib/atscppapi/src/include/atscppapi/HttpMethod.h +++ b/lib/atscppapi/src/include/atscppapi/HttpMethod.h @@ -42,7 +42,8 @@ enum HttpMethod { HTTP_METHOD_OPTIONS, HTTP_METHOD_PURGE, HTTP_METHOD_PUT, - HTTP_METHOD_TRACE + HTTP_METHOD_TRACE, + HTTP_METHOD_PUSH }; /** http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4b43ca7f/proxy/InkAPI.cc ---------------------------------------------------------------------- diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc index cb31e6d..3c40ce5 100644 --- a/proxy/InkAPI.cc +++ b/proxy/InkAPI.cc @@ -342,6 +342,7 @@ tsapi const char *TS_HTTP_METHOD_POST; tsapi const char *TS_HTTP_METHOD_PURGE; tsapi const char *TS_HTTP_METHOD_PUT; tsapi const char *TS_HTTP_METHOD_TRACE; +tsapi const char *TS_HTTP_METHOD_PUSH; /* HTTP methods string lengths */ tsapi int TS_HTTP_LEN_CONNECT; @@ -354,6 +355,7 @@ tsapi int TS_HTTP_LEN_POST; tsapi int TS_HTTP_LEN_PURGE; tsapi int TS_HTTP_LEN_PUT; tsapi int TS_HTTP_LEN_TRACE; +tsapi int TS_HTTP_LEN_PUSH; /* TLS Next Protocol well-known protocol names. */ @@ -1521,6 +1523,7 @@ api_init() TS_HTTP_METHOD_PURGE = HTTP_METHOD_PURGE; TS_HTTP_METHOD_PUT = HTTP_METHOD_PUT; TS_HTTP_METHOD_TRACE = HTTP_METHOD_TRACE; + TS_HTTP_METHOD_PUSH = HTTP_METHOD_PUSH; TS_HTTP_LEN_CONNECT = HTTP_LEN_CONNECT; TS_HTTP_LEN_DELETE = HTTP_LEN_DELETE; @@ -1532,6 +1535,7 @@ api_init() TS_HTTP_LEN_PURGE = HTTP_LEN_PURGE; TS_HTTP_LEN_PUT = HTTP_LEN_PUT; TS_HTTP_LEN_TRACE = HTTP_LEN_TRACE; + TS_HTTP_LEN_PUSH = HTTP_LEN_PUSH; /* HTTP miscellaneous values */ TS_HTTP_VALUE_BYTES = HTTP_VALUE_BYTES; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4b43ca7f/proxy/api/ts/ts.h.in ---------------------------------------------------------------------- diff --git a/proxy/api/ts/ts.h.in b/proxy/api/ts/ts.h.in index ff025d5..a184939 100644 --- a/proxy/api/ts/ts.h.in +++ b/proxy/api/ts/ts.h.in @@ -1048,6 +1048,7 @@ extern "C" extern tsapi const char* TS_HTTP_METHOD_PURGE; extern tsapi const char* TS_HTTP_METHOD_PUT; extern tsapi const char* TS_HTTP_METHOD_TRACE; + extern tsapi const char* TS_HTTP_METHOD_PUSH; /* -------------------------------------------------------------------------- HTTP methods string lengths */ @@ -1061,6 +1062,7 @@ extern "C" extern tsapi int TS_HTTP_LEN_PURGE; extern tsapi int TS_HTTP_LEN_PUT; extern tsapi int TS_HTTP_LEN_TRACE; + extern tsapi int TS_HTTP_LEN_PUSH; /* -------------------------------------------------------------------------- TLS Next Protocol well-known protocol names. */
