[nginx] svn commit: r4223 - trunk/src/core

[noreply at nginx.com]

Author: is
Date: 2011-10-24 12:59:01 +0000 (Mon, 24 Oct 2011)
New Revision: 4223

Modified:
   trunk/src/core/nginx.c
Log:
FreeBSD's MALLOC_OPTIONS must be set before any malloc() call.
The bug has been introduced in r3799.


Modified: trunk/src/core/nginx.c
===================================================================
--- trunk/src/core/nginx.c	2011-10-21 11:04:46 UTC (rev 4222)
+++ trunk/src/core/nginx.c	2011-10-24 12:59:01 UTC (rev 4223)
@@ -203,6 +203,10 @@
     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 @@
         }
     }
 
-#if (NGX_FREEBSD)
-    ngx_debug_init();
-#endif
-
     /* TODO */ ngx_max_sockets = -1;
 
     ngx_time_init();