Skip to content

Commit 3993a6a

Browse files
author
ithewei
committed
v1.2.3
1 parent 57e0211 commit 3993a6a

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.6)
22

3-
project(hv VERSION 1.2.2)
3+
project(hv VERSION 1.2.3)
44

55
option(BUILD_SHARED "build shared library" ON)
66
option(BUILD_STATIC "build static library" ON)

base/hversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ BEGIN_EXTERN_C
88

99
#define HV_VERSION_MAJOR 1
1010
#define HV_VERSION_MINOR 2
11-
#define HV_VERSION_PATCH 2
11+
#define HV_VERSION_PATCH 3
1212

1313
#define HV_VERSION_STRING STRINGIFY(HV_VERSION_MAJOR) "." \
1414
STRINGIFY(HV_VERSION_MINOR) "." \

event/hevent.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,8 +717,9 @@ int hio_write_kcp(hio_t* io, const void* buf, size_t len) {
717717
// printf("ikcp_send len=%d nsend=%d\n", (int)len, nsend);
718718
if (nsend < 0) {
719719
hio_close(io);
720+
} else {
721+
ikcp_update(kcp->ikcp, (IUINT32)io->loop->cur_hrtime / 1000);
720722
}
721-
ikcp_update(kcp->ikcp, (IUINT32)io->loop->cur_hrtime / 1000);
722723
return nsend;
723724
}
724725

http/client/AsyncHttpClient.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ class AsyncHttpClient {
108108
loop_thread.start(true);
109109
}
110110
~AsyncHttpClient() {
111-
loop_thread.stop(true);
111+
// NOTE: ~EventLoopThread will stop and join
112+
// loop_thread.stop(true);
112113
}
113114

114115
// thread-safe

http/server/HttpContext.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ struct HV_EXPORT HttpContext {
8383
return request->GetForm();
8484
}
8585
std::string form(const char* name, const std::string& defvalue = "") {
86-
return request->GetFormData(name);
86+
return request->GetFormData(name, defvalue);
8787
}
8888

8989
// Content-Type: application/x-www-form-urlencoded
9090
const hv::KeyValue& urlencoded() {
9191
return request->GetUrlEncoded();
9292
}
9393
std::string urlencoded(const char* key, const std::string& defvalue = "") {
94-
return request->GetUrlEncoded(key);
94+
return request->GetUrlEncoded(key, defvalue);
9595
}
9696

9797
// T=[bool, int, int64_t, float, double]

0 commit comments

Comments
 (0)