summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9>2009-07-16 23:25:33 +0000
committerstbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9>2009-07-16 23:25:33 +0000
commit76bb213d9bd53a37e9e7fe288133c88d3c7ed596 (patch)
treeff62cf35659e3646d4fc1bb1ec26098149f0c6c6
parent4b6e9da58611bbf086ae2932a06d41fe9d82b766 (diff)
downloadlighttpd-76bb213d9bd53a37e9e7fe288133c88d3c7ed596.tar.gz
Allow all comparisons for $SERVER["socket"] - only bind for "=="
git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@2591 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--NEWS1
-rw-r--r--src/network.c6
2 files changed, 2 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 48e39f2e..0037f4ba 100644
--- a/NEWS
+++ b/NEWS
@@ -135,6 +135,7 @@ NEWS
* Report non-fatal ssl errors as "connection close"
* Add '%_' pattern for complete hostname in mod_evhost (fixes #1737)
* Allow digits in hostnames in more places (fixes #1148)
+ * Allow all comparisons for $SERVER["socket"] - only bind for "=="
- 1.5.0-r19.. -
* -F option added for spawn-fcgi
diff --git a/src/network.c b/src/network.c
index c6521bc3..72fb0359 100644
--- a/src/network.c
+++ b/src/network.c
@@ -670,11 +670,7 @@ int network_init(server *srv) {
/* not our stage */
if (COMP_SERVER_SOCKET != dc->comp) continue;
- if (dc->cond != CONFIG_COND_EQ) {
- log_error_write(srv, __FILE__, __LINE__, "s", "only == is allowed for $SERVER[\"socket\"].");
-
- return -1;
- }
+ if (dc->cond != CONFIG_COND_EQ) continue;
/* check if we already know this socket,
* if yes, don't init it */