From aeef2096a8f3f92438eecfc037c45164fb1038ea Mon Sep 17 00:00:00 2001
From: Brandon Rhodes <brandon@rhodesmill.org>
Date: Mon, 25 Jun 2012 19:27:00 -0400
Subject: [PATCH] Updated "README.md" and "compile" for PHP 5.3.14

Also, I switched "wget" commands to "curl" since "wget" does not exist
on Heroku instances, where I did my compile steps (to assure binary
compatibility).
---
 README.md       | 10 +++++-----
 bin/compile     |  4 ++--
 conf/httpd.conf |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 488cd4ba1..0d0bdb899 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Pre-compiling binaries
 
     # apache
     mkdir /app
-    wget http://apache.cyberuse.com/httpd/httpd-2.2.22.tar.gz
+    curl -O http://apache.cyberuse.com/httpd/httpd-2.2.22.tar.gz
     tar xvzf httpd-2.2.22.tar.gz
     cd httpd-2.2.22
     ./configure --prefix=/app/apache --enable-rewrite --enable-proxy --enable-proxy-http
@@ -26,10 +26,10 @@ Pre-compiling binaries
     cd ..
     
     # php
-    wget http://us2.php.net/get/php-5.3.6.tar.gz/from/us.php.net/mirror 
+    curl -LO http://us2.php.net/get/php-5.3.14.tar.gz/from/us.php.net/mirror
     mv mirror php.tar.gz
     tar xzvf php.tar.gz
-    cd php-5.3.6/
+    cd php-5.3.14/
     ./configure --prefix=/app/php --with-apxs2=/app/apache/bin/apxs --with-mysql --with-pdo-mysql --with-pgsql --with-pdo-pgsql --with-iconv --with-gd --with-curl=/usr/lib --with-config-file-path=/app/php --enable-soap=shared --with-openssl
     make
     make install
@@ -37,7 +37,7 @@ Pre-compiling binaries
     
     # php extensions
     mkdir /app/php/ext
-    cp /usr/lib/libmysqlclient.so.15 /app/php/ext/
+    cp /usr/lib/libmysqlclient.so.16 /app/php/ext/
     
     # pear
     apt-get install php5-dev php-pear
@@ -52,7 +52,7 @@ Pre-compiling binaries
     cd /app
     echo '2.2.22' > apache/VERSION
     tar -zcvf apache.tar.gz apache
-    echo '5.3.6' > php/VERSION
+    echo '5.3.14' > php/VERSION
     tar -zcvf php.tar.gz php
 
 
diff --git a/bin/compile b/bin/compile
index 48279cbef..e6f57d110 100755
--- a/bin/compile
+++ b/bin/compile
@@ -7,7 +7,7 @@ set -e
 # config
 APACHE_VERSION="2.2.22"
 APACHE_PATH="apache"
-PHP_VERSION="5.3.10"
+PHP_VERSION="5.3.14"
 PHP_PATH="php"
 
 BIN_DIR=$(dirname $0)
@@ -34,7 +34,7 @@ APACHE_URL="https://s3.amazonaws.com/rhodesmill/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="https://s3.amazonaws.com/rhodesmill/php-$PHP_VERSION.tar.gz"
 echo "-----> Bundling PHP version $PHP_VERSION"
 curl --silent --max-time 60 --location "$PHP_URL" | tar xz
 
diff --git a/conf/httpd.conf b/conf/httpd.conf
index da734d926..ccdc144c0 100644
--- a/conf/httpd.conf
+++ b/conf/httpd.conf
@@ -54,7 +54,7 @@ ListenBackLog 1024
 #
 # Example:
 # LoadModule foo_module modules/mod_foo.so
-# LoadModule php5_module        modules/libphp5.so
+LoadModule php5_module        modules/libphp5.so
 #
 
 <IfModule !mpm_netware_module>