HTTP: 优化http客户端代码，并修复重定向时超时的bug: #1306

src/Http/HttpClient.h

@@ -61,9 +61,9 @@ public:
     /**
     /**
      * 发送http[s]请求
      * 发送http[s]请求
      * @param url 请求url
      * @param url 请求url
-     * @param fTimeOutSec 超时时间
+     * @param timeout_sec 超时时间
      */
      */
-    virtual void sendRequest(const string &url, float fTimeOutSec);
+    virtual void sendRequest(const string &url, float timeout_sec);
 
 
     /**
     /**
      * 重置对象
      * 重置对象
@@ -170,7 +170,7 @@ private:
     void clearResponse();
     void clearResponse();
 
 
 protected:
 protected:
-    bool _isHttps;
+    bool _is_https;
 
 
 private:
 private:
     string _url;
     string _url;
@@ -178,15 +178,16 @@ private:
     HttpBody::Ptr _body;
     HttpBody::Ptr _body;
     string _method;
     string _method;
     string _path;
     string _path;
-    string _lastHost;
-    Ticker _aliveTicker;
-    float _fTimeOutSec = 0;
+    string _last_host;
+    Ticker _recv_timeout_ticker;
+    Ticker _total_timeout_ticker;
+    float _timeout_second = 0;
 
 
     //recv
     //recv
-    size_t _recvedBodySize;
-    ssize_t _totalBodySize;
+    size_t _recved_body_size;
+    ssize_t _total_body_size;
     Parser _parser;
     Parser _parser;
-    std::shared_ptr<HttpChunkedSplitter> _chunkedSplitter;
+    std::shared_ptr<HttpChunkedSplitter> _chunked_splitter;
 };
 };
 
 
 } /* namespace mediakit */
 } /* namespace mediakit */

src/Http/HttpClientImp.cpp

@@ -13,7 +13,7 @@
 namespace mediakit {
 namespace mediakit {
 
 
 void HttpClientImp::onConnect(const SockException &ex) {
 void HttpClientImp::onConnect(const SockException &ex) {
-    if(!_isHttps){
+    if(!_is_https){
         HttpClient::onConnect(ex);
         HttpClient::onConnect(ex);
     } else {
     } else {
         TcpClientWithSSL<HttpClient>::onConnect(ex);
         TcpClientWithSSL<HttpClient>::onConnect(ex);