Merge remote-tracking branch 'origin/master' into topic/bernhard/even-more-ssl-changes

This commit is contained in:
Bernhard Amann 2014-05-15 10:59:13 -07:00
commit ccccda6da8
80 changed files with 1654 additions and 1547 deletions

View file

@ -45,7 +45,7 @@ public:
virtual void Done();
virtual void DeliverStream(int len, const u_char* data, bool orig);
virtual void ConnectionFinished(int half_finished);
virtual void Undelivered(int seq, int len, bool orig);
virtual void Undelivered(uint64 seq, int len, bool orig);
void SkipData() { skip_data = 1; } // skip delivery of data lines