From: Mathieu Fenniak <biziqe@mathieu.fenniak.net>
Date: Fri, 7 Dec 2012 02:15:41 +0000 (-0700)
Subject: Fix cancellation of of waiting clients
X-Git-Tag: pgbouncer_1_6_rc1~48^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40e59a86523d9477f2d40e58ccde8cdad9832efd;p=pgbouncer

Fix cancellation of of waiting clients

Search waiting_client_list for client to-be-cancelled, in addition
to active_client_list.
---

diff --git a/src/objects.c b/src/objects.c
index b61387f..aa4a93c 100644
--- a/src/objects.c
+++ b/src/objects.c
@@ -1076,6 +1076,13 @@ void accept_cancel_request(PgSocket *req)
 				goto found;
 			}
 		}
+		statlist_for_each(citem, &pool->waiting_client_list) {
+			client = container_of(citem, PgSocket, head);
+			if (memcmp(client->cancel_key, req->cancel_key, 8) == 0) {
+				main_client = client;
+				goto found;
+			}
+		}
 	}
 found: