From: Maxim Dounin <mdounin@mdounin.ru>
Date: Tue, 13 Dec 2011 19:01:10 +0000 (+0000)
Subject: Merge of r4223:
X-Git-Tag: release-1.0.11~16
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=ed89c54f991b19826d33dfce22826db1b7b391cf;p=nginx.git

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