merged [166]

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.3.x@318 152afb58-edef-0310-8abb-c4023f1b3aa9

src/mod_fastcgi.c

@@ -2286,7 +2286,7 @@ static int fcgi_restart_dead_procs(server *srv, plugin_data *p, fcgi_extension_h
 			 */
 			
 			if ((proc->state == PROC_STATE_DISABLED) &&
-			    (srv->cur_ts - proc->disable_ts > FCGI_RETRY_TIMEOUT)) {
+			    (srv->cur_ts - proc->disable_ts > host->disable_time)) {
 				proc->state = PROC_STATE_RUNNING;
 				host->active_procs++;
 				

src/settings.h

@@ -6,8 +6,6 @@
 #define INET_NTOP_CACHE_MAX 4
 #define FILE_CACHE_MAX      16
 
-#define FCGI_RETRY_TIMEOUT  (5 * 60)
-
 /**
  * max size of a buffer which will just be reset
  * to ->used = 0 instead of really freeing the buffer