Replace headersWritten by headersSent

dmarteau · dmarteau · commit 4f996980bebc · 2017-01-10T14:34:18.000+01:00
diff --git a/python/server/qgsserverresponse.sip b/python/server/qgsserverresponse.sip
@@ -59,9 +59,9 @@ class QgsServerResponse
     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
      * @param code HTTP return code value
diff --git a/src/server/qgsbufferserverresponse.cpp b/src/server/qgsbufferserverresponse.cpp
@@ -30,9 +30,9 @@
 QgsBufferServerResponse::QgsBufferServerResponse()
 {
   mBuffer.open( QIODevice::ReadWrite );
-  mHeadersWritten = false;
-  mFinished       = false;
-  mReturnCode     = 200;
+  mHeadersSent = false;
+  mFinished    = false;
+  mReturnCode  = 200;
 }
 
 QgsBufferServerResponse::~QgsBufferServerResponse()
@@ -42,13 +42,13 @@ QgsBufferServerResponse::~QgsBufferServerResponse()
 
 void QgsBufferServerResponse::clearHeader( const QString& key )
 {
-  if ( !mHeadersWritten )
+  if ( !mHeadersSent )
     mHeaders.remove( key );
 }
 
 void QgsBufferServerResponse::setHeader( const QString& key, const QString& value )
 {
-  if ( ! mHeadersWritten )
+  if ( ! mHeadersSent )
     mHeaders.insert( key, value );
 }
 
@@ -67,16 +67,16 @@ QList<QString> QgsBufferServerResponse::headerKeys() const
   return mHeaders.keys();
 }
 
-bool QgsBufferServerResponse::headersWritten() const
+bool QgsBufferServerResponse::headersSent() const
 {
-  return mHeadersWritten;
+  return mHeadersSent;
 }
 
 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;
   }
 
@@ -100,7 +100,7 @@ void QgsBufferServerResponse::finish()
     return;
   }
 
-  if ( !mHeadersWritten )
+  if ( !mHeadersSent )
   {
     if ( ! mHeaders.contains( "Content-Length" ) )
     {
@@ -113,9 +113,9 @@ void QgsBufferServerResponse::finish()
 
 void QgsBufferServerResponse::flush()
 {
-  if ( ! mHeadersWritten )
+  if ( ! mHeadersSent )
   {
-    mHeadersWritten = true;
+    mHeadersSent = true;
   }
 
   mBuffer.seek( 0 );
diff --git a/src/server/qgsbufferserverresponse.h b/src/server/qgsbufferserverresponse.h
@@ -46,7 +46,7 @@ class QgsBufferServerResponse: public QgsServerResponse
 
     virtual QList<QString> headerKeys() const override;
 
-    virtual bool headersWritten() const override;
+    virtual bool headersSent() const override;
 
     virtual void setReturnCode( int code ) override;
 
@@ -80,7 +80,7 @@ class QgsBufferServerResponse: public QgsServerResponse
     QBuffer                mBuffer;
     QByteArray             mBody;
     bool                   mFinished;
-    bool                   mHeadersWritten;
+    bool                   mHeadersSent;
     int                    mReturnCode;
 };
 
diff --git a/src/server/qgsfcgiserverresponse.cpp b/src/server/qgsfcgiserverresponse.cpp
@@ -32,7 +32,7 @@
 QgsFcgiServerResponse::QgsFcgiServerResponse( QgsServerRequest::Method method )
 {
   mBuffer.open( QIODevice::ReadWrite );
-  mHeadersWritten = false;
+  mHeadersSent    = false;
   mFinished       = false;
   mMethod         = method;
 }
@@ -62,9 +62,9 @@ QList<QString> QgsFcgiServerResponse::headerKeys() const
   return mHeaders.keys();
 }
 
-bool QgsFcgiServerResponse::headersWritten() const
+bool QgsFcgiServerResponse::headersSent() const
 {
-  return mHeadersWritten;
+  return mHeadersSent;
 }
 
 void QgsFcgiServerResponse::setReturnCode( int code )
@@ -75,7 +75,7 @@ void QgsFcgiServerResponse::setReturnCode( int code )
 
 void QgsFcgiServerResponse::sendError( int code,  const QString& message )
 {
-  if ( mHeadersWritten )
+  if ( mHeadersSent )
   {
     QgsMessageLog::logMessage( "Cannot send error after headers written" );
     return;
@@ -102,7 +102,7 @@ void QgsFcgiServerResponse::finish()
     return;
   }
 
-  if ( !mHeadersWritten )
+  if ( !mHeadersSent )
   {
     if ( ! mHeaders.contains( "Content-Length" ) )
     {
@@ -115,7 +115,7 @@ void QgsFcgiServerResponse::finish()
 
 void QgsFcgiServerResponse::flush()
 {
-  if ( ! mHeadersWritten )
+  if ( ! mHeadersSent )
   {
     // Send all headers
     QMap<QString, QString>::const_iterator it;
@@ -127,7 +127,7 @@ void QgsFcgiServerResponse::flush()
       fputs( "\n" , FCGI_stdout );
     }
     fputs( "\n", FCGI_stdout );
-    mHeadersWritten = true;
+    mHeadersSent = true;
   }
 
   mBuffer.seek( 0 );
diff --git a/src/server/qgsfcgiserverresponse.h b/src/server/qgsfcgiserverresponse.h
@@ -44,7 +44,7 @@ class QgsFcgiServerResponse: public QgsServerResponse
 
     virtual QList<QString> headerKeys() const override;
 
-    virtual bool headersWritten() const override;
+    virtual bool headersSent() const override;
 
     virtual void setReturnCode( int code ) override;
 
@@ -67,7 +67,7 @@ class QgsFcgiServerResponse: public QgsServerResponse
     QMap<QString, QString> mHeaders;
     QBuffer                mBuffer;
     bool                   mFinished;
-    bool                   mHeadersWritten;
+    bool                   mHeadersSent;
     QgsServerRequest::Method mMethod;
 };
 
diff --git a/src/server/qgsfilterresponsedecorator.h b/src/server/qgsfilterresponsedecorator.h
@@ -49,7 +49,7 @@ class QgsFilterResponseDecorator: public QgsServerResponse
 
     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 ); }
 
diff --git a/src/server/qgsrequesthandler.cpp b/src/server/qgsrequesthandler.cpp
@@ -100,7 +100,7 @@ QList<QString> QgsRequestHandler::headerKeys() const
 
 bool QgsRequestHandler::headersSent() const
 {
-  return mResponse.headersWritten();
+  return mResponse.headersSent();
 }
 
 
diff --git a/src/server/qgsserverresponse.h b/src/server/qgsserverresponse.h
@@ -68,9 +68,9 @@ class SERVER_EXPORT QgsServerResponse
     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

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@`
`30`	`30`	`QgsBufferServerResponse::QgsBufferServerResponse()`
`31`	`31`	`{`
`32`	`32`	`mBuffer.open( QIODevice::ReadWrite );`
`33`		`- mHeadersWritten = false;`
`34`		`- mFinished = false;`
`35`		`- mReturnCode = 200;`
	`33`	`+ mHeadersSent = false;`
	`34`	`+ mFinished = false;`
	`35`	`+ mReturnCode = 200;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`QgsBufferServerResponse::~QgsBufferServerResponse()`
`@@ -42,13 +42,13 @@ QgsBufferServerResponse::~QgsBufferServerResponse()`
`42`	`42`
`43`	`43`	`void QgsBufferServerResponse::clearHeader( const QString& key )`
`44`	`44`	`{`
`45`		`- if ( !mHeadersWritten )`
	`45`	`+ if ( !mHeadersSent )`
`46`	`46`	`mHeaders.remove( key );`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`void QgsBufferServerResponse::setHeader( const QString& key, const QString& value )`
`50`	`50`	`{`
`51`		`- if ( ! mHeadersWritten )`
	`51`	`+ if ( ! mHeadersSent )`
`52`	`52`	`mHeaders.insert( key, value );`
`53`	`53`	`}`
`54`	`54`
`@@ -67,16 +67,16 @@ QList<QString> QgsBufferServerResponse::headerKeys() const`
`67`	`67`	`return mHeaders.keys();`
`68`	`68`	`}`
`69`	`69`
`70`		`-bool QgsBufferServerResponse::headersWritten() const`
	`70`	`+bool QgsBufferServerResponse::headersSent() const`
`71`	`71`	`{`
`72`		`- return mHeadersWritten;`
	`72`	`+ return mHeadersSent;`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`void QgsBufferServerResponse::sendError( int code, const QString& message )`
`76`	`76`	`{`
`77`		`- if ( mHeadersWritten )`
	`77`	`+ if ( mHeadersSent )`
`78`	`78`	`{`
`79`		`- QgsMessageLog::logMessage( "Cannot send error after headers written" );`
	`79`	`+ QgsMessageLog::logMessage( "Cannot send error after headers sent" );`
`80`	`80`	`return;`
`81`	`81`	`}`
`82`	`82`
`@@ -100,7 +100,7 @@ void QgsBufferServerResponse::finish()`
`100`	`100`	`return;`
`101`	`101`	`}`
`102`	`102`
`103`		`- if ( !mHeadersWritten )`
	`103`	`+ if ( !mHeadersSent )`
`104`	`104`	`{`
`105`	`105`	`if ( ! mHeaders.contains( "Content-Length" ) )`
`106`	`106`	`{`
`@@ -113,9 +113,9 @@ void QgsBufferServerResponse::finish()`
`113`	`113`
`114`	`114`	`void QgsBufferServerResponse::flush()`
`115`	`115`	`{`
`116`		`- if ( ! mHeadersWritten )`
	`116`	`+ if ( ! mHeadersSent )`
`117`	`117`	`{`
`118`		`- mHeadersWritten = true;`
	`118`	`+ mHeadersSent = true;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`mBuffer.seek( 0 );`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`QgsFcgiServerResponse::QgsFcgiServerResponse( QgsServerRequest::Method method )`
`33`	`33`	`{`
`34`	`34`	`mBuffer.open( QIODevice::ReadWrite );`
`35`		`- mHeadersWritten = false;`
	`35`	`+ mHeadersSent = false;`
`36`	`36`	`mFinished = false;`
`37`	`37`	`mMethod = method;`
`38`	`38`	`}`
`@@ -62,9 +62,9 @@ QList<QString> QgsFcgiServerResponse::headerKeys() const`
`62`	`62`	`return mHeaders.keys();`
`63`	`63`	`}`
`64`	`64`
`65`		`-bool QgsFcgiServerResponse::headersWritten() const`
	`65`	`+bool QgsFcgiServerResponse::headersSent() const`
`66`	`66`	`{`
`67`		`- return mHeadersWritten;`
	`67`	`+ return mHeadersSent;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`void QgsFcgiServerResponse::setReturnCode( int code )`
`@@ -75,7 +75,7 @@ void QgsFcgiServerResponse::setReturnCode( int code )`
`75`	`75`
`76`	`76`	`void QgsFcgiServerResponse::sendError( int code, const QString& message )`
`77`	`77`	`{`
`78`		`- if ( mHeadersWritten )`
	`78`	`+ if ( mHeadersSent )`
`79`	`79`	`{`
`80`	`80`	`QgsMessageLog::logMessage( "Cannot send error after headers written" );`
`81`	`81`	`return;`
`@@ -102,7 +102,7 @@ void QgsFcgiServerResponse::finish()`
`102`	`102`	`return;`
`103`	`103`	`}`
`104`	`104`
`105`		`- if ( !mHeadersWritten )`
	`105`	`+ if ( !mHeadersSent )`
`106`	`106`	`{`
`107`	`107`	`if ( ! mHeaders.contains( "Content-Length" ) )`
`108`	`108`	`{`
`@@ -115,7 +115,7 @@ void QgsFcgiServerResponse::finish()`
`115`	`115`
`116`	`116`	`void QgsFcgiServerResponse::flush()`
`117`	`117`	`{`
`118`		`- if ( ! mHeadersWritten )`
	`118`	`+ if ( ! mHeadersSent )`
`119`	`119`	`{`
`120`	`120`	`// Send all headers`
`121`	`121`	`QMap<QString, QString>::const_iterator it;`
`@@ -127,7 +127,7 @@ void QgsFcgiServerResponse::flush()`
`127`	`127`	`fputs( "\n" , FCGI_stdout );`
`128`	`128`	`}`
`129`	`129`	`fputs( "\n", FCGI_stdout );`
`130`		`- mHeadersWritten = true;`
	`130`	`+ mHeadersSent = true;`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`mBuffer.seek( 0 );`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ QList<QString> QgsRequestHandler::headerKeys() const`
`100`	`100`
`101`	`101`	`bool QgsRequestHandler::headersSent() const`
`102`	`102`	`{`
`103`		`- return mResponse.headersWritten();`
	`103`	`+ return mResponse.headersSent();`
`104`	`104`	`}`
`105`	`105`
`106`	`106`