diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-02-04 18:30:21 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-02-04 18:30:21 +0300 |
| commit | 798833457018ee8a6274ec78e816f747361c0d47 (patch) | |
| tree | a8a905538380af822e90b3fc5571de836c3b3aba /src/core/nginx.c | |
| parent | 9add42c71e71c2af8e67eceeeb773d22a9cab760 (diff) | |
| download | nginx-798833457018ee8a6274ec78e816f747361c0d47.tar.gz nginx-798833457018ee8a6274ec78e816f747361c0d47.zip | |
Dynamic modules: moved module-related stuff to separate files.
Diffstat (limited to 'src/core/nginx.c')
| -rw-r--r-- | src/core/nginx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 64db3818e..22441a84c 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -160,8 +160,6 @@ ngx_module_t ngx_core_module = { }; -ngx_uint_t ngx_max_module; - static ngx_uint_t ngx_show_help; static ngx_uint_t ngx_show_version; static ngx_uint_t ngx_show_configure; @@ -260,9 +258,8 @@ main(int argc, char *const *argv) return 1; } - ngx_max_module = 0; - for (i = 0; ngx_modules[i]; i++) { - ngx_modules[i]->index = ngx_max_module++; + if (ngx_preinit_modules() != NGX_OK) { + return 1; } cycle = ngx_init_cycle(&init_cycle); |