diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-16 12:27:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 12:27:26 +0100 |
| commit | 57c1be8633103f2e2ca74bad186c332713f4ef83 (patch) | |
| tree | a4b6b444ffcce7162ba8d2805ebc999526c9636b /apps | |
| parent | 7ca2f5f1374e2a1493c652772b4392f844346c52 (diff) | |
| parent | 786ee72146773966ed774ee9a8128fbb2a2a713a (diff) | |
| download | nextcloud-server-57c1be8633103f2e2ca74bad186c332713f4ef83.tar.gz nextcloud-server-57c1be8633103f2e2ca74bad186c332713f4ef83.zip | |
Merge pull request #3802 from Ko-/master
Check that set_time_limit is not disabled before calling it
Diffstat (limited to 'apps')
| -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 |