Fri, 30 Dec 2016 18:47:26 +0100
adds new a pathcheck saf and improves content type matchin and improves content type matching
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2013 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifndef CONF_H #define CONF_H #include <inttypes.h> #include "../util/object.h" #include "../config/objconf.h" #include "../config/initconf.h" #include "../config/serverconf.h" #include "../config/mimeconf.h" #include "../config/acl.h" #include "../config/keyfile.h" #include "acldata.h" #include "keyfile_auth.h" #include "log.h" #include <ucx/list.h> #include <ucx/map.h> #include <ucx/mempool.h> #include <ucx/string.h> #ifdef __cplusplus extern "C" { #endif typedef struct mime_map MimeMap; typedef struct _server_configuration { pool_handle_t *pool; UcxMap *host_vs; // map of all vservers. key is the host name UcxList *listeners; // list of all listeners UcxList *logfiles; AccessLog *default_log; UcxMap *authdbs; MimeMap *mimetypes; sstr_t tmp; sstr_t user; uint32_t ref; // reference counter } ServerConfiguration; typedef struct ConfigFile ConfigFile; typedef int(*cfg_reload_f)(ConfigFile*,ServerConfiguration*); struct ConfigFile { sstr_t file; time_t last_modified; cfg_reload_f reload; void *data; }; struct mime_map { UcxMap *map; uint32_t ref; }; int load_init_conf(char *file); void init_server_config_parser(); int cfg_handle_runtime(ServerConfiguration *cfg, ServerConfigObject *obj); int cfg_handle_logfile(ServerConfiguration *cfg, ServerConfigObject *obj); int cfg_handle_threadpool(ServerConfiguration *cfg, ServerConfigObject *obj); int cfg_handle_eventhandler(ServerConfiguration *cfg, ServerConfigObject *obj); int cfg_handle_accesslog(ServerConfiguration *cfg, ServerConfigObject *obj); int cfg_handle_authdb(ServerConfiguration *cfg, ServerConfigObject *obj); int cfg_handle_listener(ServerConfiguration *cfg, ServerConfigObject *obj); int cfg_handle_vs(ServerConfiguration *cfg, ServerConfigObject *obj); ServerConfiguration* load_server_conf(ServerConfiguration *old, char *file); void cfg_ref(ServerConfiguration *cfg); void cfg_unref(ServerConfiguration *cfg); int object_conf_reload(ConfigFile *file, ServerConfiguration *cfg); void object_conf_ref(HTTPObjectConfig *conf); void object_conf_unref(HTTPObjectConfig *conf); HTTPObjectConfig* load_obj_conf(char *file); int mime_conf_reload(ConfigFile *file, ServerConfiguration *cfg); void mime_conf_ref(MimeMap *conf); void mime_conf_unref(MimeMap *conf); int acl_conf_reload(ConfigFile *file, ServerConfiguration *cfg); ACLList* acl_config_convert(ServerConfiguration *cfg, ACLConfig *acl); int keyfile_reload(ConfigFile *file, ServerConfiguration *cfg); sstr_t cfg_load_file(sstr_t file); #ifdef __cplusplus } #endif #endif /* CONF_H */