generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-23 00:07:59 +02:00
Code Issues Projects Releases Wiki Activity

porting 1.4.4 rev. 1929, 1939 (SF# 3552680 et. al)

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2012-08-23 04:27:50 +00:00
parent 91b3ca4421
commit ae45a2d311
6 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Net/src/MessageHeader.cpp
View File

@@ -139,6 +139,20 @@ void MessageHeader::setFieldLimit(int limit)
}
bool MessageHeader::hasToken(const std::string& fieldName, const std::string& token) const
{
std::string field = get(fieldName, "");
std::vector<std::string> tokens;
splitElements(field, tokens, true);
for (std::vector<std::string>::const_iterator it = tokens.begin(); it != tokens.end(); ++it)
{
if (Poco::icompare(*it, token) == 0)
return true;
}
return false;
}
void MessageHeader::splitElements(const std::string& s, std::vector<std::string>& elements, bool ignoreEmpty)
{
elements.clear();

21
Net/src/WebSocketImpl.cpp
View File

@@ -118,9 +118,28 @@ int WebSocketImpl::sendBytes(const void* buffer, int length, int flags)
int WebSocketImpl::receiveBytes(void* buffer, int length, int)
{
char header[MAX_HEADER_LENGTH];
int n = _pStreamSocketImpl->receiveBytes(header, MAX_HEADER_LENGTH);
int n = _pStreamSocketImpl->receiveBytes(header, 2);
if (n == 1)
{
n += _pStreamSocketImpl->receiveBytes(header + 1, 1);
}
if (n == 2)
{
Poco::UInt8 lengthByte = static_cast<Poco::UInt8>(header[1]) & 0x7f;
if (lengthByte + 2 < MAX_HEADER_LENGTH)
{
n = _pStreamSocketImpl->receiveBytes(header + 2, lengthByte);
}
else
{
n = _pStreamSocketImpl->receiveBytes(header + 2, MAX_HEADER_LENGTH - 2);
}
}
else throw WebSocketException("Incomplete frame received", WebSocket::WS_ERR_INCOMPLETE_FRAME);
if (n > 0)
{
n += 2;
Poco::MemoryInputStream istr(header, n);
Poco::BinaryReader reader(istr, Poco::BinaryReader::NETWORK_BYTE_ORDER);
Poco::UInt8 flags;