Skip to content

Commit d863ef8

Browse files
committed
Fixed incorrect previous fix for timeout for php processing to allow for longer running API requests (3.24)
Previous ticket: ENT-13291 This fixes a bad cherry pick in ada818c The timeout will apply for all httpd operations and is set to 2 minutes instead of the default of 1 minute. Ticket: ENT-13625 Changelog: title (cherry picked from commit 7fa6413)
1 parent 7e2fb21 commit d863ef8

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

cfe_internal/enterprise/templates/httpd.conf.mustache

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,9 @@ AddHandler php{{{vars.cfe_internal_hub_vars.php_version}}}-script .php
249249
AddType application/x-httpd-php-source php{{{vars.cfe_internal_hub_vars.php_version}}}
250250

251251

252+
# Timeout defaults to 60 but that is too short for some operations on slower hub hardware
253+
Timeout 120
254+
252255
<Directory "{{{vars.cfe_internal_hub_vars.public_docroot}}}">
253256

254257
Options -Indexes +FollowSymLinks +MultiViews
@@ -281,7 +284,6 @@ AddType application/x-httpd-php-source php{{{vars.cfe_internal_hub_vars.php_v
281284
</Directory>
282285

283286
<Directory "{{{vars.cfe_internal_hub_vars.docroot}}}/api">
284-
Timeout 120 # Increase timeout for the API, especially agent_run. See ENT-13291
285287

286288
Order deny,allow
287289
AllowOverride None

0 commit comments

Comments
 (0)