Merge of r4223:

FreeBSD's MALLOC_OPTIONS must be set before any malloc() call.
The bug has been introduced in r3799.
This commit is contained in:
Maxim Dounin 2011-12-13 19:01:10 +00:00
parent 8d375710c2
commit 509f7ae156
1 changed files with 4 additions and 4 deletions

View File

@ -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();