Skip to content

Commit 4a76929

Browse files
committed
Port wmsserver changes to service
1 parent d8a05cc commit 4a76929

File tree

6 files changed

+193
-195
lines changed

6 files changed

+193
-195
lines changed

src/server/qgsfcgiserverresponse.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -180,38 +180,38 @@ QgsFcgiServerRequest::QgsFcgiServerRequest()
180180
QString uri = getenv( "REQUEST_URI" );
181181
if ( uri.isEmpty() )
182182
{
183-
uri = getenv( "SCRIPT_NAME");
183+
uri = getenv( "SCRIPT_NAME" );
184184
}
185185

186186
url.setUrl( uri );
187187

188188
// Check if host is defined
189-
if( url.host().isEmpty() )
189+
if ( url.host().isEmpty() )
190190
{
191-
url.setHost( getenv( "SERVER_NAME" ) );
191+
url.setHost( getenv( "SERVER_NAME" ) );
192192
}
193193

194194
// Port ?
195-
if( url.port(-1) == -1 )
195+
if ( url.port( -1 ) == -1 )
196196
{
197-
QString portString = getenv( "SERVER_PORT" );
198-
if ( !portString.isEmpty() )
197+
QString portString = getenv( "SERVER_PORT" );
198+
if ( !portString.isEmpty() )
199+
{
200+
bool portOk;
201+
int portNumber = portString.toInt( &portOk );
202+
if ( portOk && portNumber != 80 )
199203
{
200-
bool portOk;
201-
int portNumber = portString.toInt( &portOk );
202-
if ( portOk && portNumber != 80 )
203-
{
204-
url.setPort( portNumber );
205-
}
204+
url.setPort( portNumber );
206205
}
206+
}
207207
}
208208

209209
// scheme
210-
if( url.scheme().isEmpty() )
210+
if ( url.scheme().isEmpty() )
211211
{
212212
QString( getenv( "HTTPS" ) ).compare( QLatin1String( "on" ), Qt::CaseInsensitive ) == 0
213-
? url.setScheme( QStringLiteral( "https" ) )
214-
: url.setScheme( QStringLiteral( "http" ) );
213+
? url.setScheme( QStringLiteral( "https" ) )
214+
: url.setScheme( QStringLiteral( "http" ) );
215215
}
216216

217217
// XXX OGC paremetrs are passed with the query string

src/server/qgsfilterresponsedecorator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "qgsfilterresponsedecorator.h"
2222

2323
QgsFilterResponseDecorator::QgsFilterResponseDecorator( QgsServerFiltersMap filters, QgsServerResponse& response )
24-
: mFilters(filters)
25-
, mResponse(response)
24+
: mFilters( filters )
25+
, mResponse( response )
2626
{
2727
}
2828

src/server/qgsfilterresponsedecorator.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class QgsFilterResponseDecorator: public QgsServerResponse
4141

4242
// QgsServerResponse overrides
4343

44-
void setHeader( const QString& key, const QString& value ) override { mResponse.setHeader(key, value); }
44+
void setHeader( const QString& key, const QString& value ) override { mResponse.setHeader( key, value ); }
4545

4646
void clearHeader( const QString& key ) override { mResponse.clearHeader( key ); }
4747

@@ -51,7 +51,7 @@ class QgsFilterResponseDecorator: public QgsServerResponse
5151

5252
bool headersWritten() const override { return mResponse.headersWritten(); }
5353

54-
void setReturnCode( int code ) override { mResponse.setReturnCode( code ); }
54+
void setReturnCode( int code ) override { mResponse.setReturnCode( code ); }
5555

5656
void sendError( int code, const QString& message ) override { mResponse.sendError( code, message ); }
5757

@@ -62,8 +62,8 @@ class QgsFilterResponseDecorator: public QgsServerResponse
6262
void flush() override;
6363

6464
void clear() override { mResponse.clear(); }
65-
66-
65+
66+
6767

6868
private:
6969
QgsServerFiltersMap mFilters;

0 commit comments

Comments
 (0)