From: Björn Schießle <schiessle@owncloud.com>
Date: Wed, 12 Jun 2013 08:37:09 +0000 (+0200)
Subject: disable proxys during ssl root cert upload to avoid encryption
X-Git-Tag: v6.0.0alpha2~654^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=519508736d03efd765e7985207f35195dd97e7ca;p=nextcloud-server.git

disable proxys during ssl root cert upload to avoid encryption
---

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',