summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9>2013-08-30 13:14:57 +0000
committerstbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9>2013-08-30 13:14:57 +0000
commitc895a58ebfb534a93dc78c47118fb4c2c8ea68e5 (patch)
tree9f3a75c4d582454d9f81c040bfa81d9321f297a0
parente3938e257af012571701d3ceef5a3ea46dbc0418 (diff)
downloadlighttpd-c895a58ebfb534a93dc78c47118fb4c2c8ea68e5.tar.gz
[core] remove requirement that default doc-root has to exist, there are reasonable scenarios not requiring static files at all
From: Stefan Bühler <stbuehler@web.de> git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2895 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--NEWS1
-rw-r--r--src/configfile.c21
2 files changed, 1 insertions, 21 deletions
diff --git a/NEWS b/NEWS
index 6ee95812..f6267025 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ NEWS
* [ssl] add option ssl.empty-fragments, defaulting to disabled (fixes #2492)
* [auth] put REMOTE_USER into cgi environment, making it accessible to lua via lighty.req_env (fixes #2495)
* [auth] new method "extern" to use already present REMOTE_USER (from magnet, ssl, ...) (fixes #2436)
+ * [core] remove requirement that default doc-root has to exist, there are reasonable scenarios not requiring static files at all
- 1.4.32 - 2012-11-21
* Code cleanup with clang/sparse (fixes #2437, thx kibi)
diff --git a/src/configfile.c b/src/configfile.c
index b4d672d8..9226ade8 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -1249,27 +1249,6 @@ int config_set_defaults(server *srv) {
return -1;
}
- if (buffer_is_empty(srv->srvconf.changeroot)) {
- if (-1 == stat(s->document_root->ptr, &st1)) {
- log_error_write(srv, __FILE__, __LINE__, "sb",
- "base-docroot doesn't exist:",
- s->document_root);
- return -1;
- }
-
- } else {
- buffer_copy_string_buffer(srv->tmp_buf, srv->srvconf.changeroot);
- buffer_append_string_buffer(srv->tmp_buf, s->document_root);
-
- if (-1 == stat(srv->tmp_buf->ptr, &st1)) {
- log_error_write(srv, __FILE__, __LINE__, "sb",
- "base-docroot doesn't exist:",
- srv->tmp_buf);
- return -1;
- }
-
- }
-
buffer_copy_string_buffer(srv->tmp_buf, s->document_root);
buffer_to_lower(srv->tmp_buf);