summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorRobert Nagy <robert@cvs.openbsd.org>2011-10-08 14:48:28 +0000
committerRobert Nagy <robert@cvs.openbsd.org>2011-10-08 14:48:28 +0000
commit68875dd84c6dd34852a7d55fcd36322511409a1b (patch)
treeced004d50c549365bace354ce0277197d087818b /usr.sbin
parent070b2b7c2a1b7227817003268ffa43d3947df361 (diff)
our root is /var/www/htdocs and not /var/www/html
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/nginx/src/http/ngx_http_core_module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/nginx/src/http/ngx_http_core_module.c b/usr.sbin/nginx/src/http/ngx_http_core_module.c
index ebe22ceaf9b..cd4ed2cacb3 100644
--- a/usr.sbin/nginx/src/http/ngx_http_core_module.c
+++ b/usr.sbin/nginx/src/http/ngx_http_core_module.c
@@ -3351,7 +3351,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
conf->root_values = prev->root_values;
if (prev->root.data == NULL) {
- ngx_str_set(&conf->root, "html");
+ ngx_str_set(&conf->root, "htdocs");
if (ngx_conf_full_name(cf->cycle, &conf->root, 0) != NGX_OK) {
return NGX_CONF_ERROR;