From 97f8ecdb68e5343c51c5852d0486c96068efda2a Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 15:32:06 +0100 Subject: [PATCH] Moved get_header to own file --- Makefile | 1 + src/httplib_get_header.c | 52 ++++++++++++++++++++++++++++++++++++++++ src/libhttp.c | 24 ------------------- 3 files changed, 53 insertions(+), 24 deletions(-) create mode 100644 src/httplib_get_header.c diff --git a/Makefile b/Makefile index 9b2e1801..007d2552 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,7 @@ LIB_SOURCES = src/libhttp.c \ src/httplib_get_context.c \ src/httplib_get_cookie.c \ src/httplib_get_first_ssl_listener_index.c \ + src/httplib_get_header.c \ src/httplib_get_mime_type.c \ src/httplib_get_option.c \ src/httplib_get_option_index.c \ diff --git a/src/httplib_get_header.c b/src/httplib_get_header.c new file mode 100644 index 00000000..632203c3 --- /dev/null +++ b/src/httplib_get_header.c @@ -0,0 +1,52 @@ +/* + * 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" + + + +/* Return HTTP header value, or NULL if not found. */ +const char *XX_httplib_get_header( const struct mg_request_info *ri, const char *name ) { + + int i; + if (ri) { + for (i = 0; i < ri->num_headers; i++) { + if (!mg_strcasecmp(name, ri->http_headers[i].name)) return ri->http_headers[i].value; + } + } + + return NULL; + +} /* XX_httplib_get_header */ + + +const char *mg_get_header( const struct mg_connection *conn, const char *name ) { + + if ( conn == NULL ) return NULL; + + return XX_httplib_get_header( & conn->request_info, name ); + +} /* mg_get_header */ diff --git a/src/libhttp.c b/src/libhttp.c index 91646a71..7c80afdb 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -828,30 +828,6 @@ void XX_httplib_set_thread_name(const char *threadName) { -/* Return HTTP header value, or NULL if not found. */ -const char * XX_httplib_get_header( const struct mg_request_info *ri, const char *name ) { - - int i; - if (ri) { - for (i = 0; i < ri->num_headers; i++) { - if (!mg_strcasecmp(name, ri->http_headers[i].name)) return ri->http_headers[i].value; - } - } - - return NULL; - -} /* XX_httplib_get_header */ - - -const char *mg_get_header( const struct mg_connection *conn, const char *name ) { - - if ( conn == NULL ) return NULL; - - return XX_httplib_get_header( & conn->request_info, name ); - -} /* mg_get_header */ - - /* A helper function for traversing a comma separated list of values. * It returns a list pointer shifted to the next value, or NULL if the end * of the list found.