From b0f31c97841ba2f449c91bde4fa9402cf99ea7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 31 Oct 2016 07:57:11 +0000 Subject: [PATCH] Allow rules on proxy_port without proxy_addr #712 --- lib/Query_Processor.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/Query_Processor.cpp b/lib/Query_Processor.cpp index c27f9f7f7..b523c4c63 100644 --- a/lib/Query_Processor.cpp +++ b/lib/Query_Processor.cpp @@ -718,19 +718,21 @@ __internal_loop: } } - // match on proxy_addr & proxy_port + // match on proxy_addr if (qr->proxy_addr && strlen(qr->proxy_addr)) { if (sess->client_myds->proxy_addr.addr) { if (strcmp(qr->proxy_addr,sess->client_myds->proxy_addr.addr)!=0) { proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "query rule %d has no matching proxy_addr\n", qr->rule_id); continue; } - if (qr->proxy_port>=0) { - if (qr->proxy_port!=sess->client_myds->proxy_addr.port) { - proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "query rule %d has no matching proxy_port\n", qr->rule_id); - continue; - } - } + } + } + + // match on proxy_port + if (qr->proxy_port>=0) { + if (qr->proxy_port!=sess->client_myds->proxy_addr.port) { + proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "query rule %d has no matching proxy_port\n", qr->rule_id); + continue; } }