changeset 10178:272bec780e26 HEAD

master: service's vsz_limit=0 should disable the limit, not make it use the default.
author Timo Sirainen <tss@iki.fi>
date Fri, 23 Oct 2009 20:11:59 -0400
parents d589d568a19d
children afe52d60989c
files src/master/master-settings.c src/master/service.c
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/master-settings.c	Fri Oct 23 20:10:17 2009 -0400
+++ b/src/master/master-settings.c	Fri Oct 23 20:11:59 2009 -0400
@@ -139,10 +139,10 @@
 	MEMBER(drop_priv_before_exec) FALSE,
 
 	MEMBER(process_min_avail) 0,
-	MEMBER(process_limit) (unsigned int)-1,
+	MEMBER(process_limit) -1U,
 	MEMBER(client_limit) 0,
 	MEMBER(service_count) 0,
-	MEMBER(vsz_limit) 256,
+	MEMBER(vsz_limit) -1U,
 
 	MEMBER(unix_listeners) ARRAY_INIT,
 	MEMBER(fifo_listeners) ARRAY_INIT,
--- a/src/master/service.c	Fri Oct 23 20:10:17 2009 -0400
+++ b/src/master/service.c	Fri Oct 23 20:11:59 2009 -0400
@@ -176,14 +176,14 @@
 	    service->client_limit < set->service_count)
 		service->client_limit = set->service_count;
 
-	service->vsz_limit = set->vsz_limit != 0 ? set->vsz_limit :
+	service->vsz_limit = set->vsz_limit != -1U ? set->vsz_limit :
 		set->master_set->default_vsz_limit;
 	service->type = service->set->parsed_type;
 
 	if (set->process_limit == 0) {
 		/* unlimited */
 		service->process_limit = INT_MAX;
-	} else if (set->process_limit == (unsigned int)-1) {
+	} else if (set->process_limit == -1U) {
 		/* use default */
 		service->process_limit =
 			set->master_set->default_process_limit;