Mercurial > hg > nginx

comparison src/core/nginx.c @ 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 61d64ab739a0
children 1b779cb69dc8 7447784028a7
comparison
equal deleted inserted replaced
4351:d1d34de1a419 4352:413b822f1efa
200 { 200 {
201 ngx_int_t i; 201 ngx_int_t i;
202 ngx_log_t *log; 202 ngx_log_t *log;
203 ngx_cycle_t *cycle, init_cycle; 203 ngx_cycle_t *cycle, init_cycle;
204 ngx_core_conf_t *ccf; 204 ngx_core_conf_t *ccf;
205
206 #if (NGX_FREEBSD)
207 ngx_debug_init();
208 #endif
205 209
206 if (ngx_strerror_init() != NGX_OK) { 210 if (ngx_strerror_init() != NGX_OK) {
207 return 1; 211 return 1;
208 } 212 }
209 213
258 if (!ngx_test_config) { 262 if (!ngx_test_config) {
259 return 0; 263 return 0;
260 } 264 }
261 } 265 }
262 266
263 #if (NGX_FREEBSD)
264 ngx_debug_init();
265 #endif
266
267 /* TODO */ ngx_max_sockets = -1; 267 /* TODO */ ngx_max_sockets = -1;
268 268
269 ngx_time_init(); 269 ngx_time_init();
270 270
271 #if (NGX_PCRE) 271 #if (NGX_PCRE)