Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
304
Merge Requests
304
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
7ba1d72c
Commit
7ba1d72c
authored
Apr 07, 2014
by
webchick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2233929
by alexpott: Drupal_set_time_limit should only be able to increase the time limit.
parent
959fa9da
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
core/includes/common.inc
core/includes/common.inc
+10
-6
No files found.
core/includes/common.inc
View file @
7ba1d72c
...
...
@@ -1199,11 +1199,11 @@ function l($text, $path, array $options = array()) {
* into script execution a call such as set_time_limit(20) is made, the
* script will run for a total of 45 seconds before timing out.
*
* I
t also means that it is possible to decrease the total time limit if
* t
he sum of the new time limit and the current time spent running the
*
script is inferior to the original time limit. It is inherent to the way
*
set_time_limit() works, it should rather be called with an appropriate
* value every time you need to allocate a certain amount of time
* I
f the current time limit is not unlimited it is possible to decrease the
* t
otal time limit if the sum of the new time limit and the current time spent
*
running the script is inferior to the original time limit. It is inherent to
*
the way set_time_limit() works, it should rather be called with an
*
appropriate
value every time you need to allocate a certain amount of time
* to execute a task than only once at the beginning of the script.
*
* Before calling set_time_limit(), we check if this function is available
...
...
@@ -1220,7 +1220,11 @@ function l($text, $path, array $options = array()) {
*/
function
drupal_set_time_limit
(
$time_limit
)
{
if
(
function_exists
(
'set_time_limit'
))
{
@
set_time_limit
(
$time_limit
);
$current
=
ini_get
(
'max_execution_time'
);
// Do not set time limit if it is currently unlimited.
if
(
$current
!==
0
)
{
@
set_time_limit
(
$time_limit
);
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment