From: Godbach Date: Wed, 10 Dec 2014 02:21:30 +0000 (+0800) Subject: DOC: fix a few typos X-Git-Tag: v1.6-dev1~247 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2dd68d0e047cdd433d698f044bb2d327886fc66;p=thirdparty%2Fhaproxy.git DOC: fix a few typos 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 --- diff --git a/include/types/proto_http.h b/include/types/proto_http.h index 95bf59d6d4..2654b78b01 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 4847defd1f..1cabb8314f 100644 --- a/include/types/server.h +++ b/include/types/server.h @@ -43,7 +43,7 @@ #include -/* 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 e2221603eb..70ddaa7d10 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);