diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 849b494..2fa0d59 100644
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -80,9 +80,9 @@
 #define TX_CACHE_COOK	0x00002000	/* a cookie in the response is cacheable */
 #define TX_CACHE_SHIFT	12		/* bit shift */
 
-/* client and server keep-alive capability */
-#define TX_CLI_CONN_KA	0x00004000	/* the client-side connection is still keep-alive capable */
-#define TX_SRV_CONN_KA	0x00008000	/* the server-side connection is still keep-alive capable */
+/* request and response HTTP version */
+#define TX_REQ_VER_11	0x00004000	/* the request is HTTP/1.1 or above */
+#define TX_RES_VER_11	0x00008000	/* the response is HTTP/1.1 or above */
 
 /* report presence of transfer-encoding:chunked and content-length headers */
 #define TX_REQ_CNT_LEN	0x00010000	/* content-length present in the request */
@@ -90,6 +90,23 @@
 #define TX_RES_CNT_LEN	0x00040000	/* content-length present in the response */
 #define TX_RES_TE_CHNK	0x00080000	/* transfer-encoding: chunked present in the response */
 
+/* indicate how we *want* the connection to behave, regardless of what is in
+ * the headers. We have 4 possible values right now :
+ * - WANT_TUN : will be a tunnel (default when nothing configured or with CONNECT).
+ * - WANT_KAL : try to maintain keep-alive
+ * - WANT_SCL : enforce close on the server side
+ * - WANT_CLO : enforce close on both sides
+ */
+#define TX_CON_WANT_TUN 0x00000000	/* note: it's important that it is 0 (init) */
+#define TX_CON_WANT_KAL 0x00100000
+#define TX_CON_WANT_SCL 0x00200000
+#define TX_CON_WANT_CLO 0x00300000
+#define TX_CON_WANT_MSK 0x00300000	/* this is the mask to get the bits */
+
+#define TX_CON_HDR_PARS	0x00400000	/* "connection" header already parsed (req or res) */
+#define TX_REQ_CONN_CLO	0x00800000	/* request asks for "Connection: close" mode */
+
+
 /* The HTTP parser is more complex than it looks like, because we have to
  * support multi-line headers and any number of spaces between the colon and
  * the value.
diff --git a/include/types/session.h b/include/types/session.h
index 64ba186..1af52ce 100644
--- a/include/types/session.h
+++ b/include/types/session.h
@@ -1,23 +1,23 @@
 /*
-  include/types/session.h
-  This file defines everything related to sessions.
-
-  Copyright (C) 2000-2008 Willy Tarreau - w@1wt.eu
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1
-  exclusively.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * include/types/session.h
+ * This file defines everything related to sessions.
+ *
+ * Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #ifndef _TYPES_SESSION_H
 #define _TYPES_SESSION_H
@@ -45,7 +45,8 @@
 #define SN_ASSIGNED	0x00000002	/* no need to assign a server to this session */
 #define SN_ADDR_SET	0x00000004	/* this session's server address has been set */
 #define SN_BE_ASSIGNED	0x00000008	/* a backend was assigned. Conns are accounted. */
-#define SN_CONN_CLOSED	0x00000010	/* "Connection: close" was present or added */
+
+/* unused:              0x00000010 */
 #define SN_MONITOR	0x00000020	/* this session comes from a monitoring system */
 #define SN_CURR_SESS	0x00000040	/* a connection is currently being counted on the server */
 #define SN_FRT_ADDR_SET	0x00000080	/* set if the frontend address has been filled */