Mercurial > hg > nginx

changeset 4352:413b822f1efa stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4223: FreeBSD's MALLOC_OPTIONS must be set before any malloc() call. The bug has been introduced in r3799.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 13 Dec 2011 19:01:10 +0000
parents d1d34de1a419
children 710e35d17c28
files src/core/nginx.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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();