lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2026-01-27 08:02:47 +03:00
Code Activity

Moved should_keep_alive to own file

Browse Source
This commit is contained in:
Lammert Bies
2016-12-11 18:12:20 +01:00
parent 0125e84b18
commit 034a9561a6
3 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -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 \

50
src/httplib_should_keep_alive.c Normal file
View File

@@ -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 */

22
src/libhttp.c
View File

@@ -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;