This is an automated email from the ASF dual-hosted git repository. masaori pushed a commit to branch quic-latest in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/quic-latest by this push: new 2c53847 Rename QUICSimpleApp to Http09App 2c53847 is described below commit 2c538479077a23a1e5c2d2cd54fee02e76c2ea16 Author: Masaori Koshiba <masa...@apache.org> AuthorDate: Thu Mar 7 15:22:30 2019 +0900 Rename QUICSimpleApp to Http09App --- proxy/http3/{QUICSimpleApp.cc => Http09App.cc} | 10 +++++----- proxy/http3/{QUICSimpleApp.h => Http09App.h} | 7 ++++--- proxy/http3/Http3SessionAccept.cc | 4 ++-- proxy/http3/Makefile.am | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/proxy/http3/QUICSimpleApp.cc b/proxy/http3/Http09App.cc similarity index 91% rename from proxy/http3/QUICSimpleApp.cc rename to proxy/http3/Http09App.cc index cbff215..f89d0bb 100644 --- a/proxy/http3/QUICSimpleApp.cc +++ b/proxy/http3/Http09App.cc @@ -21,7 +21,7 @@ * limitations under the License. */ -#include "QUICSimpleApp.h" +#include "Http09App.h" #include "P_Net.h" #include "P_VConnection.h" @@ -33,7 +33,7 @@ static constexpr char debug_tag[] = "quic_simple_app"; static constexpr char debug_tag_v[] = "v_quic_simple_app"; -QUICSimpleApp::QUICSimpleApp(QUICNetVConnection *client_vc, IpAllow::ACL session_acl) : QUICApplication(client_vc) +Http09App::Http09App(QUICNetVConnection *client_vc, IpAllow::ACL session_acl) : QUICApplication(client_vc) { this->_client_session = new Http3ClientSession(client_vc); this->_client_session->acl = std::move(session_acl); @@ -41,16 +41,16 @@ QUICSimpleApp::QUICSimpleApp(QUICNetVConnection *client_vc, IpAllow::ACL session this->_qc->stream_manager()->set_default_application(this); - SET_HANDLER(&QUICSimpleApp::main_event_handler); + SET_HANDLER(&Http09App::main_event_handler); } -QUICSimpleApp::~QUICSimpleApp() +Http09App::~Http09App() { delete this->_client_session; } int -QUICSimpleApp::main_event_handler(int event, Event *data) +Http09App::main_event_handler(int event, Event *data) { Debug(debug_tag_v, "[%s] %s (%d)", this->_qc->cids().data(), get_vc_event_name(event), event); diff --git a/proxy/http3/QUICSimpleApp.h b/proxy/http3/Http09App.h similarity index 86% rename from proxy/http3/QUICSimpleApp.h rename to proxy/http3/Http09App.h index fcb9c9a..1132ef2 100644 --- a/proxy/http3/QUICSimpleApp.h +++ b/proxy/http3/Http09App.h @@ -33,13 +33,14 @@ class Http3ClientSession; /** * @brief A simple multi-streamed application. * @detail Response to simple HTTP/0.9 GETs + * This will be removed when HTTP/0.9 over QUIC support is dropped * */ -class QUICSimpleApp : public QUICApplication +class Http09App : public QUICApplication { public: - QUICSimpleApp(QUICNetVConnection *client_vc, IpAllow::ACL session_acl); - ~QUICSimpleApp(); + Http09App(QUICNetVConnection *client_vc, IpAllow::ACL session_acl); + ~Http09App(); int main_event_handler(int event, Event *data); diff --git a/proxy/http3/Http3SessionAccept.cc b/proxy/http3/Http3SessionAccept.cc index c542abc..6a12f3a 100644 --- a/proxy/http3/Http3SessionAccept.cc +++ b/proxy/http3/Http3SessionAccept.cc @@ -27,7 +27,7 @@ #include "I_Machine.h" #include "IPAllow.h" -#include "QUICSimpleApp.h" +#include "Http09App.h" #include "Http3App.h" Http3SessionAccept::Http3SessionAccept(const HttpSessionAccept::Options &_o) : SessionAccept(nullptr), options(_o) @@ -68,7 +68,7 @@ Http3SessionAccept::accept(NetVConnection *netvc, MIOBuffer *iobuf, IOBufferRead Debug("http3", "[%s] start HTTP/0.9 app (ALPN=%s)", qvc->cids().data(), IP_PROTO_TAG_HTTP_QUIC.data()); } - new QUICSimpleApp(qvc, std::move(session_acl)); + new Http09App(qvc, std::move(session_acl)); } else if (IP_PROTO_TAG_HTTP_3.compare(alpn) == 0) { Debug("http3", "[%s] start HTTP/3 app (ALPN=%s)", qvc->cids().data(), IP_PROTO_TAG_HTTP_3.data()); diff --git a/proxy/http3/Makefile.am b/proxy/http3/Makefile.am index 50e51b8..b8d8920 100644 --- a/proxy/http3/Makefile.am +++ b/proxy/http3/Makefile.am @@ -35,6 +35,7 @@ AM_CPPFLAGS += \ noinst_LIBRARIES = libhttp3.a libhttp3_a_SOURCES = \ + Http09App.cc \ Http3.cc \ Http3Config.cc \ Http3App.cc \ @@ -50,8 +51,7 @@ libhttp3_a_SOURCES = \ Http3DataFramer.cc \ Http3HeaderVIOAdaptor.cc \ Http3StreamDataVIOAdaptor.cc \ - QPACK.cc \ - QUICSimpleApp.cc + QPACK.cc # # Check Programs