Skip to content

Commit 5437d06

Browse files
committed
Merge remote-tracking branch 'origin' into redis
2 parents bed3de6 + 2f74281 commit 5437d06

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
mkdir cmake-build-win64
3939
cd cmake-build-win64
40-
cmake .. -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release
40+
cmake .. -A x64 -DCMAKE_BUILD_TYPE=Release
4141
cmake --build . --config Release
4242
cd ..
4343

http/Http1Parser.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ class Http1Parser : public HttpParser {
103103
res->Reset();
104104
parsed = res;
105105
http_parser_init(&parser, HTTP_RESPONSE);
106+
state = HP_START_REQ_OR_RES;
106107
url.clear();
107108
header_field.clear();
108109
header_value.clear();

mqtt/mqtt_client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class MqttClient {
250250

251251
int subscribe(const char* topic, int qos = 0, MqttCallback ack_cb = NULL) {
252252
int mid = mqtt_client_subscribe(client, topic, qos);
253-
if (qos > 0 && mid >= 0 && ack_cb) {
253+
if (mid >= 0 && ack_cb) {
254254
setAckCallback(mid, ack_cb);
255255
}
256256
return mid;

0 commit comments

Comments
 (0)