1
0
mirror of https://github.com/esphome/esphome.git synced 2025-09-26 23:22:21 +01:00

http_request http fix (#980)

Co-authored-by: Nikolay Vasilchuk <nikolay.vasilchuk@corp.mail.ru>
This commit is contained in:
Nikolay Vasilchuk
2020-03-12 03:27:05 +03:00
committed by GitHub
parent 426e6a1b46
commit e0b4226930
4 changed files with 39 additions and 16 deletions

View File

@@ -14,14 +14,15 @@ void HttpRequestComponent::dump_config() {
void HttpRequestComponent::send() {
bool begin_status = false;
this->client_.setReuse(true);
#ifdef ARDUINO_ARCH_ESP32
begin_status = this->client_.begin(this->url_);
#endif
#ifdef ARDUINO_ARCH_ESP8266
#ifndef CLANG_TIDY
begin_status = this->client_.begin(*this->wifi_client_, this->url_);
this->client_.setFollowRedirects(true);
this->client_.setRedirectLimit(3);
begin_status = this->client_.begin(*this->get_wifi_client_(), this->url_);
#endif
#endif
@@ -41,8 +42,6 @@ void HttpRequestComponent::send() {
}
int http_code = this->client_.sendRequest(this->method_, this->body_.c_str());
this->client_.end();
if (http_code < 0) {
ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Error: %s", this->url_, HTTPClient::errorToString(http_code).c_str());
this->status_set_warning();
@@ -59,5 +58,27 @@ void HttpRequestComponent::send() {
ESP_LOGD(TAG, "HTTP Request completed; URL: %s; Code: %d", this->url_, http_code);
}
#ifdef ARDUINO_ARCH_ESP8266
WiFiClient *HttpRequestComponent::get_wifi_client_() {
if (this->secure_) {
if (this->wifi_client_secure_ == nullptr) {
this->wifi_client_secure_ = new BearSSL::WiFiClientSecure();
this->wifi_client_secure_->setInsecure();
this->wifi_client_secure_->setBufferSizes(512, 512);
}
return this->wifi_client_secure_;
}
if (this->wifi_client_ == nullptr) {
this->wifi_client_ = new WiFiClient();
}
return this->wifi_client_;
}
#endif
void HttpRequestComponent::close() { this->client_.end(); }
const char *HttpRequestComponent::get_string() { return this->client_.getString().c_str(); }
} // namespace http_request
} // namespace esphome