Merge pull request #1878 from dreamwind1985/master

修复xquic module可能出现的连接泄漏
alibaba · Oct 26, 2023 · 6c513e5 · 6c513e5
2 parents 978e87f + a44544e
commit 6c513e5
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/modules/ngx_http_xquic_module/ngx_http_xquic_filter_module.c b/modules/ngx_http_xquic_module/ngx_http_xquic_filter_module.c
@@ -72,7 +72,8 @@ ngx_http_xquic_stream_send_header(ngx_http_v3_stream_t *qstream)
                         &(qstream->resp_headers), header_only);
     if (ret < 0) {
         ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0,
-                    "|xquic|xqc_h3_request_send_headers error %z|", ret);
+                    "|xquic|xqc_h3_request_send_headers error|ret=%z|", ret);
+        qstream->queued--;
         return NGX_ERROR;
     } else {
         ngx_log_error(NGX_LOG_DEBUG, ngx_cycle->log, 0,
@@ -729,7 +730,9 @@ ngx_http_xquic_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
                     goto RETURN_EAGAIN;
 
                 } else if (n < 0) {
-
+                    ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                            "|xquic|ngx_http_xquic_send_chain|send body fin error|");
+                    r->xqstream->queued--;
                     goto RETURN_ERROR;
                 }
 
@@ -778,6 +781,10 @@ ngx_http_xquic_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
         if (n < 0) {
             if (n == NGX_AGAIN) {
                 h3_stream->wait_to_write = 1;
+            } else {
+                ngx_log_error(NGX_LOG_DEBUG, r->connection->log, 0,
+                        "|xquic|ngx_http_xquic_send_chain|send body error, body_sent %ui, size %O, n=%z|last=%i|",
+                        r->xqstream->body_sent, size, n, last_out->buf->last_buf);
             }
 
             break;