diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-13 19:01:10 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-13 19:01:10 +0000 |
| commit | ed89c54f991b19826d33dfce22826db1b7b391cf (patch) | |
| tree | cbd75164fe1b8a37083e85843042a34970f1b930 /src/core/nginx.c | |
| parent | b993b9ded79794222c1ecbc7f0c46cb6163530f2 (diff) | |
| download | nginx-ed89c54f991b19826d33dfce22826db1b7b391cf.tar.gz nginx-ed89c54f991b19826d33dfce22826db1b7b391cf.tar.bz2 | |
Merge of r4223:
FreeBSD's MALLOC_OPTIONS must be set before any malloc() call.
The bug has been introduced in r3799.
Diffstat (limited to 'src/core/nginx.c')
| -rw-r--r-- | src/core/nginx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index b8bab37e3..3a413e84e 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -203,6 +203,10 @@ main(int argc, char *const *argv) ngx_cycle_t *cycle, init_cycle; ngx_core_conf_t *ccf; +#if (NGX_FREEBSD) + ngx_debug_init(); +#endif + if (ngx_strerror_init() != NGX_OK) { return 1; } @@ -260,10 +264,6 @@ main(int argc, char *const *argv) } } -#if (NGX_FREEBSD) - ngx_debug_init(); -#endif - /* TODO */ ngx_max_sockets = -1; ngx_time_init(); |