check for mod_proxy_fcgi too during apache version check

pablo332 · Apr 14, 2014 · 0b68a6b · 0b68a6b
1 parent 695a32a
commit 0b68a6b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2
@@ -121,7 +121,7 @@ if [[ "$#" -gt "1" ]]; then
 fi
 
 php -r 'exit((int)version_compare(PHP_VERSION, "5.5.11", "<"));' || { echo "This program requires PHP 5.5.11 or newer" >&2; exit 1; }
-httpd -v | php -r 'exit((int)version_compare(preg_replace("#^Server version: Apache/([\d\\.]+).+$#sm", "\\1", file_get_contents("php://stdin")), "2.4.8", "<"));' || { echo "This program requires Apache 2.4.8 or newer with mod_proxy_fcgi enabled" >&2; exit 1; }
+{ { httpd -v | php -r 'exit((int)version_compare(preg_replace("#^Server version: Apache/([\d\\.]+).+$#sm", "\\1", file_get_contents("php://stdin")), "2.4.8", "<"));'; } && { httpd -t -D DUMP_MODULES 2> /dev/null | grep -q "proxy_fcgi_module"; }; } || { echo "This program requires Apache 2.4.8 or newer with mod_proxy_fcgi enabled" >&2; exit 1; }
 
 echo "Booting on port $PORT..." >&2