mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enable https for Windows binaries

Browse source 
This requires the ssleay32.dll and libeay32.dll to be copied into
packaging/windows, first.

Fixes #367

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-12-28 21:04:07 -08:00
parent 90ff8e672b
commit 7c8a39015a
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/windows/subsurface.nsi.in
View file

@ -106,7 +106,7 @@ Section
File /r translations
File iconv.dll
File libdivecomputer-0.dll
File libpng15-15.dll
File libpng16-16.dll
File libjpeg-*.dll
File libusb-1.0.dll
File libxml2-2.dll
@ -118,6 +118,8 @@ Section
File libstdc++-6.dll
File libmarblewidget*dll
File libssl-10.dll
File libeay32.dll
File ssleay32.dll
File Qt*4.dll
File subsurface.ico
File qt.conf

11
qt-ui/subsurfacewebservices.cpp
View file

@ -628,11 +628,7 @@ void DivelogsDeWebServices::startUpload()
ui.password->setEnabled(false);
QNetworkRequest request;
#ifdef WIN32
request.setUrl(QUrl("http://divelogs.de/DivelogsDirectImport.php"));
#else
request.setUrl(QUrl("https://divelogs.de/DivelogsDirectImport.php"));
#endif
request.setRawHeader("Accept", "text/xml, application/xml");
QHttpPart part;
@ -663,11 +659,7 @@ void DivelogsDeWebServices::startDownload()
ui.password->setEnabled(false);
QNetworkRequest request;
#ifdef WIN32
request.setUrl(QUrl("http://divelogs.de/xml_available_dives.php"));
#else
request.setUrl(QUrl("https://divelogs.de/xml_available_dives.php"));
#endif
request.setRawHeader("Accept", "text/xml, application/xml");
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
@ -711,8 +703,7 @@ void DivelogsDeWebServices::listDownloadFinished()
ui.status->setText(tr("Downloading %1 dives...").arg(diveList.idCount));
QNetworkRequest request;
// request.setUrl(QUrl("https://divelogs.de/DivelogsDirectExport.php"));
request.setUrl(QUrl("http://divelogs.de/DivelogsDirectExport.php"));
request.setUrl(QUrl("https://divelogs.de/DivelogsDirectExport.php"));
request.setRawHeader("Accept", "application/zip, */*");
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");