sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6519 from elpaso/server-tempfile-fix

Browse Source 
[bugfix][server] Fix temporary path permission issue
This commit is contained in:
Alessandro Pasotti 2018-03-05 09:12:37 +01:00 committed by GitHub
commit 7aa830430f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/server/qgsserviceregistry.sip.in
View File

@ -59,7 +59,7 @@ services. A module may register multiple services.
The registry gain ownership of services and will call 'delete' on cleanup
:param service: a QgsServerResponse to be registered
:param service: a QgsService to be registered
%End
int unregisterService( const QString &name, const QString &version = QString() );

2
src/server/qgsserviceregistry.h
View File

@ -73,7 +73,7 @@ class SERVER_EXPORT QgsServiceRegistry
*
* The registry gain ownership of services and will call 'delete' on cleanup
*
* \param service a QgsServerResponse to be registered
* \param service a QgsService to be registered
*/
void registerService( QgsService *service SIP_TRANSFER );

7
src/server/services/wms/qgswmsrenderer.cpp
View File

@ -68,6 +68,7 @@
#include "qgsdxfexport.h"
#include "qgssymbollayerutils.h"
#include "qgslayoutitemlegend.h"
#include "qgsserverexception.h"
#include <QImage>
#include <QPainter>
@ -379,11 +380,11 @@ namespace QgsWms
configurePrintLayout( layout.get(), mapSettings );
// Get the temporary output file
QTemporaryFile tempOutputFile( QStringLiteral( "XXXXXX.%1" ).arg( formatString.toLower() ) );
QTemporaryFile tempOutputFile( QDir::tempPath() + '/' + QStringLiteral( "XXXXXX.%1" ).arg( formatString.toLower() ) );
if ( !tempOutputFile.open() )
{
// let the caller handle this
return nullptr;
throw QgsServerException( QStringLiteral( "Could not open temporary file for the GetPrint request." ) );
}
if ( formatString.compare( QLatin1String( "svg" ), Qt::CaseInsensitive ) == 0 )