From 317ad6f4ad0ec9ab6c7cb3c69a39c03a8b640995 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 15 Jul 2012 03:32:05 +0900 Subject: [PATCH] Fixed free() for new. Any 2xx status means success in CONNECT response --- examples/shrpx_downstream.cc | 5 +++-- examples/shrpx_https_upstream.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/shrpx_downstream.cc b/examples/shrpx_downstream.cc index 0df0d4b..48072fb 100644 --- a/examples/shrpx_downstream.cc +++ b/examples/shrpx_downstream.cc @@ -78,7 +78,7 @@ Downstream::~Downstream() if(dconn_) { delete dconn_; } - free(response_htp_); + delete response_htp_; if(ENABLE_LOG) { LOG(INFO) << "Deleted"; } @@ -692,7 +692,8 @@ void Downstream::set_recv_window_size(int32_t new_size) bool Downstream::tunnel_established() const { - return request_method_ == "CONNECT" && response_http_status_ == 200; + return request_method_ == "CONNECT" && + 200 <= response_http_status_ && response_http_status_ < 300; } } // namespace shrpx diff --git a/examples/shrpx_https_upstream.cc b/examples/shrpx_https_upstream.cc index 040fea8..a474251 100644 --- a/examples/shrpx_https_upstream.cc +++ b/examples/shrpx_https_upstream.cc @@ -56,7 +56,7 @@ HttpsUpstream::HttpsUpstream(ClientHandler *handler) HttpsUpstream::~HttpsUpstream() { - free(htp_); + delete htp_; for(std::deque::iterator i = downstream_queue_.begin(); i != downstream_queue_.end(); ++i) { delete *i;