Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Timeout Bug in WebServer #2938

Merged
merged 6 commits into from
Jul 9, 2019
Merged

Fix Timeout Bug in WebServer #2938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a775e7
add support for CORS headers
vicatcu Apr 20, 2019
33d69ec
remove accidental function impl
vicatcu Apr 20, 2019
5395e16
rename setCORS to enableCORS, and add aliased function enableCrossOrigin
vicatcu Apr 22, 2019
7d45733
Merge branch 'master' of github.com:espressif/arduino-esp32
vicatcu Jun 26, 2019
d84f1e7
fix accidentally introduced change and commit proposed fix
vicatcu Jun 26, 2019
d82205e
found an adjacent misuse of setTimeout in httpUpdateSecure example
vicatcu Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/HTTPUpdate/examples/httpUpdateSecure/httpUpdateSecure.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ void loop() {
client.setCACert(rootCACertificate);

// Reading data over SSL may be slow, use an adequate timeout
client.setTimeout(12000);
client.setTimeout(12000 / 1000); // timeout argument is defined in seconds for setTimeout

// The line below is optional. It can be used to blink the LED on the board during flashing
// The LED will be on during download of one buffer of data from the network. The LED will
Expand Down
4 changes: 3 additions & 1 deletion libraries/WebServer/src/WebServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,9 @@ void WebServer::handleClient() {
// Wait for data from client to become available
if (_currentClient.available()) {
if (_parseRequest(_currentClient)) {
_currentClient.setTimeout(HTTP_MAX_SEND_WAIT);
// because HTTP_MAX_SEND_WAIT is expressed in milliseconds,
// it must be divided by 1000
_currentClient.setTimeout(HTTP_MAX_SEND_WAIT / 1000);
_contentLength = CONTENT_LENGTH_NOT_SET;
_handleRequest();

Expand Down