jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow HTTPS without certificate to use begin(url)

Browse Source
This commit is contained in:
me-no-dev 2017-09-29 17:02:59 +08:00
parent 4230aeca83
commit 7aa1913506
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,10 @@ bool HTTPClient::begin(String url, const char* CAcert)
*/ */
bool HTTPClient::begin(String url) bool HTTPClient::begin(String url)
{ {
if (beginInternal(url, "https")) {
return begin(url, (const char*)NULL);
}
_transportTraits.reset(nullptr); _transportTraits.reset(nullptr);
_port = 80; _port = 80;
if (!beginInternal(url, "http")) { if (!beginInternal(url, "http")) {
@ -143,6 +147,11 @@ bool HTTPClient::beginInternal(String url, const char* expectedProtocol)
} }
_protocol = url.substring(0, index); _protocol = url.substring(0, index);
if (_protocol != expectedProtocol) {
log_d("[HTTP-Client][begin] unexpected protocol: %s, expected %s", _protocol.c_str(), expectedProtocol);
return false;
}
url.remove(0, (index + 3)); // remove http:// or https:// url.remove(0, (index + 3)); // remove http:// or https://
index = url.indexOf('/'); index = url.indexOf('/');
@ -168,10 +177,6 @@ bool HTTPClient::beginInternal(String url, const char* expectedProtocol)
_host = host; _host = host;
} }
_uri = url; _uri = url;
if (_protocol != expectedProtocol) {
log_d("[HTTP-Client][begin] unexpected protocol: %s, expected %s", _protocol.c_str(), expectedProtocol);
return false;
}
log_d("[HTTP-Client][begin] host: %s port: %d url: %s", _host.c_str(), _port, _uri.c_str()); log_d("[HTTP-Client][begin] host: %s port: %d url: %s", _host.c_str(), _port, _uri.c_str());
return true; return true;
} }