Skip to content

Commit 4f99698

Browse files
dmarteaudmarteau
committedJan 10, 2017
Replace headersWritten by headersSent
·
ltr-3_40final-3_0_0
1 parent befc52a commit 4f99698

8 files changed

+29
-29
lines changed
 

‎python/server/qgsserverresponse.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ class QgsServerResponse
5959
virtual QList<QString> headerKeys() const = 0;
6060

6161
/**
62-
* Return true if the headers have alredy beeing written
62+
* Return true if the headers have alredy been sent
6363
*/
64-
virtual bool headersWritten() const = 0;
64+
virtual bool headersSent() const = 0;
6565

6666
/** Set the http return code
6767
* @param code HTTP return code value

‎src/server/qgsbufferserverresponse.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
QgsBufferServerResponse::QgsBufferServerResponse()
3131
{
3232
mBuffer.open( QIODevice::ReadWrite );
33-
mHeadersWritten = false;
34-
mFinished = false;
35-
mReturnCode = 200;
33+
mHeadersSent = false;
34+
mFinished = false;
35+
mReturnCode = 200;
3636
}
3737

3838
QgsBufferServerResponse::~QgsBufferServerResponse()
@@ -42,13 +42,13 @@ QgsBufferServerResponse::~QgsBufferServerResponse()
4242

4343
void QgsBufferServerResponse::clearHeader( const QString& key )
4444
{
45-
if ( !mHeadersWritten )
45+
if ( !mHeadersSent )
4646
mHeaders.remove( key );
4747
}
4848

4949
void QgsBufferServerResponse::setHeader( const QString& key, const QString& value )
5050
{
51-
if ( ! mHeadersWritten )
51+
if ( ! mHeadersSent )
5252
mHeaders.insert( key, value );
5353
}
5454

@@ -67,16 +67,16 @@ QList<QString> QgsBufferServerResponse::headerKeys() const
6767
return mHeaders.keys();
6868
}
6969

70-
bool QgsBufferServerResponse::headersWritten() const
70+
bool QgsBufferServerResponse::headersSent() const
7171
{
72-
return mHeadersWritten;
72+
return mHeadersSent;
7373
}
7474

7575
void QgsBufferServerResponse::sendError( int code, const QString& message )
7676
{
77-
if ( mHeadersWritten )
77+
if ( mHeadersSent )
7878
{
79-
QgsMessageLog::logMessage( "Cannot send error after headers written" );
79+
QgsMessageLog::logMessage( "Cannot send error after headers sent" );
8080
return;
8181
}
8282

@@ -100,7 +100,7 @@ void QgsBufferServerResponse::finish()
100100
return;
101101
}
102102

103-
if ( !mHeadersWritten )
103+
if ( !mHeadersSent )
104104
{
105105
if ( ! mHeaders.contains( "Content-Length" ) )
106106
{
@@ -113,9 +113,9 @@ void QgsBufferServerResponse::finish()
113113

114114
void QgsBufferServerResponse::flush()
115115
{
116-
if ( ! mHeadersWritten )
116+
if ( ! mHeadersSent )
117117
{
118-
mHeadersWritten = true;
118+
mHeadersSent = true;
119119
}
120120

121121
mBuffer.seek( 0 );

‎src/server/qgsbufferserverresponse.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class QgsBufferServerResponse: public QgsServerResponse
4646

4747
virtual QList<QString> headerKeys() const override;
4848

49-
virtual bool headersWritten() const override;
49+
virtual bool headersSent() const override;
5050

5151
virtual void setReturnCode( int code ) override;
5252

@@ -80,7 +80,7 @@ class QgsBufferServerResponse: public QgsServerResponse
8080
QBuffer mBuffer;
8181
QByteArray mBody;
8282
bool mFinished;
83-
bool mHeadersWritten;
83+
bool mHeadersSent;
8484
int mReturnCode;
8585
};
8686

‎src/server/qgsfcgiserverresponse.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
QgsFcgiServerResponse::QgsFcgiServerResponse( QgsServerRequest::Method method )
3333
{
3434
mBuffer.open( QIODevice::ReadWrite );
35-
mHeadersWritten = false;
35+
mHeadersSent = false;
3636
mFinished = false;
3737
mMethod = method;
3838
}
@@ -62,9 +62,9 @@ QList<QString> QgsFcgiServerResponse::headerKeys() const
6262
return mHeaders.keys();
6363
}
6464

65-
bool QgsFcgiServerResponse::headersWritten() const
65+
bool QgsFcgiServerResponse::headersSent() const
6666
{
67-
return mHeadersWritten;
67+
return mHeadersSent;
6868
}
6969

7070
void QgsFcgiServerResponse::setReturnCode( int code )
@@ -75,7 +75,7 @@ void QgsFcgiServerResponse::setReturnCode( int code )
7575

7676
void QgsFcgiServerResponse::sendError( int code, const QString& message )
7777
{
78-
if ( mHeadersWritten )
78+
if ( mHeadersSent )
7979
{
8080
QgsMessageLog::logMessage( "Cannot send error after headers written" );
8181
return;
@@ -102,7 +102,7 @@ void QgsFcgiServerResponse::finish()
102102
return;
103103
}
104104

105-
if ( !mHeadersWritten )
105+
if ( !mHeadersSent )
106106
{
107107
if ( ! mHeaders.contains( "Content-Length" ) )
108108
{
@@ -115,7 +115,7 @@ void QgsFcgiServerResponse::finish()
115115

116116
void QgsFcgiServerResponse::flush()
117117
{
118-
if ( ! mHeadersWritten )
118+
if ( ! mHeadersSent )
119119
{
120120
// Send all headers
121121
QMap<QString, QString>::const_iterator it;
@@ -127,7 +127,7 @@ void QgsFcgiServerResponse::flush()
127127
fputs( "\n" , FCGI_stdout );
128128
}
129129
fputs( "\n", FCGI_stdout );
130-
mHeadersWritten = true;
130+
mHeadersSent = true;
131131
}
132132

133133
mBuffer.seek( 0 );

‎src/server/qgsfcgiserverresponse.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class QgsFcgiServerResponse: public QgsServerResponse
4444

4545
virtual QList<QString> headerKeys() const override;
4646

47-
virtual bool headersWritten() const override;
47+
virtual bool headersSent() const override;
4848

4949
virtual void setReturnCode( int code ) override;
5050

@@ -67,7 +67,7 @@ class QgsFcgiServerResponse: public QgsServerResponse
6767
QMap<QString, QString> mHeaders;
6868
QBuffer mBuffer;
6969
bool mFinished;
70-
bool mHeadersWritten;
70+
bool mHeadersSent;
7171
QgsServerRequest::Method mMethod;
7272
};
7373

‎src/server/qgsfilterresponsedecorator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class QgsFilterResponseDecorator: public QgsServerResponse
4949

5050
QList<QString> headerKeys() const override { return mResponse.headerKeys(); }
5151

52-
bool headersWritten() const override { return mResponse.headersWritten(); }
52+
bool headersSent() const override { return mResponse.headersSent(); }
5353

5454
void setReturnCode( int code ) override { mResponse.setReturnCode( code ); }
5555

‎src/server/qgsrequesthandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ QList<QString> QgsRequestHandler::headerKeys() const
100100

101101
bool QgsRequestHandler::headersSent() const
102102
{
103-
return mResponse.headersWritten();
103+
return mResponse.headersSent();
104104
}
105105

106106

‎src/server/qgsserverresponse.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ class SERVER_EXPORT QgsServerResponse
6868
virtual QList<QString> headerKeys() const = 0;
6969

7070
/**
71-
* Return true if the headers have alredy beeing written
71+
* Return true if the headers have alredy been sent
7272
*/
73-
virtual bool headersWritten() const = 0;
73+
virtual bool headersSent() const = 0;
7474

7575

7676
/** Set the http return code

0 commit comments

Comments
 (0)
Please sign in to comment.