From 7fa64131b4df55fe884c3d57283f28013f40c561 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Thu, 18 Dec 2025 11:40:48 -0600
Subject: [PATCH] Fixed incorrect previous fix for timeout for php processing
 to allow for longer running API requests (3.21)

Previous ticket: ENT-13291

This fixes a bad cherry pick in 6d08d4ffd0b8750fb1e3e5a419b37929ff01616d

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
---
 cfe_internal/enterprise/templates/httpd.conf.mustache | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cfe_internal/enterprise/templates/httpd.conf.mustache b/cfe_internal/enterprise/templates/httpd.conf.mustache
index cf4640acac..eed315e50e 100644
--- a/cfe_internal/enterprise/templates/httpd.conf.mustache
+++ b/cfe_internal/enterprise/templates/httpd.conf.mustache
@@ -244,6 +244,9 @@ AddHandler php{{{vars.cfe_internal_hub_vars.php_version}}}-script       .php
 AddType    application/x-httpd-php-source php{{{vars.cfe_internal_hub_vars.php_version}}}
 
 
+# Timeout defaults to 60 but that is too short for some operations on slower hub hardware
+Timeout 120
+
 <Directory "{{{vars.cfe_internal_hub_vars.public_docroot}}}">
 
     Options -Indexes +FollowSymLinks +MultiViews
@@ -276,7 +279,6 @@ AddType    application/x-httpd-php-source php{{{vars.cfe_internal_hub_vars.php_v
 </Directory>
 
 <Directory "{{{vars.cfe_internal_hub_vars.docroot}}}/api">
-  Timeout 120 # Increase timeout for the API, especially agent_run. See ENT-13291
 
     Order deny,allow
     AllowOverride None