diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-12 09:43:04 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-12 09:43:04 +0200 |
| commit | 24b4806af4a9b485b4b9a772809d118e91c6d97f (patch) | |
| tree | df5664782eefd384bd6ed3dc363a25575da89202 /apps/files_external/ajax | |
| parent | 8793acfb4e751cfdb464d259de45249cec5d6398 (diff) | |
| parent | 3abe68176ff09ca579ff9e5f15872fb5cab8ff4d (diff) | |
| download | nextcloud-server-24b4806af4a9b485b4b9a772809d118e91c6d97f.tar.gz nextcloud-server-24b4806af4a9b485b4b9a772809d118e91c6d97f.zip | |
Merge branch 'master' into googledrive
Diffstat (limited to 'apps/files_external/ajax')
| -rw-r--r-- | apps/files_external/ajax/addRootCertificate.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php index 43fd6752c4a..ae349bfcd3a 100644 --- a/apps/files_external/ajax/addRootCertificate.php +++ b/apps/files_external/ajax/addRootCertificate.php @@ -29,8 +29,12 @@ if ($isValid == false) { // add the certificate if it could be verified if ( $isValid ) { + // disable proxy to prevent multiple fopen calls + $proxyStatus = \OC_FileProxy::$enabled; + \OC_FileProxy::$enabled = false; $view->file_put_contents($filename, $data); OC_Mount_Config::createCertificateBundle(); + \OC_FileProxy::$enabled = $proxyStatus; } else { OCP\Util::writeLog('files_external', 'Couldn\'t import SSL root certificate ('.$filename.'), allowed formats: PEM and DER', |