espressif/arduino-esp32
1
0
Fork 1
mirror of https://github.com/0xFEEDC0DE64/arduino-esp32.git synced 2025-07-01 21:10:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to make use of SSL a bit less confusing by ensuring errors are generated if the wrong method is called to retrieve the data stream. (#934)

Browse Source
This commit is contained in:
Jason K
2017-12-19 08:06:45 -05:00
committed by Me No Dev
parent 75bc1e648b
commit cfbb7300b7
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/HTTPClient/src/HTTPClient.cpp
View File

@ -203,6 +203,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcer
if (strlen(CAcert) == 0) {
return false;
}
_secure = true;
_transportTraits = TransportTraitsPtr(new TLSTraits(CAcert));
return true;
}
@ -217,6 +218,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcer
if (strlen(CAcert) == 0) {
return false;
}
_secure = true;
_transportTraits = TransportTraitsPtr(new TLSTraits(CAcert, cli_cert, cli_key));
return true;
}
@ -561,18 +563,18 @@ int HTTPClient::getSize(void)
*/
WiFiClient& HTTPClient::getStream(void)
{
if(connected()) {
if (connected() && !_secure) {
return *_tcp;
}
log_d("getStream: not connected");
log_w("getStream: not connected");
static WiFiClient empty;
return empty;
}
/**
* returns the stream of the tcp connection
* @return WiFiClient *
* returns a pointer to the stream of the tcp connection
* @return WiFiClient*
*/
WiFiClient* HTTPClient::getStreamPtr(void)
{
@ -580,7 +582,7 @@ WiFiClient* HTTPClient::getStreamPtr(void)
return _tcp.get();
}
log_d("getStreamPtr: not connected");
log_w("getStreamPtr: not connected");
return nullptr;
}