MAJOR: connections: Detach connections from streams.
Do not destroy the connection when we're about to destroy a stream. This
prevents us from doing keepalive on server connections when the client is
using HTTP/2, as a new stream is created for each request.
Instead, the session is now responsible for destroying connections.
When reusing connections, the attach() mux method is now used to create a new
conn_stream.
diff --git a/include/proto/connection.h b/include/proto/connection.h
index ade6994..611e6ad 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -673,10 +673,12 @@
LIST_INIT(&sess->conn_list);
}
conn_force_unsubscribe(conn);
+ LIST_DEL(&conn->list);
+ LIST_INIT(&conn->list);
pool_free(pool_head_connection, conn);
}
-/* Release a conn_stream, and kill the connection if it was the last one */
+/* Release a conn_stream */
static inline void cs_destroy(struct conn_stream *cs)
{
if (cs->conn->mux)
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index 90e3956..3d2a6db 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -45,7 +45,6 @@
extern struct si_ops si_conn_ops;
extern struct si_ops si_applet_ops;
extern struct data_cb si_conn_cb;
-extern struct data_cb si_idle_conn_cb;
struct appctx *stream_int_register_handler(struct stream_interface *si, struct applet *app);
void si_applet_wake_cb(struct stream_interface *si);
@@ -182,24 +181,6 @@
si_detach_endpoint(si);
}
-/* Turn an existing connection endpoint of stream interface <si> to idle mode,
- * which means that the connection will be polled for incoming events and might
- * be killed by the underlying I/O handler. If <pool> is not null, the
- * connection will also be added at the head of this list. This connection
- * remains assigned to the stream interface it is currently attached to.
- */
-static inline void si_idle_cs(struct stream_interface *si, struct list *pool)
-{
- struct conn_stream *cs = __objt_cs(si->end);
- struct connection *conn = cs->conn;
-
- conn_force_unsubscribe(conn);
- if (pool)
- LIST_ADD(pool, &conn->list);
-
- cs_attach(cs, si, &si_idle_conn_cb);
-}
-
/* Attach conn_stream <cs> to the stream interface <si>. The stream interface
* is configured to work with a connection and the connection it configured
* with a stream interface data layer.