Changeset 677

Timestamp:

03/16/07 01:18:29 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/qa/util.py (modified) (3 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2007-03-15  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * qa/util.py (check_php_interpreter): Added a test to check
+        whether the PHP interpreter support fastcgi or not.
-
-        * configure.in (CRYPT_LIBS): Tries to fix crypt() on MacOS X.

cherokee/trunk/qa/util.py

@@ -74 +74 @@
-
-
+def check_php_interpreter (fullpath):
+    f = os.popen ("%s -v" % (fullpath))
+    all = reduce (lambda x,y: x+y, f.readlines())
+    f.close()
+    return "cgi-fcgi" in all
+
-__php_ref = None
-def look_for_php():    
@@ -83 +89 @@
-    if PHPCGI_PATH != "auto":
-        __php_ref = PHPCGI_PATH
+        if not check_php_interpreter(__php_ref):
+            print "%s doesn't support fcgi"
-        return __php_ref
-
@@ -90 +98 @@
-            if os.path.exists(php):
-                __php_ref = php
+                if not check_php_interpreter(__php_ref):
+                    print "%s doesn't support fcgi"
-                return php
-