walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Call Http2Session::disconnect() if initiate_connection() failed 

This will clean up resources allocated in initiate_connection()
properly.
This commit is contained in:
Tatsuhiro Tsujikawa 2014-01-10 21:32:39 +09:00
parent 8721631287
commit 25a6596e77
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shrpx_http2_session.cc
View File

@ -156,6 +156,7 @@ void notify_readcb(bufferevent *bev, void *arg)
if(rv != 0) { if(rv != 0) {
SSLOG(FATAL, http2session) SSLOG(FATAL, http2session)
<< "Could not initiate backend connection"; << "Could not initiate backend connection";
http2session->disconnect();
} }
break; break;
case Http2Session::CONNECTED: case Http2Session::CONNECTED:
@ -389,8 +390,6 @@ int Http2Session::initiate_connection()
SSLOG(ERROR, this) << "Failed to connect to the proxy " SSLOG(ERROR, this) << "Failed to connect to the proxy "
<< get_config()->downstream_http_proxy_host << ":" << get_config()->downstream_http_proxy_host << ":"
<< get_config()->downstream_http_proxy_port; << get_config()->downstream_http_proxy_port;
bufferevent_free(bev_);
bev_ = nullptr;
return SHRPX_ERR_NETWORK; return SHRPX_ERR_NETWORK;
} }
proxy_htp_ = util::make_unique<http_parser>(); proxy_htp_ = util::make_unique<http_parser>();
@ -432,7 +431,6 @@ int Http2Session::initiate_connection()
BEV_OPT_DEFER_CALLBACKS); BEV_OPT_DEFER_CALLBACKS);
if(!bev_) { if(!bev_) {
SSLOG(ERROR, this) << "bufferevent_socket_new() failed"; SSLOG(ERROR, this) << "bufferevent_socket_new() failed";
SSL_free(ssl_);
return SHRPX_ERR_NETWORK; return SHRPX_ERR_NETWORK;
} }
rv = bufferevent_socket_connect rv = bufferevent_socket_connect
@ -468,8 +466,6 @@ int Http2Session::initiate_connection()
} }
} }
if(rv != 0) { if(rv != 0) {
bufferevent_free(bev_);
bev_ = nullptr;
return SHRPX_ERR_NETWORK; return SHRPX_ERR_NETWORK;
} }