Bug#1102673: haproxy: diff for NMU version 3.0.10-0.1 (3/3)
From
Adrian Bunk@21:1/5 to
All on Wed Apr 23 21:10:01 2025
[continued from previous message]
- if (urg) {
- LIST_DEL_INIT(&qcs->el_send);
- LIST_INSERT(&qcc->send_list, &qcs->el_send);
- }
- else {
- if (!LIST_INLIST(&qcs->el_send))
- LIST_APPEND(&qcs->qcc->send_list, &qcs->el_send);
- }
+ _qcc_send_stream(qcs, urg);
if (count) {
qfctl_sinc(&qcc->tx.fc, count);
@@ -1234,7 +1245,7 @@
TRACE_STATE("abort stream read", QMUX_EV_QCS_END, qcc->conn, qcs);
qcs->flags |= (QC_SF_TO_STOP_SENDING|QC_SF_READ_ABORTED);
- qcc_send_stream(qcs, 1, 0);
+ _qcc_send_stream(qcs, 1);
tasklet_wakeup(qcc->wait_event.tasklet);
end:
diff -Nru haproxy-3.0.9/src/peers.c haproxy-3.0.10/src/peers.c
--- haproxy-3.0.9/src/peers.c 2025-03-20 15:27:37.000000000 +0200
+++ haproxy-3.0.10/src/peers.c 2025-04-22 14:53:02.000000000 +0300
@@ -1740,6 +1740,11 @@
memcpy(&expire, *msg_cur, expire_sz);
*msg_cur += expire_sz;
expire = ntohl(expire);
+ /* Protocol contains expire in MS, check if value is less than table config */
+ if (expire > table->expire)
+ expire = table->expire;
+ /* the rest of the code considers expire as ticks and not MS */ + expire = MS_TO_TICKS(expire);
}
newts = stksess_new(table, NULL);
diff -Nru haproxy-3.0.9/src/proto_rhttp.c haproxy-3.0.10/src/proto_rhttp.c
--- haproxy-3.0.9/src/proto_rhttp.c 2025-03-20 15:27:37.000000000 +0200
+++ haproxy-3.0.10/src/proto_rhttp.c 2025-04-22 14:53:02.000000000 +0300
@@ -287,7 +287,7 @@
l->rx.rhttp.pend_conn = conn;
/* On success task will be woken up by H2 mux after reversal. */
- l->rx.rhttp.task->expire = conn ?
+ l->rx.rhttp.task->expire = conn && tick_isset(srv->proxy->timeout.connect) ?
tick_