v1.2.3

ithewei · Nov 25, 2021 · 3993a6a · 3993a6a
1 parent 57e0211
commit 3993a6a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.6)
 
-project(hv VERSION 1.2.2)
+project(hv VERSION 1.2.3)
 
 option(BUILD_SHARED "build shared library" ON)
 option(BUILD_STATIC "build static library" ON)

diff --git a/base/hversion.h b/base/hversion.h
@@ -8,7 +8,7 @@ BEGIN_EXTERN_C
 
 #define HV_VERSION_MAJOR    1
 #define HV_VERSION_MINOR    2
-#define HV_VERSION_PATCH    2
+#define HV_VERSION_PATCH    3
 
 #define HV_VERSION_STRING   STRINGIFY(HV_VERSION_MAJOR) "." \
                             STRINGIFY(HV_VERSION_MINOR) "." \

diff --git a/event/hevent.c b/event/hevent.c
@@ -717,8 +717,9 @@ int hio_write_kcp(hio_t* io, const void* buf, size_t len) {
     // printf("ikcp_send len=%d nsend=%d\n", (int)len, nsend);
     if (nsend < 0) {
         hio_close(io);
+    } else {
+        ikcp_update(kcp->ikcp, (IUINT32)io->loop->cur_hrtime / 1000);
     }
-    ikcp_update(kcp->ikcp, (IUINT32)io->loop->cur_hrtime / 1000);
     return nsend;
 }
 

diff --git a/http/client/AsyncHttpClient.h b/http/client/AsyncHttpClient.h
@@ -108,7 +108,8 @@ class AsyncHttpClient {
         loop_thread.start(true);
     }
     ~AsyncHttpClient() {
-        loop_thread.stop(true);
+        // NOTE: ~EventLoopThread will stop and join
+        // loop_thread.stop(true);
     }
 
     // thread-safe

diff --git a/http/server/HttpContext.h b/http/server/HttpContext.h
@@ -83,15 +83,15 @@ struct HV_EXPORT HttpContext {
         return request->GetForm();
     }
     std::string form(const char* name, const std::string& defvalue = "") {
-        return request->GetFormData(name);
+        return request->GetFormData(name, defvalue);
     }
 
     // Content-Type: application/x-www-form-urlencoded
     const hv::KeyValue& urlencoded() {
         return request->GetUrlEncoded();
     }
     std::string urlencoded(const char* key, const std::string& defvalue = "") {
-        return request->GetUrlEncoded(key);
+        return request->GetUrlEncoded(key, defvalue);
     }
 
     // T=[bool, int, int64_t, float, double]