diff options
| author | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2011-03-31 19:52:51 +0000 |
|---|---|---|
| committer | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2011-03-31 19:52:51 +0000 |
| commit | b8607cdfda354d7a568edb4c400f207959256579 (patch) | |
| tree | b0ac692b7ae7efd113f3b2a7ae54086122f59cde | |
| parent | c8c64f795dd001d85299b391293555295af17680 (diff) | |
| download | lighttpd-b8607cdfda354d7a568edb4c400f207959256579.tar.gz | |
more strict check for server.stat-cache-engine
git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@2785 152afb58-edef-0310-8abb-c4023f1b3aa9
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/configfile.c | 13 |
2 files changed, 14 insertions, 1 deletions
@@ -165,6 +165,8 @@ NEWS * Include IP addresses on error log on password failures (fixes #2191) * Combine Cache-Control header value in mod_expire to existing HTTP header if header already added by other modules (fixes #2068) * Fix conditional interpretation of core options + * proxy-backend-http: fix chunked encoding parser + * more strict check for server.stat-cache-engine - 1.5.0-r19.. - * -F option added for spawn-fcgi diff --git a/src/configfile.c b/src/configfile.c index ee412169..1254c270 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -270,15 +270,26 @@ static int config_insert(server *srv) { srv->srvconf.stat_cache_engine = STAT_CACHE_ENGINE_SIMPLE; } else if (buffer_is_equal_string(stat_cache_string, CONST_STR_LEN("simple"))) { srv->srvconf.stat_cache_engine = STAT_CACHE_ENGINE_SIMPLE; +#ifdef HAVE_FAM_H } else if (buffer_is_equal_string(stat_cache_string, CONST_STR_LEN("fam"))) { srv->srvconf.stat_cache_engine = STAT_CACHE_ENGINE_FAM; +#endif +#if defined(HAVE_SYS_INOTIFY_H) } else if (buffer_is_equal_string(stat_cache_string, CONST_STR_LEN("inotify"))) { srv->srvconf.stat_cache_engine = STAT_CACHE_ENGINE_INOTIFY; +#endif } else if (buffer_is_equal_string(stat_cache_string, CONST_STR_LEN("disable"))) { srv->srvconf.stat_cache_engine = STAT_CACHE_ENGINE_NONE; } else { log_error_write(srv, __FILE__, __LINE__, "sb", - "server.stat-cache-engine can be one of \"disable\", \"simple\", \"fam\", \"inotify\" but not:", stat_cache_string); + "server.stat-cache-engine can be one of \"disable\", \"simple\"" +#ifdef HAVE_FAM_H + ", \"fam\"" +#endif +#if defined(HAVE_SYS_INOTIFY_H) + ", \"inotify\"" +#endif + " but not:", stat_cache_string); ret = HANDLER_ERROR; } |