Author: mdounin
Date: 2011-12-13 19:01:10 +0000 (Tue, 13 Dec 2011)
New Revision: 4353

Log:
Merge of r4223:

FreeBSD's MALLOC_OPTIONS must be set before any malloc() call.
The bug has been introduced in r3799.


Modified:
branches/stable-1.0/
branches/stable-1.0/src/core/nginx.c


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4222,4229-4230,4232,4235-4237,4265,4268,4280,4283,4321,4342-4343
+ /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4229-4230,4232,4235-4237,4265,4268,4280,4283,4321,4342-4343

Modified: branches/stable-1.0/src/core/nginx.c
===================================================================
--- branches/stable-1.0/src/core/nginx.c 2011-12-13 18:59:18 UTC (rev 4352)
+++ branches/stable-1.0/src/core/nginx.c 2011-12-13 19:01:10 UTC (rev 4353)
@@ -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();

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel