diff options
author | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2011-03-30 17:30:38 +0000 |
---|---|---|
committer | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2011-03-30 17:30:38 +0000 |
commit | f87af7497694a0da20d55ab5916331600dc298af (patch) | |
tree | 6936e6c0d41f11776485fa3a7c970a28c71fb031 | |
parent | 362d67ca62e990fd2dcf5029e04edafc29028079 (diff) | |
download | lighttpd-f87af7497694a0da20d55ab5916331600dc298af.tar.gz |
Fix conditional interpretation of core options
git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@2782 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | src/configfile.c | 3 |
2 files changed, 1 insertions, 3 deletions
@@ -164,6 +164,7 @@ NEWS * Print double quotes properly when dumping config file (fixes #1806) * 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 - 1.5.0-r19.. - * -F option added for spawn-fcgi diff --git a/src/configfile.c b/src/configfile.c index 2becea73..ee412169 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -358,9 +358,6 @@ int config_patch_connection(server *srv, connection *con, comp_key_t comp) { data_config *dc = (data_config *)srv->config_context->data[i]; specific_config *s = srv->config_storage[i]; - /* not our stage */ - if (comp != dc->comp) continue; - /* condition didn't match */ if (!config_check_cond(srv, con, dc)) continue; |