Stop deadline timer once start to read response.

webcc/http_client.cc

@@ -9,12 +9,13 @@ using boost::asio::ip::tcp;
 
 namespace webcc {
 
-HttpClient::HttpClient(std::size_t buffer_size, bool ssl_verify)
-    : buffer_size_(buffer_size == 0 ? kBufferSize : buffer_size),
-      timer_(io_context_),
+HttpClient::HttpClient(bool ssl_verify, std::size_t buffer_size)
+    : timer_(io_context_),
       ssl_verify_(ssl_verify),
+      buffer_size_(buffer_size == 0 ? kBufferSize : buffer_size),
       timeout_(kMaxReadSeconds),
       closed_(false),
+      timer_canceled_(false),
       timed_out_(false),
       error_(kNoError) {
 }
@@ -26,6 +27,7 @@ bool HttpClient::Request(const HttpRequest& request, bool connect) {
   response_parser_.reset(new HttpResponseParser(response_.get()));
 
   closed_ = false;
+  timer_canceled_ = false;
   timed_out_ = false;
   error_ = kNoError;
 
@@ -160,8 +162,10 @@ void HttpClient::DoReadResponse(Error* error) {
 
     LOG_VERB("Socket async read handler.");
 
+    // Stop the deadline timer once the read has started.
+    CancelTimer();
+
     if (ec || length == 0) {
-      StopTimer();
       Close();
       *error = kSocketReadError;
       LOG_ERRO("Socket read error (%s).", ec.message().c_str());
@@ -172,7 +176,7 @@ void HttpClient::DoReadResponse(Error* error) {
 
     // Parse the response piece just read.
     if (!response_parser_->Parse(buffer_.data(), length)) {
-      StopTimer();
+      //CancelTimer();
       Close();
       *error = kHttpError;
       LOG_ERRO("Failed to parse HTTP response.");
@@ -183,7 +187,7 @@ void HttpClient::DoReadResponse(Error* error) {
       // Stop trying to read once all content has been received, because
       // some servers will block extra call to read_some().
 
-      StopTimer();
+      //CancelTimer();
 
       if (response_->IsConnectionKeepAlive()) {
         // Close the timer but keep the socket connection.
@@ -243,10 +247,15 @@ void HttpClient::OnTimer(boost::system::error_code ec) {
   DoWaitTimer();
 }
 
-void HttpClient::StopTimer() {
-  // Cancel any asynchronous operations that are waiting on the timer.
+void HttpClient::CancelTimer() {
+  if (timer_canceled_) {
+    return;
+  }
+
   LOG_INFO("Cancel deadline timer...");
   timer_.cancel();
+
+  timer_canceled_ = true;
 }
 
 }  // namespace webcc

webcc/http_client.h

@@ -27,7 +27,7 @@ typedef std::shared_ptr<HttpClient> HttpClientPtr;
 // Please don't use the same client object in multiple threads.
 class HttpClient {
 public:
-  explicit HttpClient(std::size_t buffer_size = 0, bool ssl_verify = true);
+  explicit HttpClient(bool ssl_verify = true, std::size_t buffer_size = 0);
 
   virtual ~HttpClient() = default;
 
@@ -87,7 +87,8 @@ private:
   void DoWaitTimer();
   void OnTimer(boost::system::error_code ec);
 
-  void StopTimer();
+  // Cancel any async-operations waiting on the timer.
+  void CancelTimer();
 
 private:
   boost::asio::io_context io_context_;
@@ -104,14 +105,13 @@ private:
   // The buffer for reading response.
   std::vector<char> buffer_;
 
+  // Verify the certificate of the peer or not (for HTTPS).
+  bool ssl_verify_;
+
   // The size of the buffer for reading response.
   // Set 0 for using default value (e.g., 1024).
   std::size_t buffer_size_;
 
-  // Verify the certificate of the peer (remote server) or not.
-  // HTTPS only.
-  bool ssl_verify_;
-
   // Maximum seconds to wait before the client cancels the operation.
   // Only for reading response from server.
   int timeout_;
@@ -119,9 +119,13 @@ private:
   // Connection closed.
   bool closed_;
 
-  // If the error was caused by timeout or not.
+  // Deadline timer canceled.
+  bool timer_canceled_;
+
+  // Timeout occurred.
   bool timed_out_;
 
+  // Error code.
   Error error_;
 };
 

webcc/http_client_session.cc

@@ -42,7 +42,7 @@ HttpResponsePtr HttpClientSession::Request(HttpRequestArgs&& args) {
   assert(args.parameters_.size() % 2 == 0);
   assert(args.headers_.size() % 2 == 0);
 
-  HttpRequest request{ args.method_, args.url_ };
+  HttpRequest request{args.method_, args.url_};
 
   for (std::size_t i = 1; i < args.parameters_.size(); i += 2) {
     request.AddParameter(args.parameters_[i - 1], args.parameters_[i]);
@@ -83,7 +83,7 @@ HttpResponsePtr HttpClientSession::Request(HttpRequestArgs&& args) {
 
   HttpClientPtr client = pool_.Get(key);
   if (!client) {
-    client.reset(new HttpClient{buffer_size, ssl_verify});
+    client.reset(new HttpClient{ssl_verify, buffer_size});
     reuse = false;
   } else {
     client->set_buffer_size(buffer_size);

webcc/http_request_args.h

@@ -38,11 +38,6 @@ public:
     return std::move(*this);
   }
 
-  HttpRequestArgs&& url(std::string&& url) {
-    url_ = std::move(url);
-    return std::move(*this);
-  }
-
   HttpRequestArgs&& parameters(const std::vector<std::string>& parameters) {
     parameters_ = parameters;
     return std::move(*this);