diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-03-09 01:54:46 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-03-16 18:00:50 +0100 |
| commit | 905fba60a046646a26a56b4c5d4a5dc7d5906f0d (patch) | |
| tree | 056f2321b14554c2bd1217f5e87254287b6e8477 /methods/server.h | |
| parent | d61960d9244340956a27f4ca46aecd15cc75e18b (diff) | |
derive more of https from http method
Bug #778375 uncovered that https wasn't properly integrated in the class
family tree of http as it was supposed to be leading to a NULL pointer
dereference. Fixing this 'properly' was deemed to much diff for
practically no gain that late in the release, so commit
0c2dc43d4fe1d026650b5e2920a021557f9534a6 just fixed the synptom, while
this commit here is fixing the cause plus adding a test.
Diffstat (limited to 'methods/server.h')
| -rw-r--r-- | methods/server.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/methods/server.h b/methods/server.h index b974ec89a..3b232dcac 100644 --- a/methods/server.h +++ b/methods/server.h @@ -37,6 +37,7 @@ struct ServerState unsigned long long Size; // size of the usable content (aka: the file) unsigned long long JunkSize; // size of junk content (aka: server error pages) unsigned long long StartPos; + bool ReceivedData; time_t Date; bool HaveContent; enum {Chunked,Stream,Closes} Encoding; @@ -75,7 +76,7 @@ struct ServerState bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0; JunkSize = 0; - StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false; + StartPos = 0; ReceivedData = false; Encoding = Closes; time(&Date); HaveContent = false; State = Header; Persistent = false; Pipeline = true; MaximumSize = 0;}; virtual bool WriteResponse(std::string const &Data) = 0; |