From 034a9561a62e2f8025713e30d1e913256512ffb9 Mon Sep 17 00:00:00 2001
From: Lammert Bies <github@linocomm.net>
Date: Sun, 11 Dec 2016 18:12:20 +0100
Subject: [PATCH] Moved should_keep_alive to own file

---
 Makefile                        |  1 +
 src/httplib_should_keep_alive.c | 50 +++++++++++++++++++++++++++++++++
 src/libhttp.c                   | 22 ---------------
 3 files changed, 51 insertions(+), 22 deletions(-)
 create mode 100644 src/httplib_should_keep_alive.c

diff --git a/Makefile b/Makefile
index 46048df9..7196ff4e 100644
--- a/Makefile
+++ b/Makefile
@@ -187,6 +187,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_set_uid_option.c				\
 		src/httplib_set_user_connection_data.c			\
 		src/httplib_set_websocket_handler.c			\
+		src/httplib_should_keep_alive.c				\
 		src/httplib_skip.c					\
 		src/httplib_skip_quoted.c				\
 		src/httplib_snprintf.c					\
diff --git a/src/httplib_should_keep_alive.c b/src/httplib_should_keep_alive.c
new file mode 100644
index 00000000..da1d1216
--- /dev/null
+++ b/src/httplib_should_keep_alive.c
@@ -0,0 +1,50 @@
+/* 
+ * Copyright (c) 2016 Lammert Bies
+ * Copyright (c) 2013-2016 the Civetweb developers
+ * Copyright (c) 2004-2013 Sergey Lyubka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+
+#include "libhttp-private.h"
+
+
+
+/* HTTP 1.1 assumes keep alive if "Connection:" header is not set
+ * This function must tolerate situations when connection info is not
+ * set up, for example if request parsing failed. */
+int XX_httplib_should_keep_alive( const struct mg_connection *conn ) {
+
+	if (conn != NULL) {
+		const char *http_version = conn->request_info.http_version;
+		const char *header = mg_get_header(conn, "Connection");
+		if (conn->must_close || conn->internal_error || conn->status_code == 401
+		    || mg_strcasecmp(conn->ctx->config[ENABLE_KEEP_ALIVE], "yes") != 0
+		    || (header != NULL && !XX_httplib_header_has_option(header, "keep-alive"))
+		    || (header == NULL && http_version
+		        && 0 != strcmp(http_version, "1.1"))) {
+			return 0;
+		}
+		return 1;
+	}
+	return 0;
+
+}  /* XX_httplib_should_keep_alive */
diff --git a/src/libhttp.c b/src/libhttp.c
index 059745bd..5068710b 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -828,28 +828,6 @@ void XX_httplib_set_thread_name(const char *threadName) {
 
 
 
-/* HTTP 1.1 assumes keep alive if "Connection:" header is not set
- * This function must tolerate situations when connection info is not
- * set up, for example if request parsing failed. */
-int XX_httplib_should_keep_alive( const struct mg_connection *conn ) {
-
-	if (conn != NULL) {
-		const char *http_version = conn->request_info.http_version;
-		const char *header = mg_get_header(conn, "Connection");
-		if (conn->must_close || conn->internal_error || conn->status_code == 401
-		    || mg_strcasecmp(conn->ctx->config[ENABLE_KEEP_ALIVE], "yes") != 0
-		    || (header != NULL && !XX_httplib_header_has_option(header, "keep-alive"))
-		    || (header == NULL && http_version
-		        && 0 != strcmp(http_version, "1.1"))) {
-			return 0;
-		}
-		return 1;
-	}
-	return 0;
-
-}  /* XX_httplib_should_keep_alive */
-
-
 int XX_httplib_should_decode_url( const struct mg_connection *conn ) {
 
 	if ( conn == NULL  ||  conn->ctx == NULL ) return 0;