forked from pool/haproxy
Marcus Rueckert
55e4255fc5
0001-BUG-MAJOR-fix-listening-IP-address-storage-for-front.patch 0002-BUG-MINOR-fix-listening-IP-address-storage-for-front.patch 0003-DOC-Fix-typo-so-fetch-is-properly-parsed-by-Cyril-s-.patch 0004-BUG-MAJOR-http-fix-breakage-of-reqdeny-causing-rando.patch 0005-BUG-MEDIUM-stick-tables-fix-breakage-in-table-conver.patch 0006-BUG-MEDIUM-dns-unbreak-DNS-resolver-after-header-fix.patch 0007-BUILD-fix-build-on-Solaris-11.patch 0008-CLEANUP-connection-fix-double-negation-on-memcmp.patch 0009-BUG-MEDIUM-stats-show-servers-state-may-show-an-serv.patch 0010-BUG-MEDIUM-fix-risk-of-segfault-with-show-tls-keys.patch 0011-BUG-MEDIUM-sticktables-segfault-in-some-configuratio.patch 0012-BUG-MEDIUM-lua-converters-doesn-t-work.patch 0013-BUG-MINOR-http-add-header-header-name-copied-twice.patch 0014-BUG-MEDIUM-http-add-header-buffer-overwritten.patch OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=129
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From c4809151b4c9ccc312cb451e99fd556e867242fc Mon Sep 17 00:00:00 2001
|
|
From: David CARLIER <devnexen@gmail.com>
|
|
Date: Thu, 24 Mar 2016 09:22:36 +0000
|
|
Subject: [PATCH 08/14] CLEANUP: connection: fix double negation on memcmp()
|
|
|
|
Nothing harmful in here, just clarify that it applies to the whole
|
|
expression.
|
|
|
|
(cherry picked from commit 42ff05e2d3d10e8a1e070e66e8883c5eabe196d7)
|
|
---
|
|
src/connection.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/connection.c b/src/connection.c
|
|
index 991cae3..5515188 100644
|
|
--- a/src/connection.c
|
|
+++ b/src/connection.c
|
|
@@ -385,7 +385,7 @@ int conn_recv_proxy(struct connection *conn, int flag)
|
|
if (trash.len < 9) /* shortest possible line */
|
|
goto missing;
|
|
|
|
- if (!memcmp(line, "TCP4 ", 5) != 0) {
|
|
+ if (memcmp(line, "TCP4 ", 5) == 0) {
|
|
u32 src3, dst3, sport, dport;
|
|
|
|
line += 5;
|
|
@@ -426,7 +426,7 @@ int conn_recv_proxy(struct connection *conn, int flag)
|
|
((struct sockaddr_in *)&conn->addr.to)->sin_port = htons(dport);
|
|
conn->flags |= CO_FL_ADDR_FROM_SET | CO_FL_ADDR_TO_SET;
|
|
}
|
|
- else if (!memcmp(line, "TCP6 ", 5) != 0) {
|
|
+ else if (memcmp(line, "TCP6 ", 5) == 0) {
|
|
u32 sport, dport;
|
|
char *src_s;
|
|
char *dst_s, *sport_s, *dport_s;
|
|
--
|
|
2.6.6
|
|
|