1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-php-1.12.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80PHP mezzanine_patched_e-smith-php-1.12.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80PHP |
2 |
|
|
--- e-smith-php-1.12.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80PHP 2006-03-17 11:07:08.000000000 +1100 |
3 |
|
|
+++ mezzanine_patched_e-smith-php-1.12.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80PHP 2006-10-14 13:44:57.256800638 +1000 |
4 |
|
|
@@ -1,5 +1,6 @@ |
5 |
|
|
{ |
6 |
|
|
return "" unless (exists $php{status} and $php{status} eq "enabled"); |
7 |
|
|
|
8 |
|
|
+ return "LoadModule php5_module modules/libphp5.so" if ( -r "/usr/lib/httpd/modules/libphp5.so" ); |
9 |
|
|
return "LoadModule php4_module modules/libphp4.so"; |
10 |
|
|
} |
11 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/50PathsDirectories mezzanine_patched_e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/50PathsDirectories |
12 |
|
|
--- e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/50PathsDirectories 2006-03-17 11:07:08.000000000 +1100 |
13 |
|
|
+++ mezzanine_patched_e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/50PathsDirectories 2006-10-14 13:43:32.670533294 +1000 |
14 |
|
|
@@ -1,5 +1,5 @@ |
15 |
|
|
include_path = ".:/usr/share/pear-addons:/usr/share/pear" |
16 |
|
|
doc_root = |
17 |
|
|
user_dir = |
18 |
|
|
-extension_dir = /usr/lib/php4 |
19 |
|
|
+extension_dir = { if( -d "/usr/lib/php/modules" ) { "/usr/lib/php/modules"; } else { "/usr/lib/php4"; } } |
20 |
|
|
enable_dl = On |