Skip to content

Connected bug #3

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

Merged
merged 2 commits into from
Mar 22, 2013
Merged

Connected bug #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eb25a7
Actually return the connected status :)
johnmckerrell Nov 1, 2012
cc55357
Making http response timeout mutable
johnmckerrell Nov 2, 2012
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
5 changes: 3 additions & 2 deletions HttpClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ void HttpClient::resetState()
iContentLength = 0;
iBodyLengthConsumed = 0;
iContentLengthPtr = 0;
iHttpResponseTimeout = kHttpResponseTimeout;
}

void HttpClient::stop()
Expand Down Expand Up @@ -311,7 +312,7 @@ int HttpClient::responseStatusCode()
const char* statusPtr = statusPrefix;
// Whilst we haven't timed out & haven't reached the end of the headers
while ((c != '\n') &&
( (millis() - timeoutStart) < kHttpResponseTimeout ))
( (millis() - timeoutStart) < iHttpResponseTimeout ))
{
if (available())
{
Expand Down Expand Up @@ -401,7 +402,7 @@ int HttpClient::skipResponseHeaders()
unsigned long timeoutStart = millis();
// Whilst we haven't timed out & haven't reached the end of the headers
while ((!endOfHeadersReached()) &&
( (millis() - timeoutStart) < kHttpResponseTimeout ))
( (millis() - timeoutStart) < iHttpResponseTimeout ))
{
if (available())
{
Expand Down
5 changes: 4 additions & 1 deletion HttpClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,10 @@ class HttpClient : public Client
virtual int connect(IPAddress ip, uint16_t port) { return iClient->connect(ip, port); };
virtual int connect(const char *host, uint16_t port) { return iClient->connect(host, port); };
virtual void stop();
virtual uint8_t connected() { iClient->connected(); };
virtual uint8_t connected() { return iClient->connected(); };
virtual operator bool() { return bool(iClient); };
virtual uint32_t httpResponseTimeout() { return iHttpResponseTimeout; };
virtual void setHttpResponseTimeout(uint32_t timeout) { iHttpResponseTimeout = timeout; };
protected:
/** Reset internal state data back to the "just initialised" state
*/
Expand Down Expand Up @@ -434,6 +436,7 @@ class HttpClient : public Client
// Address of the proxy to use, if we're using one
IPAddress iProxyAddress;
uint16_t iProxyPort;
uint32_t iHttpResponseTimeout;
};

#endif