# HG changeset patch # User Maxim Dounin # Date 1323802870 0 # Node ID 413b822f1efa3c90495d590b358f626f2175abc0 # Parent d1d34de1a4199ba33e5860d70c6096835445e9d0 Merge of r4223: FreeBSD's MALLOC_OPTIONS must be set before any malloc() call. The bug has been introduced in r3799. diff --git a/src/core/nginx.c b/src/core/nginx.c --- 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();