Update

mobizt · Apr 30, 2019 · c03a4d9 · c03a4d9
1 parent 00d8101
commit c03a4d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Firebase_Arduino_WiFi101.cpp b/src/Firebase_Arduino_WiFi101.cpp
@@ -530,7 +530,7 @@ bool Firebase_Arduino_WiFi101::getServerResponse(FirebaseData &dataObj)
 
   if (!dataObj._http.http_connected() || dataObj._interruptRequest)
     return cancelCurrentResponse(dataObj);
-  if (!handleTCPNotConnected(dataObj) || !dataObj._httpConnected)
+  if (!handleNetClientNotConnected(dataObj) || !dataObj._httpConnected)
     return false;
 
   bool flag = false;
@@ -572,7 +572,7 @@ bool Firebase_Arduino_WiFi101::getServerResponse(FirebaseData &dataObj)
   uint16_t charPos = 0;
 
   if (!dataObj._isStream)
-    while (client.connected() && !client.available() && millis() - dataTime < dataObj._http.tcpTimeout)
+    while (client.connected() && !client.available() && millis() - dataTime < dataObj._http.netClientTimeout)
       delay(1);
 
   dataTime = millis();
@@ -732,7 +732,7 @@ bool Firebase_Arduino_WiFi101::getServerResponse(FirebaseData &dataObj)
         charPos = 0;
       }
 
-      if (millis() - dataTime > dataObj._http.tcpTimeout)
+      if (millis() - dataTime > dataObj._http.netClientTimeout)
       {
         //cancelCurrentResponse(dataObj);
         dataObj._httpCode = HTTPC_ERROR_READ_TIMEOUT;
@@ -1300,7 +1300,7 @@ void Firebase_Arduino_WiFi101::resetFirebasedataFlag(FirebaseData &dataObj)
   dataObj._dataAvailable = false;
   memset(dataObj._pushName, 0, FBDATA_PUSH_NAME_LENGTH);
 }
-bool Firebase_Arduino_WiFi101::handleTCPNotConnected(FirebaseData &dataObj)
+bool Firebase_Arduino_WiFi101::handleNetClientNotConnected(FirebaseData &dataObj)
 {
   if (!dataObj._http.http_connected())
   {

diff --git a/src/Firebase_Arduino_WiFi101.h b/src/Firebase_Arduino_WiFi101.h
@@ -697,7 +697,7 @@ class Firebase_Arduino_WiFi101
 
     void sendHeader(FirebaseData &dataObj, const char *host, uint8_t _method, const char *path, const char *auth, uint16_t payloadLength);
     void resetFirebasedataFlag(FirebaseData &dataObj);
-    bool handleTCPNotConnected(FirebaseData &dataObj);
+    bool handleNetClientNotConnected(FirebaseData &dataObj);
     void forceEndHTTP(FirebaseData &dataObj);
     int firebaseConnect(FirebaseData &dataObj, const char *path, const uint8_t method, uint8_t dataType, const char *payload);
     bool cancelCurrentResponse(FirebaseData &dataObj);

diff --git a/src/Firebase_Arduino_WiFi101_HTTPCLient.h b/src/Firebase_Arduino_WiFi101_HTTPCLient.h
@@ -98,7 +98,7 @@ class FirebaseHTTPClient
     bool http_connected(void);
     int http_sendRequest(const char *header, const char *payload);
     WiFiSSLClient client;
-    uint16_t tcpTimeout = 5000;
+    uint16_t netClientTimeout = 5000;
 
   protected:
     bool http_connect(void);