Skip to content

Commit

Permalink
Merge pull request #6519 from elpaso/server-tempfile-fix
Browse files Browse the repository at this point in the history
[bugfix][server] Fix temporary path permission issue
  • Loading branch information
elpaso authored Mar 5, 2018
2 parents 993b9fd + c614b94 commit 7aa8304
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion python/server/qgsserviceregistry.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -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() );
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsserviceregistry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
7 changes: 4 additions & 3 deletions src/server/services/wms/qgswmsrenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
#include "qgsdxfexport.h"
#include "qgssymbollayerutils.h"
#include "qgslayoutitemlegend.h"
#include "qgsserverexception.h"

#include <QImage>
#include <QPainter>
Expand Down Expand Up @@ -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 )
Expand Down

0 comments on commit 7aa8304

Please sign in to comment.