make sure we strip the chroot prefix from all root variables, not just the

first one

1 files changed, 8 insertions, 7 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 d88d0bcb1aa..400db3ce7df 100644
--- a/usr.sbin/nginx/src/http/ngx_http_core_module.c
+++ b/usr.sbin/nginx/src/http/ngx_http_core_module.c
@@ -3385,13 +3385,14 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                 return NGX_CONF_ERROR;
             }
         }
-	if (ngx_chrooted) {
-	    buf = malloc(conf->root.len);
-	    ngx_cpystrn(buf, conf->root.data + strlen(NGX_PREFIX) - 1,
-	        conf->root.len);
-	    ngx_str_set(&conf->root, buf);
-	    free(buf);
-	}
+    }
+
+    if (ngx_chrooted && prev->root.data != NULL) {
+        buf = malloc(conf->root.len);
+        ngx_cpystrn(buf, conf->root.data + strlen(NGX_PREFIX) - 1,
+            conf->root.len);
+        ngx_str_set(&conf->root, buf);
+        free(buf);
     }
 
     if (conf->post_action.data == NULL) {