merge in Redis, mod_expires, and mod_headers support from Phing build…

…pack

bin/compile

@@ -5,12 +5,11 @@
 set -e
 
 # config
+RESOURCE_BASE_URL="https://s3.amazonaws.com/heroku-php-buildpack"
 APACHE_VERSION="2.2.22"
 APACHE_PATH="apache"
 PHP_VERSION="5.3.10"
 PHP_PATH="php"
-EXT_PATH="extensions"
-REDIS_EXT="$EXT_PATH/redis.so"
 
 BIN_DIR=$(dirname $0)
 BUILD_DIR=$1
@@ -32,20 +31,14 @@ if [ -f www/Procfile ]; then
   mv www/Procfile .
 fi
 
-APACHE_URL="https://s3.amazonaws.com/php-lp/apache-$APACHE_VERSION.tar.gz"
+APACHE_URL="$RESOUCE_BASE_URL/apache-$APACHE_VERSION.tar.gz"
 echo "-----> Bundling Apache version $APACHE_VERSION"
 curl --silent --max-time 60 --location "$APACHE_URL" | tar xz
 
-PHP_URL="https://s3.amazonaws.com/php-lp/php-$PHP_VERSION.tar.gz"
+PHP_URL="$RESOURCE_BASE_URL/php-$PHP_VERSION.tar.gz"
 echo "-----> Bundling PHP version $PHP_VERSION"
 curl --silent --max-time 60 --location "$PHP_URL" | tar xz
 
-
-mkdir -p $(dirname $REDIS_EXT)
-REDIS_EXT_URL="https://s3.amazonaws.com/rbrainard-public/redis.so"
-echo "-----> Bundling Redis extension"
-curl --silent --max-time 60 --location $REDIS_EXT_URL > $REDIS_EXT
-
 # update config files
 cp $LP_DIR/conf/httpd.conf $APACHE_PATH/conf
 cp $LP_DIR/conf/php.ini php

conf/httpd.conf

@@ -55,6 +55,8 @@ ListenBackLog 1024
 # Example:
 # LoadModule foo_module modules/mod_foo.so
 LoadModule php5_module        modules/libphp5.so
+LoadModule expires_module     modules/mod_expires.so
+LoadModule headers_module     modules/mod_headers.so
 #
 
 <IfModule !mpm_netware_module>

conf/php.ini

@@ -945,7 +945,7 @@ default_socket_timeout = 60
 ; Be sure to appropriately set the extension_dir directive.
 ;
 extension=soap.so
-extension=/app/extensions/redis.so
+extension=redis.so
 extension=apc.so
 ;extension=php_bz2.dll
 ;extension=php_curl.dll