summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--flup/server/fcgi_fork.py9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9722fcd..788037b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-17 Allan Saddi <allan@saddi.com>
+
+ * Fix fcgi_fork so it can run on Solaris. Thanks to
+ Basil Crow for the patch.
+
2007-01-22 Allan Saddi <allan@saddi.com>
* Fix eunuchs import issue.
diff --git a/flup/server/fcgi_fork.py b/flup/server/fcgi_fork.py
index ae43752..53035a1 100644
--- a/flup/server/fcgi_fork.py
+++ b/flup/server/fcgi_fork.py
@@ -97,9 +97,12 @@ class WSGIServer(BaseFCGIServer, PreforkServer):
import resource
# Attempt to glean the maximum number of connections
# from the OS.
- maxProcs = resource.getrlimit(resource.RLIMIT_NPROC)[0]
- maxConns = resource.getrlimit(resource.RLIMIT_NOFILE)[0]
- maxConns = min(maxConns, maxProcs)
+ try:
+ maxProcs = resource.getrlimit(resource.RLIMIT_NPROC)[0]
+ maxConns = resource.getrlimit(resource.RLIMIT_NOFILE)[0]
+ maxConns = min(maxConns, maxProcs)
+ except AttributeError:
+ maxConns = resource.getrlimit(resource.RLIMIT_NOFILE)[0]
except ImportError:
maxConns = 100 # Just some made up number.
maxReqs = maxConns