From d4f7dd744f177e7c29abfe900127257453853709 Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 15:26:08 +0100 Subject: [PATCH] Moved get_request_info to own file --- Makefile | 1 + src/httplib_get_request_info.c | 37 ++++++++++++++++++++++++++++++++++ src/libhttp.c | 9 --------- 3 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 src/httplib_get_request_info.c diff --git a/Makefile b/Makefile index 982d2442..65a14aec 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,7 @@ LIB_SOURCES = src/libhttp.c \ src/httplib_get_rel_url_at_current_server.c \ src/httplib_get_remote_ip.c \ src/httplib_get_request_handler.c \ + src/httplib_get_request_info.c \ src/httplib_get_request_len.c \ src/httplib_get_response.c \ src/httplib_get_response_code_text.c \ diff --git a/src/httplib_get_request_info.c b/src/httplib_get_request_info.c new file mode 100644 index 00000000..aa93b280 --- /dev/null +++ b/src/httplib_get_request_info.c @@ -0,0 +1,37 @@ +/* + * 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" + + + +const struct mg_request_info *mg_get_request_info( const struct mg_connection *conn ) { + + if ( conn == NULL ) return NULL; + + return & conn->request_info; + +} /* mg_get_request_info */ diff --git a/src/libhttp.c b/src/libhttp.c index b581d3a5..944c133a 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -828,15 +828,6 @@ void XX_httplib_set_thread_name(const char *threadName) { -const struct mg_request_info * mg_get_request_info( const struct mg_connection *conn ) { - - if ( conn == NULL ) return NULL; - - return & conn->request_info; - -} /* mg_get_request_info */ - - /* Skip the characters until one of the delimiters characters found. * 0-terminate resulting word. Skip the delimiter and following whitespaces. * Advance pointer to buffer to the next word. Return found 0-terminated word.