diff options
| author | Ko- <k.stoffelen@cs.ru.nl> | 2017-03-11 17:04:21 +0100 |
|---|---|---|
| committer | Ko- <k.stoffelen@cs.ru.nl> | 2017-03-11 17:04:21 +0100 |
| commit | 0024b67aaf1b5fd79a2e73789a4c903364162e54 (patch) | |
| tree | c01ec94b8d871b0905ed550391ac7be5e5b10e52 /apps/dav/appinfo | |
| parent | 801b600ec348edab2447866b349a0d163db94f15 (diff) | |
| download | nextcloud-server-0024b67aaf1b5fd79a2e73789a4c903364162e54.tar.gz nextcloud-server-0024b67aaf1b5fd79a2e73789a4c903364162e54.zip | |
Check that set_time_limit is not disabled before calling it
Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
Diffstat (limited to 'apps/dav/appinfo')
| -rw-r--r-- | apps/dav/appinfo/v1/webdav.php | 4 | ||||
| -rw-r--r-- | apps/dav/appinfo/v2/remote.php | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/dav/appinfo/v1/webdav.php b/apps/dav/appinfo/v1/webdav.php index 5ad11ceada8..32f93b27760 100644 --- a/apps/dav/appinfo/v1/webdav.php +++ b/apps/dav/appinfo/v1/webdav.php @@ -24,7 +24,9 @@ */ // no php execution timeout for webdav -set_time_limit(0); +if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) { + @set_time_limit(0); +} ignore_user_abort(true); // Turn off output buffering to prevent memory problems diff --git a/apps/dav/appinfo/v2/remote.php b/apps/dav/appinfo/v2/remote.php index b4a6578a41a..3a00c8006ec 100644 --- a/apps/dav/appinfo/v2/remote.php +++ b/apps/dav/appinfo/v2/remote.php @@ -20,7 +20,9 @@ * */ // no php execution timeout for webdav -set_time_limit(0); +if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) { + @set_time_limit(0); +} ignore_user_abort(true); // Turn off output buffering to prevent memory problems |