/[smeserver]/rpms/e-smith-ibays/sme10/e-smith-ibays-2.6.0-bz10871-ifphpmodule.patch
ViewVC logotype

Annotation of /rpms/e-smith-ibays/sme10/e-smith-ibays-2.6.0-bz10871-ifphpmodule.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Tue Jun 23 03:01:00 2020 UTC (4 years, 4 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-ibays-2_6_0-11_el7_sme, e-smith-ibays-2_6_0-12_el7_sme, e-smith-ibays-2_6_0-17_el7_sme, e-smith-ibays-2_6_0-10_el7_sme, e-smith-ibays-2_6_0-15_el7_sme, e-smith-ibays-2_6_0-16_el7_sme, e-smith-ibays-2_6_0-20_el7_sme, e-smith-ibays-2_6_0-18_el7_sme, e-smith-ibays-2_6_0-13_el7_sme, e-smith-ibays-2_6_0-19_el7_sme, e-smith-ibays-2_6_0-14_el7_sme, HEAD
* Mon Jun 22 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme
- fix apache failing if ibay has dynamic content enabled and phpmodule is disabled [SME: 10871]

1 jpp 1.1 diff -Nur e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays
2     --- e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2016-02-05 17:52:36.000000000 -0500
3     +++ e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2020-06-22 22:56:25.028000000 -0400
4     @@ -120,11 +120,14 @@
5     if ($dynamicContent eq 'enabled')
6     {
7     $OUT .= " Options +Includes\n";
8     - $OUT .= " php_admin_flag allow_url_fopen on\n" if ($allowurlfopen eq 'enabled');
9     - $OUT .= " php_admin_value memory_limit $memoryLimit\n" if ($memoryLimit ne 'disabled');
10     - $OUT .= " php_admin_value upload_max_filesize $upmaxfileSize\n" if ($upmaxfileSize ne 'disabled');
11     - $OUT .= " php_admin_value post_max_size $postmaxSize\n" if ($postmaxSize ne 'disabled');
12     - $OUT .= " php_admin_value max_execution_time $maxexecutionTime\n" if ($maxexecutionTime ne 'disabled');
13     + if ((exists $php{status} and $php{status} eq "enabled") and $phpModule eq "enabled")
14     + {
15     + $OUT .= " php_admin_flag allow_url_fopen on\n" if ($allowurlfopen eq 'enabled');
16     + $OUT .= " php_admin_value memory_limit $memoryLimit\n" if ($memoryLimit ne 'disabled');
17     + $OUT .= " php_admin_value upload_max_filesize $upmaxfileSize\n" if ($upmaxfileSize ne 'disabled');
18     + $OUT .= " php_admin_value post_max_size $postmaxSize\n" if ($postmaxSize ne 'disabled');
19     + $OUT .= " php_admin_value max_execution_time $maxexecutionTime\n" if ($maxexecutionTime ne 'disabled');
20     + }
21     }
22     else
23     {

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed