/[smeserver]/rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz11427-timeout.patch
ViewVC logotype

Annotation of /rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz11427-timeout.patch

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

Revision 1.1 - (hide annotations) (download)
Mon Mar 8 07:36:01 2021 UTC (3 years, 8 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-php-3_0_0-28_el7_sme, smeserver-php-3_0_0-29_el7_sme 
* Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-28.sme
- filter non existing php script [SME: 10907]
- allow php embded files per ibay using AllowPHTML [SME: 10890]
- add timeout property in case of need for long running script [SME: 11427]
  e.g. upgrade of a wiki
1 jpp 1.1 diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays smeserver-php-3.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays
2     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays 2021-03-08 02:32:52.038000000 -0500
3     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays 2021-03-08 02:33:23.967000000 -0500
4     @@ -17,6 +17,9 @@
5     my $version = PhpFpmVersionToUse($ibay);
6     my $name = lc $key;
7     my $FilesMathes = ( ($ibay->prop('AllowPHTML') || 'disabled') eq 'enabled' ) ? '(xml|phtml|html|htm|php|phar)': '(phar|php)';
8     + my $timeout = $ibay->prop('timeout') ||300; #default in the config here. apache default 60
9     + $OUT .= " TimeOut=$timeout\n ProxyTimeout=$timeout\n" unless $timeout == 300;
10     +
11     $OUT .=<<"_EOF";
12     SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
13     <FilesMatch \\.$FilesMathes\$>
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed