[X2Go-Commits] x2goclient.git - build-main (branch) updated: 4.0.1.1-11-gcf33d55
X2Go dev team
git-admin at x2go.org
Tue Dec 17 15:43:30 CET 2013
The branch, build-main has been updated
via cf33d551c21c86c7ea654914930550b0fd0b2c79 (commit)
from 8cade0ed5bc2e7595d394857f56308c55138f862 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 +++
httpbrokerclient.cpp | 10 +++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 05b5189..e484ba5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low
+ Provide Keywords: key in .desktop file.
+ Add NSIS packaging files for win32 builds to source tree.
(Files provided by Oleksandr Shneyder, thanks!!!).
+ + Store broker HTTPS certificate exceptions in
+ $HOME/.x2go/ssl/exceptions (before: $HOME/ssl/exceptions).
+ (Fixes: #328).
* Pull-in packaging changes from Debian.
[ Ricardo Díaz Martín ]
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index 603aadd..6d16b7b 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -532,10 +532,10 @@ void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors )
fname=fname.replace(":","_");
QUrl lurl ( config->brokerurl );
QString homeDir=mainWindow->getHomeDirectory();
- if ( QFile::exists ( homeDir+"/ssl/exceptions/"+
+ if ( QFile::exists ( homeDir+"/.x2go/ssl/exceptions/"+
lurl.host() +"/"+fname ) )
{
- QFile fl ( homeDir+"/ssl/exceptions/"+
+ QFile fl ( homeDir+"/.x2go/ssl/exceptions/"+
lurl.host() +"/"+fname );
fl.open ( QIODevice::ReadOnly | QIODevice::Text );
QSslCertificate mcert ( &fl );
@@ -606,14 +606,14 @@ void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors )
{
x2goDebug<<"accept certificate";
QDir dr;
- dr.mkpath ( homeDir+"/ssl/exceptions/"+lurl.host() +"/" );
- QFile fl ( homeDir+"/ssl/exceptions/"+
+ dr.mkpath ( homeDir+"/.x2go/ssl/exceptions/"+lurl.host() +"/" );
+ QFile fl ( homeDir+"/.x2go/ssl/exceptions/"+
lurl.host() +"/"+fname );
fl.open ( QIODevice::WriteOnly | QIODevice::Text );
QTextStream ( &fl ) <<cert.toPem();
fl.close();
http->ignoreSslErrors();
- x2goDebug<<"store certificate in "<<homeDir+"/ssl/exceptions/"+
+ x2goDebug<<"store certificate in "<<homeDir+"/.x2go/ssl/exceptions/"+
lurl.host() +"/"+fname;
requestTime.restart();
}
hooks/post-receive
--
x2goclient.git (X2Go Client)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).
More information about the x2go-commits
mailing list