aboutsummaryrefslogtreecommitdiff
path: root/src/core/nginx.c
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2017-08-08 15:16:01 +0300
committerRuslan Ermilov <ru@nginx.com>2017-08-08 15:16:01 +0300
commit5f628fef3b837b64096f8e064d51963b1396ffb4 (patch)
treec2073c8d7c66ff7be9b0213e4f11e826de34f783 /src/core/nginx.c
parentc9a81b29b5a7699f3c25c83b6ee9e0c2a07f5f79 (diff)
downloadnginx-5f628fef3b837b64096f8e064d51963b1396ffb4.tar.gz
nginx-5f628fef3b837b64096f8e064d51963b1396ffb4.zip
Slab: fixed initialization on win32.
On Windows, a worker process does not call ngx_slab_init() from ngx_init_zone_pool(), so ngx_slab_max_size, ngx_slab_exact_size, and ngx_slab_exact_shift were left uninitialized.
Diffstat (limited to 'src/core/nginx.c')
-rw-r--r--src/core/nginx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c
index abaa50d61..c3a29cc40 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -273,6 +273,12 @@ main(int argc, char *const *argv)
return 1;
}
+ /*
+ * ngx_slab_sizes_init() requires ngx_pagesize set in ngx_os_init()
+ */
+
+ ngx_slab_sizes_init();
+
if (ngx_add_inherited_sockets(&init_cycle) != NGX_OK) {
return 1;
}