From 13c14292c2bee07e6a1766262bbbae35289d9874 Mon Sep 17 00:00:00 2001 From: Brandon Kelly Date: Sun, 5 Apr 2020 01:55:26 -0700 Subject: [PATCH] Fix #17948: Ignore errors caused by `set_time_limit(0)` --- framework/CHANGELOG.md | 1 + framework/web/Response.php | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 809751b..f545933 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -4,6 +4,7 @@ Yii Framework 2 Change Log 2.0.35 under development ------------------------ +- Bug #17948: Ignore errors caused by `set_time_limit(0)` (brandonkelly) - Bug #17810: Fix EachValidator crashing with uninitialized typed properties (ricardomm85) - Bug #17942: Fix for `DbCache` loop in MySQL `QueryBuilder` (alex-code) diff --git a/framework/web/Response.php b/framework/web/Response.php index 6ad19f0..c9206d3 100644 --- a/framework/web/Response.php +++ b/framework/web/Response.php @@ -430,9 +430,8 @@ class Response extends \yii\base\Response return; } - if (function_exists('set_time_limit')) { - set_time_limit(0); // Reset time limit for big files - } else { + // Try to reset time limit for big files + if (!function_exists('set_time_limit') || !@set_time_limit(0)) { Yii::warning('set_time_limit() is not available', __METHOD__); }