From 8bf440b89c7e155292435bb73cd0fe28f0e00650 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 28 Mar 2015 20:19:17 +0900 Subject: [PATCH] nghttpx: Rename Http2Session::on_connect as connection_made --- src/shrpx_http2_session.cc | 6 +++--- src/shrpx_http2_session.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shrpx_http2_session.cc b/src/shrpx_http2_session.cc index 6649eac2..a73c91c5 100644 --- a/src/shrpx_http2_session.cc +++ b/src/shrpx_http2_session.cc @@ -1212,7 +1212,7 @@ nghttp2_session_callbacks *create_http2_downstream_callbacks() { return callbacks; } -int Http2Session::on_connect() { +int Http2Session::connection_made() { int rv; state_ = Http2Session::CONNECTED; @@ -1561,7 +1561,7 @@ int Http2Session::connected() { return do_write(); } - if (on_connect() != 0) { + if (connection_made() != 0) { state_ = CONNECT_FAILING; return -1; } @@ -1657,7 +1657,7 @@ int Http2Session::tls_handshake() { read_ = &Http2Session::read_tls; write_ = &Http2Session::write_tls; - if (on_connect() != 0) { + if (connection_made() != 0) { state_ = CONNECT_FAILING; return -1; } diff --git a/src/shrpx_http2_session.h b/src/shrpx_http2_session.h index e58c5b22..35d33763 100644 --- a/src/shrpx_http2_session.h +++ b/src/shrpx_http2_session.h @@ -89,7 +89,7 @@ public: int resume_data(Http2DownstreamConnection *dconn); - int on_connect(); + int connection_made(); int do_read(); int do_write();