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 is_file_in_memory to own file

Browse Source
This commit is contained in:
Lammert Bies
2016-12-11 14:29:39 +01:00
parent 93a3048ea5
commit 90253a475f
3 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -97,6 +97,7 @@ LIB_SOURCES = src/libhttp.c \
src/httplib_initialize_ssl.c \
src/httplib_interpret_uri.c \
src/httplib_is_authorized_for_put.c \
src/httplib_is_file_in_memory.c \
src/httplib_is_not_modified.c \
src/httplib_is_put_or_delete_method.c \
src/httplib_is_valid_http_method.c \

48
src/httplib_is_file_in_memory.c Normal file
View File

@@ -0,0 +1,48 @@
/*
* 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"
int XX_httplib_is_file_in_memory( const struct mg_connection *conn, const char *path, struct file *filep ) {
size_t size = 0;
if (!conn || !filep) return 0;
if (conn->ctx->callbacks.open_file) {
filep->membuf = conn->ctx->callbacks.open_file(conn, path, &size);
if (filep->membuf != NULL) {
/* NOTE: override filep->size only on success. Otherwise, it might
* break constructs like if (!XX_httplib_stat() || !XX_httplib_fopen()) ... */
filep->size = size;
}
}
return filep->membuf != NULL;
} /* XX_httplib_is_file_in_memory */

20
src/libhttp.c
View File

@@ -827,26 +827,6 @@ void XX_httplib_set_thread_name(const char *threadName) {
#endif
int XX_httplib_is_file_in_memory( const struct mg_connection *conn, const char *path, struct file *filep ) {
size_t size = 0;
if (!conn || !filep) return 0;
if (conn->ctx->callbacks.open_file) {
filep->membuf = conn->ctx->callbacks.open_file(conn, path, &size);
if (filep->membuf != NULL) {
/* NOTE: override filep->size only on success. Otherwise, it might
* break constructs like if (!XX_httplib_stat() || !XX_httplib_fopen()) ... */
filep->size = size;
}
}
return filep->membuf != NULL;
} /* XX_httplib_is_file_in_memory */
bool XX_httplib_is_file_opened( const struct file *filep ) {
if ( filep == NULL ) return false;