From 5d622d89cf484c21f30c955a3cb296b55f75265c Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Wed, 28 Aug 2024 22:47:19 +0530 Subject: [PATCH] mediawiki: Increase PHP maximum execution time to 100 seconds Fixes: #2432 Tests: - Without patch install MediaWiki. phpinfo() shows max execution time for 30 seconds. Apply patch, run 'make install' and restart service. Mediawiki app is updated. Apache2 is reloaded. phpinfo() shows max execution time for 100 seconds. - Create a script to 100% utilize the CPU for 90 seconds. It works. - Create a script to 100% utilize the CPU for 110 seconds. It fails and get killed after about 100 seconds. Signed-off-by: Joseph Nuthalapati Tested-by: Sunil Mohan Adapa Reviewed-by: Sunil Mohan Adapa --- plinth/modules/mediawiki/__init__.py | 4 ++-- .../etc/apache2/conf-available/mediawiki-freedombox.conf | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plinth/modules/mediawiki/__init__.py b/plinth/modules/mediawiki/__init__.py index ab1802578..413e8da85 100644 --- a/plinth/modules/mediawiki/__init__.py +++ b/plinth/modules/mediawiki/__init__.py @@ -40,7 +40,7 @@ class MediaWikiApp(app_module.App): app_id = 'mediawiki' - _version = 12 + _version = 13 def __init__(self) -> None: """Create components for the app.""" @@ -86,7 +86,7 @@ class MediaWikiApp(app_module.App): self.add(webserver) webserver = Webserver('webserver-mediawiki-freedombox', - 'mediawiki-freedombox') + 'mediawiki-freedombox', last_updated_version=13) self.add(webserver) daemon = Daemon('daemon-mediawiki', 'mediawiki-jobrunner') diff --git a/plinth/modules/mediawiki/data/usr/share/freedombox/etc/apache2/conf-available/mediawiki-freedombox.conf b/plinth/modules/mediawiki/data/usr/share/freedombox/etc/apache2/conf-available/mediawiki-freedombox.conf index e95c0980f..d028362df 100644 --- a/plinth/modules/mediawiki/data/usr/share/freedombox/etc/apache2/conf-available/mediawiki-freedombox.conf +++ b/plinth/modules/mediawiki/data/usr/share/freedombox/etc/apache2/conf-available/mediawiki-freedombox.conf @@ -6,6 +6,9 @@ RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^(.*)$ index.php [L] + + ProxyFCGISetEnvIf true PHP_VALUE "max_execution_time = 100" +