Merge branch 'tcpsplice'
diff --git a/Makefile b/Makefile
index d53526e..48f4775 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@
ifneq ($(VERSION),)
# OK git is there and works.
SUBVERS := $(shell comms=$$(git-log --no-merges v$(VERSION).. 2>/dev/null |grep -c ^commit ); [ $$comms -gt 0 ] && echo "-$$comms" )
-VERDATE := $(shell date +%Y/%m/%d -d "$$(git-log HEAD^.. 2>/dev/null | grep ^Date: | cut -f2- -d: | cut -f1 -d+)" )
+VERDATE := $(shell date +%Y/%m/%d -d "$$(git-log HEAD^.. 2>/dev/null | grep -m 1 ^Date: | cut -f2- -d: | cut -f1 -d+)" )
else
# Otherwise, use the hard-coded version of last tag, number of changes
# since last tag, and release date.
diff --git a/src/proto_http.c b/src/proto_http.c
index bdc3105..b5f974a 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3154,7 +3154,7 @@
/* errors : request, connect, response */
"<td align=right></td><td align=right>%d</td><td align=right>%d</td>\n"
"",
- (sv->state & SRV_BACKUP) ? "active" : "backup",
+ (sv->state & SRV_BACKUP) ? "backup" : "active",
sv_state, sv->id,
sv->nbpend, sv->nbpend_max,
sv->cur_sess, sv->cur_sess_max, sv->maxconn ? ultoa(sv->maxconn) : "-", sv->cum_sess,