refactoring + cancellation was buggy during http upgrade

This commit is contained in:
Benjamin Sergeant
2019-01-02 07:45:07 -08:00
parent 6bfabd5493
commit 239b5bc02c
4 changed files with 88 additions and 79 deletions

View File

@@ -21,6 +21,7 @@
#include "IXWebSocketPerMessageDeflate.h"
#include "IXWebSocketPerMessageDeflateOptions.h"
#include "IXWebSocketHttpHeaders.h"
#include "IXCancellationRequest.h"
namespace ix
{
@@ -162,11 +163,7 @@ namespace ix
void unmaskReceiveBuffer(const wsheader_type& ws);
std::string genRandomString(const int len);
// Non blocking versions of read/write, used during http upgrade
bool readByte(void* buffer);
bool writeBytes(const std::string& str);
// Parse HTTP headers
std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders();
std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders(const CancellationRequest& isCancellationRequested);
};
}