UPD | resolve tcp/tls close_connection

Author: xiadnoring

package/DEBIAN/changelog

@@ -1,3 +1,3 @@
-manapihttp (1.0.3+dfsg-1) unstable; urgency=high
+manapihttp (1.0.4+dfsg-1) unstable; urgency=high
   * Bug fixes
- -- Timur Zajnullin <me@timurtuty.ru>  Wed, 15 Nov 2025 12:05:00 +0000
+ -- Timur Zajnullin <me@timurtuty.ru>  Wed, 8 Dec 2025 10:00:00 +0000

package/DEBIAN/control

@@ -1,6 +1,6 @@
 Package: manapihttp
 Provides: manapihttp
-Version: 1.0.3
+Version: 1.0.4
 Section: libs
 Installed-Size:
 Maintainer: Xiadnoring <me@timurtuty.ru>

src/worker/ManapiTcp.cpp

@@ -388,9 +388,12 @@ void manapi::net::worker::TCP::close_connection(shared_conn conn, int flags) MAN
 
     auto connection = conn->as<tcp_connection_t>();
 
+    if (flags & CLOSE_CONN_EOR || flags & CLOSE_CONN_EOS) {
+        conn->wrk.flags |= WRK_INTERFACE_IS_DRAINING;
+    }
+
     /* Draining timeout is enabled, thus, connection is draining */
     if ((flags & CLOSE_CONN_EOR)) {
-        conn->wrk.flags |= WRK_INTERFACE_IS_DRAINING;
         connection->flags |= CONN_RECV_END;
 
         if (connection->flags == CLOSE_CONN_EOR) {
@@ -400,10 +403,13 @@ void manapi::net::worker::TCP::close_connection(shared_conn conn, int flags) MAN
         }
     }
 
-    if (flags & CLOSE_CONN_FINISHED) {
+    if (flags & (CLOSE_CONN_FINISHED|CLOSE_CONN_SHUTDOWN) && !(flags & (CLOSE_CONN_EOS|CLOSE_CONN_ERR))) {
         connection->flags |= CONN_RECV_END;
         connection->flags |= CONN_SEND_END;
 
+        manapi_log_trace(manapi::debug::LOG_TRACE_LOW, "tcp:closing the connection %p with CLOSE_CONN_FINISHED "
+            "top->cur_send_size=%d top->send_size=%d", conn.get(), connection->top->cur_send_size, connection->top->send_size);
+
         if (connection->top->cur_send_size != connection->top->send_size) {
             // wait
             return;

src/worker/ManapiTlsOverTcp.cpp

@@ -54,8 +54,8 @@ void manapi::net::worker::TLS::close_connection(shared_conn conn, int flags) MAN
     if (!conn)
         return;
 
-    this->waiting(conn, true);
     auto const connection = conn->as<tls_connection_t>();
+    bool keep_alive_disabled;
 
     if (connection->flags & CONN_REMOVED)
         return;
@@ -69,23 +69,33 @@ void manapi::net::worker::TLS::close_connection(shared_conn conn, int flags) MAN
         return;
     }
 
+    /* Draining timeout is enabled, thus, connection is draining */
+    if (flags & CLOSE_CONN_EOR || flags & CLOSE_CONN_EOS) {
+        conn->wrk.flags |= WRK_INTERFACE_IS_DRAINING;
+    }
+
+    if ((flags & CLOSE_CONN_EOR)) {
+        connection->flags |= CONN_RECV_END;
+
+        if (connection->flags == CLOSE_CONN_EOR) {
+            if (!connection->t && !(connection->flags & CONN_READ)) {
+                return;
+            }
+        }
+    }
+
+    this->waiting(conn, true);
     connection->flags |= CONN_TLS_SHUTDOWN;
 
-    if (!this->config_->force_conn_shutdown
-        && (
-            (flags & (CLOSE_CONN_SHUTDOWN|CLOSE_CONN_ERR))
-            || (!flags
-                && (!this->config_->keep_alive
-                    || !(conn->wrk.flags & WRK_INTERFACE_TCP_KEEP_ALIVE)
-                    )
-                ))) {
+    keep_alive_disabled = (!this->config_->keep_alive || !(conn->wrk.flags & WRK_INTERFACE_TCP_KEEP_ALIVE));
+    if (!this->config_->force_conn_shutdown && ((flags & (CLOSE_CONN_SHUTDOWN|CLOSE_CONN_ERR)) || (!flags && keep_alive_disabled))) {
 
         if (conn->wrk.flags & WRK_INTERFACE_TCP_KEEP_ALIVE)
             conn->wrk.flags ^= WRK_INTERFACE_TCP_KEEP_ALIVE;
 
         if (connection->ev_callback) {
             auto cb = std::move(connection->ev_callback);
-            if (this->call_user_callback(&cb, conn, ev::DISCONNECT, nullptr, 0, nullptr)) {
+            if (manapi::net::worker::TLS::call_user_callback(&cb, conn, ev::DISCONNECT, nullptr, 0, nullptr)) {
                 /* skip */
             }
         }
@@ -99,10 +109,13 @@ void manapi::net::worker::TLS::close_connection(shared_conn conn, int flags) MAN
 
     eof:
     if (flags & (CLOSE_CONN_EOR|CLOSE_CONN_EOS)) {
+        manapi_log_trace(manapi::debug::LOG_TRACE_LOW, "TLS:conn %p was destroyed "
+                "CLOSE_CONN_EOR=%d CLOSE_CONN_EOS=%d", conn.get(),
+            CLOSE_CONN_EOR & flags, CLOSE_CONN_EOS & flags);
         this->ssl_set_shutdown_(connection->ssl,
             this->ssl_recv_shutdown_|this->ssl_send_shutdown_);
         /* connection is destroyed */
-        flags |= CLOSE_CONN_FINISHED;
+        flags |= CLOSE_CONN_SHUTDOWN;
     }
     //
     // if (connection->accept_timer) {

utils/cmake-ubuntu22.04-dbg.sh

@@ -34,7 +34,7 @@ fi
 ROOT=$(pwd)
 
 # 2) configure
-cmake -B build-dbg -DCMAKE_BUILD_TYPE=Debug -DMANAPIHTTP_GRPC_DEPENDENCY=OFF -DMANAPIHTTP_DISABLE_TRACE_HARD=ON \
+cmake -B build-dbg -DCMAKE_BUILD_TYPE=Debug -DMANAPIHTTP_GRPC_DEPENDENCY=OFF -DMANAPIHTTP_DISABLE_TRACE_HARD=OFF \
       -DMANAPIHTTP_BUILD_TYPE=lib -DMANAPIHTTP_JSON_DEBUG=ON -DMANAPIHTTP_NGHTTP2_DEPENDENCY=ON -DMANAPIHTTP_NGHTTP3_DEPENDENCY=OFF \
       -DMANAPIHTTP_OPENSSL_DEPENDENCY=ON -DMANAPIHTTP_WOFLSSL_DEPENDENCY=OFF -DMANAPIHTTP_BROTLI_DEPENDENCY=ON -DMANAPIHTTP_ZSTD_DEPENDENCY=ON \
       -DMANAPIHTTP_ZLIB_DEPENDENCY=ON -DBUILD_SHARED_LIBS=ON -DMANAPIHTTP_STD_BACKTRACE_DEPENDENCY=OFF -DCMAKE_INSTALL_PREFIX=$(pwd)/package/usr \