merged dev into stable

development.ini

@@ -59,6 +59,9 b' max_request_body_size = 107374182400'
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
 #max_requests = 5
+## ammount of time a worker can handle request before it get's killed and
+## restarted
+#timeout = 3600
 
 ## COMMON ##
 host = 0.0.0.0

production.ini

@@ -59,6 +59,9 b' max_request_body_size = 107374182400'
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
 #max_requests = 5
+## ammount of time a worker can handle request before it get's killed and
+## restarted
+#timeout = 3600
 
 ## COMMON ##
 host = 127.0.0.1

rhodecode/config/deployment.ini_tmpl

@@ -59,6 +59,9 b' max_request_body_size = 107374182400'
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
 #max_requests = 5
+## ammount of time a worker can handle request before it get's killed and
+## restarted
+#timeout = 3600
 
 ## COMMON ##
 host = 127.0.0.1