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 2007-05-18 22:02:54.000000000 -0600 |
3 |
+++ mezzanine_patched_e-smith-php-1.12.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80PHP 2007-05-18 21:28:24.000000000 -0600 |
4 |
@@ -1,6 +1,7 @@ |
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 php5_module modules/libphp5.so" if ( -r "/usr/lib/httpd/modules/libphp5.so" || |
10 |
+ -r "/usr/lib64/httpd/modules/libphp5.so" ); |
11 |
return "LoadModule php4_module modules/libphp4.so"; |
12 |
} |
13 |
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 |
14 |
--- e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/50PathsDirectories 2007-05-18 22:02:54.000000000 -0600 |
15 |
+++ mezzanine_patched_e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/50PathsDirectories 2007-05-18 21:27:54.000000000 -0600 |
16 |
@@ -1,5 +1,8 @@ |
17 |
include_path = ".:/usr/share/pear-addons:/usr/share/pear" |
18 |
doc_root = |
19 |
user_dir = |
20 |
-extension_dir = { if( -d "/usr/lib/php/modules" ) { "/usr/lib/php/modules"; } else { "/usr/lib/php4"; } } |
21 |
+extension_dir = { return "/usr/lib64/php/modules" if -d "/usr/lib64/php/modules"; |
22 |
+ return "/usr/lib/php/modules" if -d "/usr/lib/php/modules"; |
23 |
+ return "/usr/lib64/php4" if -d "/usr/lib64/php4"; |
24 |
+ return "/usr/lib/php4"; } |
25 |
enable_dl = On |