[seasocks] Update to 1.4.6 (#33656)

This commit is contained in:
chausner 2023-09-14 00:35:10 +02:00 committed by GitHub
parent 7e10d7ce8e
commit a6025e0f75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 39 deletions

View File

@ -1,33 +0,0 @@
diff --git a/src/main/c/HybiPacketDecoder.cpp b/src/main/c/HybiPacketDecoder.cpp
--- a/src/main/c/HybiPacketDecoder.cpp
+++ b/src/main/c/HybiPacketDecoder.cpp
@@ -66,7 +66,7 @@ HybiPacketDecoder::MessageState HybiPacketDecoder::decodeNextMessage(
deflateNeeded = !!(reservedBits & 0x40);
auto opcode = static_cast<Opcode>(_buffer[_messageStart] & 0xf);
- size_t payloadLength = _buffer[_messageStart + 1] & 0x7fu;
+ uint64_t payloadLength = _buffer[_messageStart + 1] & 0x7fu;
auto maskBit = _buffer[_messageStart + 1] & 0x80;
auto ptr = _messageStart + 2;
if (payloadLength == 126) {
@@ -103,7 +103,7 @@ HybiPacketDecoder::MessageState HybiPacketDecoder::decodeNextMessage(
}
messageOut.clear();
- messageOut.reserve(payloadLength);
+ messageOut.reserve(static_cast<size_t>(payloadLength));
for (auto i = 0u; i < payloadLength; ++i) {
auto byteShift = (3 - (i & 3)) * 8;
messageOut.push_back(static_cast<uint8_t>((_buffer[ptr++] ^ (mask >> byteShift)) & 0xff));
diff --git a/src/main/c/seasocks/StreamingResponse.cpp b/src/main/c/seasocks/StreamingResponse.cpp
--- a/src/main/c/seasocks/StreamingResponse.cpp
+++ b/src/main/c/seasocks/StreamingResponse.cpp
@@ -51,7 +51,7 @@ void StreamingResponse::handle(std::shared_ptr<ResponseWriter> writer) {
bool isGood = stream->good();
if (isGood || isEof) {
// everything is fine, push data to client
- writer->payload(buffer.get(), stream->gcount(), flush);
+ writer->payload(buffer.get(), static_cast<size_t>(stream->gcount()), flush);
}
if (!isGood) {

View File

@ -6,10 +6,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mattgodbolt/seasocks
REF "v${VERSION}"
SHA512 733e12e57db025797016a49fa191facb72a0aa57625545c613862f407b21f8c19f78fc633a9a004d7ff15ded87e9a9a379c5fff2f92a14ccf83f0ff7d2308561
SHA512 18e596a09a825efd2421eee3b0d5ea389c0056c4b01c8b2078841d03863318e3f3ad59f6fd47fbe90409989c1fe05599f29b34a397427d282124e867371733ed
HEAD_REF master
PATCHES
0001-fix-x86-build.patch
)
vcpkg_find_acquire_program(PYTHON3)

View File

@ -1,10 +1,10 @@
{
"name": "seasocks",
"version": "1.4.5",
"version": "1.4.6",
"description": "Simple, small, C++ embeddable webserver with WebSockets support",
"homepage": "https://github.com/mattgodbolt/seasocks",
"license": "BSD-2-Clause",
"supports": "!windows & !osx & !android",
"supports": "!osx & !android",
"dependencies": [
{
"name": "vcpkg-cmake",

View File

@ -7529,7 +7529,7 @@
"port-version": 0
},
"seasocks": {
"baseline": "1.4.5",
"baseline": "1.4.6",
"port-version": 0
},
"secp256k1": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "03e48020c7de7692366f75676b4f8567d96e22f0",
"version": "1.4.6",
"port-version": 0
},
{
"git-tree": "2477e55b543e20d96c95546ff5a362d8a1a72044",
"version": "1.4.5",