4 files changed, 23 insertions, 1 deletions
diff --git a/patches/php/conf/mod_php4.conf.example b/patches/php/conf/mod_php4-apache1.3.conf.example
index 7adf6e0b..7adf6e0b 100644
--- a/patches/php/conf/mod_php4.conf.example
+++ b/patches/php/conf/mod_php4-apache1.3.conf.example
diff --git a/patches/php/conf/mod_php5.conf.example b/patches/php/conf/mod_php5-apache1.3.conf.example
index e46a5b10..e46a5b10 100644
--- a/patches/php/conf/mod_php5.conf.example
+++ b/patches/php/conf/mod_php5-apache1.3.conf.example
diff --git a/patches/php/conf/mod_php5-apache2.conf.example b/patches/php/conf/mod_php5-apache2.conf.example
new file mode 100644
index 00000000..2707a2be
--- /dev/null
+++ b/patches/php/conf/mod_php5-apache2.conf.example
@@ -0,0 +1,12 @@
+#
+# mod_php - PHP Hypertext Preprocessor module
+#
+
+# Load the PHP module:
+LoadModule php5_module lib/httpd/modules/libphp5.so
+
+# Tell Apache to feed all *.php files through the PHP module:
+AddType application/x-httpd-php .php
+
+# This will display PHP files in colored syntax form.  Use with caution.
+#AddType application/x-httpd-php-source .phps
diff --git a/patches/php/php.SlackBuild b/patches/php/php.SlackBuild
index d91cf9a2..4240d7a1 100755
--- a/patches/php/php.SlackBuild
+++ b/patches/php/php.SlackBuild
@@ -538,7 +538,17 @@ fi
 
 mkdir -p $PKG/etc/apache
 cp -a php.ini-dist php.ini-recommended $PKG/etc/apache
-cp -a $CWD/mod_php$PHP_SERIES.conf.example $PKG/etc/apache/mod_php.conf.example
+
+if [ "$PHP_SERIES" == "5" ]; then
+  if (( `default_version` >= 120 )); then
+    cp -a $CWD/mod_php$PHP_SERIES-apache2.conf.example $PKG/etc/apache/mod_php.conf.example
+  else
+    cp -a $CWD/mod_php$PHP_SERIES-apache1.3.conf.example $PKG/etc/apache/mod_php.conf.example
+  fi
+else
+  cp -a $CWD/mod_php$PHP_SERIES-apache1.3.conf.example $PKG/etc/apache/mod_php.conf.example
+fi
+
 chmod 644 $PKG/etc/apache/*
 chown root:root $PKG/etc/apache/*