sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-18 00:06:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace headersWritten by headersSent

Browse Source
This commit is contained in:
David Marteau 2017-01-07 21:31:26 +01:00
parent befc52a42b
commit 4f996980be
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/server/qgsserverresponse.sip
View File

@ -59,9 +59,9 @@ class QgsServerResponse
virtual QList<QString> headerKeys() const = 0; virtual QList<QString> headerKeys() const = 0;
/** /**
* Return true if the headers have alredy beeing written * Return true if the headers have alredy been sent
*/ */
virtual bool headersWritten() const = 0; virtual bool headersSent() const = 0;
/** Set the http return code /** Set the http return code
* @param code HTTP return code value * @param code HTTP return code value

24
src/server/qgsbufferserverresponse.cpp
View File

@ -30,9 +30,9 @@
QgsBufferServerResponse::QgsBufferServerResponse() QgsBufferServerResponse::QgsBufferServerResponse()
{ {
mBuffer.open( QIODevice::ReadWrite ); mBuffer.open( QIODevice::ReadWrite );
mHeadersWritten = false; mHeadersSent = false;
mFinished = false; mFinished = false;
mReturnCode = 200; mReturnCode = 200;
} }
QgsBufferServerResponse::~QgsBufferServerResponse() QgsBufferServerResponse::~QgsBufferServerResponse()
@ -42,13 +42,13 @@ QgsBufferServerResponse::~QgsBufferServerResponse()
void QgsBufferServerResponse::clearHeader( const QString& key ) void QgsBufferServerResponse::clearHeader( const QString& key )
{ {
if ( !mHeadersWritten ) if ( !mHeadersSent )
mHeaders.remove( key ); mHeaders.remove( key );
} }
void QgsBufferServerResponse::setHeader( const QString& key, const QString& value ) void QgsBufferServerResponse::setHeader( const QString& key, const QString& value )
{ {
if ( ! mHeadersWritten ) if ( ! mHeadersSent )
mHeaders.insert( key, value ); mHeaders.insert( key, value );
} }
@ -67,16 +67,16 @@ QList<QString> QgsBufferServerResponse::headerKeys() const
return mHeaders.keys(); return mHeaders.keys();
} }
bool QgsBufferServerResponse::headersWritten() const bool QgsBufferServerResponse::headersSent() const
{ {
return mHeadersWritten; return mHeadersSent;
} }
void QgsBufferServerResponse::sendError( int code, const QString& message ) void QgsBufferServerResponse::sendError( int code, const QString& message )
{ {
if ( mHeadersWritten ) if ( mHeadersSent )
{ {
QgsMessageLog::logMessage( "Cannot send error after headers written" ); QgsMessageLog::logMessage( "Cannot send error after headers sent" );
return; return;
} }
@ -100,7 +100,7 @@ void QgsBufferServerResponse::finish()
return; return;
} }
if ( !mHeadersWritten ) if ( !mHeadersSent )
{ {
if ( ! mHeaders.contains( "Content-Length" ) ) if ( ! mHeaders.contains( "Content-Length" ) )
{ {
@ -113,9 +113,9 @@ void QgsBufferServerResponse::finish()
void QgsBufferServerResponse::flush() void QgsBufferServerResponse::flush()
{ {
if ( ! mHeadersWritten ) if ( ! mHeadersSent )
{ {
mHeadersWritten = true; mHeadersSent = true;
} }
mBuffer.seek( 0 ); mBuffer.seek( 0 );

4
src/server/qgsbufferserverresponse.h
View File

@ -46,7 +46,7 @@ class QgsBufferServerResponse: public QgsServerResponse
virtual QList<QString> headerKeys() const override; virtual QList<QString> headerKeys() const override;
virtual bool headersWritten() const override; virtual bool headersSent() const override;
virtual void setReturnCode( int code ) override; virtual void setReturnCode( int code ) override;
@ -80,7 +80,7 @@ class QgsBufferServerResponse: public QgsServerResponse
QBuffer mBuffer; QBuffer mBuffer;
QByteArray mBody; QByteArray mBody;
bool mFinished; bool mFinished;
bool mHeadersWritten; bool mHeadersSent;
int mReturnCode; int mReturnCode;
}; };

14
src/server/qgsfcgiserverresponse.cpp
View File

@ -32,7 +32,7 @@
QgsFcgiServerResponse::QgsFcgiServerResponse( QgsServerRequest::Method method ) QgsFcgiServerResponse::QgsFcgiServerResponse( QgsServerRequest::Method method )
{ {
mBuffer.open( QIODevice::ReadWrite ); mBuffer.open( QIODevice::ReadWrite );
mHeadersWritten = false; mHeadersSent = false;
mFinished = false; mFinished = false;
mMethod = method; mMethod = method;
} }
@ -62,9 +62,9 @@ QList<QString> QgsFcgiServerResponse::headerKeys() const
return mHeaders.keys(); return mHeaders.keys();
} }
bool QgsFcgiServerResponse::headersWritten() const bool QgsFcgiServerResponse::headersSent() const
{ {
return mHeadersWritten; return mHeadersSent;
} }
void QgsFcgiServerResponse::setReturnCode( int code ) void QgsFcgiServerResponse::setReturnCode( int code )
@ -75,7 +75,7 @@ void QgsFcgiServerResponse::setReturnCode( int code )
void QgsFcgiServerResponse::sendError( int code, const QString& message ) void QgsFcgiServerResponse::sendError( int code, const QString& message )
{ {
if ( mHeadersWritten ) if ( mHeadersSent )
{ {
QgsMessageLog::logMessage( "Cannot send error after headers written" ); QgsMessageLog::logMessage( "Cannot send error after headers written" );
return; return;
@ -102,7 +102,7 @@ void QgsFcgiServerResponse::finish()
return; return;
} }
if ( !mHeadersWritten ) if ( !mHeadersSent )
{ {
if ( ! mHeaders.contains( "Content-Length" ) ) if ( ! mHeaders.contains( "Content-Length" ) )
{ {
@ -115,7 +115,7 @@ void QgsFcgiServerResponse::finish()
void QgsFcgiServerResponse::flush() void QgsFcgiServerResponse::flush()
{ {
if ( ! mHeadersWritten ) if ( ! mHeadersSent )
{ {
// Send all headers // Send all headers
QMap<QString, QString>::const_iterator it; QMap<QString, QString>::const_iterator it;
@ -127,7 +127,7 @@ void QgsFcgiServerResponse::flush()
fputs( "\n" , FCGI_stdout ); fputs( "\n" , FCGI_stdout );
} }
fputs( "\n", FCGI_stdout ); fputs( "\n", FCGI_stdout );
mHeadersWritten = true; mHeadersSent = true;
} }
mBuffer.seek( 0 ); mBuffer.seek( 0 );

4
src/server/qgsfcgiserverresponse.h
View File

@ -44,7 +44,7 @@ class QgsFcgiServerResponse: public QgsServerResponse
virtual QList<QString> headerKeys() const override; virtual QList<QString> headerKeys() const override;
virtual bool headersWritten() const override; virtual bool headersSent() const override;
virtual void setReturnCode( int code ) override; virtual void setReturnCode( int code ) override;
@ -67,7 +67,7 @@ class QgsFcgiServerResponse: public QgsServerResponse
QMap<QString, QString> mHeaders; QMap<QString, QString> mHeaders;
QBuffer mBuffer; QBuffer mBuffer;
bool mFinished; bool mFinished;
bool mHeadersWritten; bool mHeadersSent;
QgsServerRequest::Method mMethod; QgsServerRequest::Method mMethod;
}; };

2
src/server/qgsfilterresponsedecorator.h
View File

@ -49,7 +49,7 @@ class QgsFilterResponseDecorator: public QgsServerResponse
QList<QString> headerKeys() const override { return mResponse.headerKeys(); } QList<QString> headerKeys() const override { return mResponse.headerKeys(); }
bool headersWritten() const override { return mResponse.headersWritten(); } bool headersSent() const override { return mResponse.headersSent(); }
void setReturnCode( int code ) override { mResponse.setReturnCode( code ); } void setReturnCode( int code ) override { mResponse.setReturnCode( code ); }

2
src/server/qgsrequesthandler.cpp
View File

@ -100,7 +100,7 @@ QList<QString> QgsRequestHandler::headerKeys() const
bool QgsRequestHandler::headersSent() const bool QgsRequestHandler::headersSent() const
{ {
return mResponse.headersWritten(); return mResponse.headersSent();
} }

4
src/server/qgsserverresponse.h
View File

@ -68,9 +68,9 @@ class SERVER_EXPORT QgsServerResponse
virtual QList<QString> headerKeys() const = 0; virtual QList<QString> headerKeys() const = 0;
/** /**
* Return true if the headers have alredy beeing written * Return true if the headers have alredy been sent
*/ */
virtual bool headersWritten() const = 0; virtual bool headersSent() const = 0;
/** Set the http return code /** Set the http return code