Hi Willy,
There are some typos in latest snapshot in 1.6-dev0. Attached is the patch.
There total files are modified as below:
include/types/proto_http.h: hwen -> when
include/types/server.h: SRV_ST_DOWN -> SRV_ST_STOPPED
src/backend.c: prefer-current-server -> prefer-last-server
Please see the patch for detailed information. In addition, this patch
should be backported to 1.5 if necessary.
--
Best Regards,
Godbach
From 73f3617908e1da775f10a2116394a1654d150d0f Mon Sep 17 00:00:00 2001
From: Godbach <nylzhao...@gmail.com>
Date: Wed, 10 Dec 2014 10:21:30 +0800
Subject: [PATCH] DOC: fix typo
include/types/proto_http.h: hwen -> when
include/types/server.h: SRV_ST_DOWN -> SRV_ST_STOPPED
src/backend.c: prefer-current-server -> prefer-last-server
Signed-off-by: Godbach <nylzhao...@gmail.com>
---
include/types/proto_http.h | 2 +-
include/types/server.h | 2 +-
src/backend.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 95bf59d..2654b78 100644
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -71,7 +71,7 @@
/* indicate how we *want* the connection to behave, regardless of what is in
* the headers. We have 4 possible values right now :
- * - WANT_KAL : try to maintain keep-alive (default hwen nothing configured)
+ * - WANT_KAL : try to maintain keep-alive (default when nothing configured)
* - WANT_TUN : will be a tunnel (CONNECT).
* - WANT_SCL : enforce close on the server side
* - WANT_CLO : enforce close on both sides
diff --git a/include/types/server.h b/include/types/server.h
index 4847def..1cabb83 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -43,7 +43,7 @@
#include <types/checks.h>
-/* server states. Only SRV_ST_DOWN indicates a down server. */
+/* server states. Only SRV_ST_STOPPED indicates a down server. */
enum srv_state {
SRV_ST_STOPPED = 0, /* the server is down. Please keep set
to zero. */
SRV_ST_STARTING, /* the server is warming up (up but
throttled) */
diff --git a/src/backend.c b/src/backend.c
index e222160..70ddaa7 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -553,7 +553,7 @@ int assign_server(struct session *s)
(__objt_server(conn->target)->nbpend + 1) <
s->be->max_ka_queue))) &&
srv_is_usable(__objt_server(conn->target))) {
/* This session was relying on a server in a previous request
- * and the proxy has "option prefer-current-server" set, so
+ * and the proxy has "option prefer-last-server" set, so
* let's try to reuse the same server.
*/
srv = __objt_server(conn->target);
--
1.7.11.7
