summaryrefslogtreecommitdiffstats
path: root/src/HTTPServer
diff options
context:
space:
mode:
Diffstat (limited to 'src/HTTPServer')
-rw-r--r--src/HTTPServer/HTTPConnection.h8
-rw-r--r--src/HTTPServer/HTTPFormParser.h10
-rw-r--r--src/HTTPServer/HTTPMessage.h4
-rw-r--r--src/HTTPServer/HTTPServer.cpp12
-rw-r--r--src/HTTPServer/HTTPServer.h4
-rw-r--r--src/HTTPServer/MultipartParser.cpp8
-rw-r--r--src/HTTPServer/MultipartParser.h4
-rw-r--r--src/HTTPServer/SslHTTPConnection.h6
8 files changed, 28 insertions, 28 deletions
diff --git a/src/HTTPServer/HTTPConnection.h b/src/HTTPServer/HTTPConnection.h
index 6ea8a1ae8..052f93c17 100644
--- a/src/HTTPServer/HTTPConnection.h
+++ b/src/HTTPServer/HTTPConnection.h
@@ -90,16 +90,16 @@ protected:
size_t m_CurrentRequestBodyRemaining;
- // cSocketThreads::cCallback overrides:
+ // cSocketThreads::cCallback /*override*/s:
/** Data is received from the client.
Returns true if the connection has been closed as the result of parsing the data. */
- virtual bool DataReceived(const char * a_Data, size_t a_Size) override;
+ virtual bool DataReceived(const char * a_Data, size_t a_Size) /*override*/;
/** Data can be sent to client */
- virtual void GetOutgoingData(AString & a_Data) override;
+ virtual void GetOutgoingData(AString & a_Data) /*override*/;
/** The socket has been closed for any reason */
- virtual void SocketClosed(void) override;
+ virtual void SocketClosed(void) /*override*/;
} ;
typedef std::vector<cHTTPConnection *> cHTTPConnections;
diff --git a/src/HTTPServer/HTTPFormParser.h b/src/HTTPServer/HTTPFormParser.h
index edc6d2471..c70277380 100644
--- a/src/HTTPServer/HTTPFormParser.h
+++ b/src/HTTPServer/HTTPFormParser.h
@@ -103,11 +103,11 @@ protected:
/// Parses m_IncomingData as form-urlencoded data (fpkURL or fpkFormUrlEncoded kinds)
void ParseFormUrlEncoded(void);
- // cMultipartParser::cCallbacks overrides:
- virtual void OnPartStart (void) override;
- virtual void OnPartHeader(const AString & a_Key, const AString & a_Value) override;
- virtual void OnPartData (const char * a_Data, size_t a_Size) override;
- virtual void OnPartEnd (void) override;
+ // cMultipartParser::cCallbacks /*override*/s:
+ virtual void OnPartStart (void) /*override*/;
+ virtual void OnPartHeader(const AString & a_Key, const AString & a_Value) /*override*/;
+ virtual void OnPartData (const char * a_Data, size_t a_Size) /*override*/;
+ virtual void OnPartEnd (void) /*override*/;
} ;
diff --git a/src/HTTPServer/HTTPMessage.h b/src/HTTPServer/HTTPMessage.h
index c0667030f..81b9ffc61 100644
--- a/src/HTTPServer/HTTPMessage.h
+++ b/src/HTTPServer/HTTPMessage.h
@@ -149,8 +149,8 @@ protected:
*/
size_t ParseRequestLine(const char * a_Data, size_t a_Size);
- // cEnvelopeParser::cCallbacks overrides:
- virtual void OnHeaderLine(const AString & a_Key, const AString & a_Value) override;
+ // cEnvelopeParser::cCallbacks /*override*/s:
+ virtual void OnHeaderLine(const AString & a_Key, const AString & a_Value) /*override*/;
} ;
diff --git a/src/HTTPServer/HTTPServer.cpp b/src/HTTPServer/HTTPServer.cpp
index 8eabe5cb2..436f02a93 100644
--- a/src/HTTPServer/HTTPServer.cpp
+++ b/src/HTTPServer/HTTPServer.cpp
@@ -28,7 +28,7 @@ class cDebugCallbacks :
public cHTTPServer::cCallbacks,
protected cHTTPFormParser::cCallbacks
{
- virtual void OnRequestBegun(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) override
+ virtual void OnRequestBegun(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) /*override*/
{
UNUSED(a_Connection);
@@ -39,7 +39,7 @@ class cDebugCallbacks :
}
- virtual void OnRequestBody(cHTTPConnection & a_Connection, cHTTPRequest & a_Request, const char * a_Data, size_t a_Size) override
+ virtual void OnRequestBody(cHTTPConnection & a_Connection, cHTTPRequest & a_Request, const char * a_Data, size_t a_Size) /*override*/
{
UNUSED(a_Connection);
@@ -51,7 +51,7 @@ class cDebugCallbacks :
}
- virtual void OnRequestFinished(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) override
+ virtual void OnRequestFinished(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) /*override*/
{
cHTTPFormParser * FormParser = (cHTTPFormParser *)(a_Request.GetUserData());
if (FormParser != NULL)
@@ -95,19 +95,19 @@ class cDebugCallbacks :
}
- virtual void OnFileStart(cHTTPFormParser & a_Parser, const AString & a_FileName) override
+ virtual void OnFileStart(cHTTPFormParser & a_Parser, const AString & a_FileName) /*override*/
{
// TODO
}
- virtual void OnFileData(cHTTPFormParser & a_Parser, const char * a_Data, size_t a_Size) override
+ virtual void OnFileData(cHTTPFormParser & a_Parser, const char * a_Data, size_t a_Size) /*override*/
{
// TODO
}
- virtual void OnFileEnd(cHTTPFormParser & a_Parser) override
+ virtual void OnFileEnd(cHTTPFormParser & a_Parser) /*override*/
{
// TODO
}
diff --git a/src/HTTPServer/HTTPServer.h b/src/HTTPServer/HTTPServer.h
index 522b7da62..66506fe04 100644
--- a/src/HTTPServer/HTTPServer.h
+++ b/src/HTTPServer/HTTPServer.h
@@ -89,8 +89,8 @@ protected:
cCryptoKeyPtr m_CertPrivKey;
- // cListenThread::cCallback overrides:
- virtual void OnConnectionAccepted(cSocket & a_Socket) override;
+ // cListenThread::cCallback /*override*/s:
+ virtual void OnConnectionAccepted(cSocket & a_Socket) /*override*/;
/// Called by cHTTPConnection to close the connection (presumably due to an error)
void CloseConnection(cHTTPConnection & a_Connection);
diff --git a/src/HTTPServer/MultipartParser.cpp b/src/HTTPServer/MultipartParser.cpp
index 09732c5f7..b3ca833a3 100644
--- a/src/HTTPServer/MultipartParser.cpp
+++ b/src/HTTPServer/MultipartParser.cpp
@@ -57,25 +57,25 @@ ThisIsIgnoredEpilogue";
printf("Multipart parsing test finished\n");
}
- virtual void OnPartStart(void) override
+ virtual void OnPartStart(void) /*override*/
{
printf("Starting a new part\n");
}
- virtual void OnPartHeader(const AString & a_Key, const AString & a_Value) override
+ virtual void OnPartHeader(const AString & a_Key, const AString & a_Value) /*override*/
{
printf(" Hdr: \"%s\"=\"%s\"\n", a_Key.c_str(), a_Value.c_str());
}
- virtual void OnPartData(const char * a_Data, int a_Size) override
+ virtual void OnPartData(const char * a_Data, int a_Size) /*override*/
{
printf(" Data: %d bytes, \"%.*s\"\n", a_Size, a_Size, a_Data);
}
- virtual void OnPartEnd(void) override
+ virtual void OnPartEnd(void) /*override*/
{
printf("Part end\n");
}
diff --git a/src/HTTPServer/MultipartParser.h b/src/HTTPServer/MultipartParser.h
index ad76ad650..16a32920f 100644
--- a/src/HTTPServer/MultipartParser.h
+++ b/src/HTTPServer/MultipartParser.h
@@ -70,8 +70,8 @@ protected:
/** Parse one line of incoming data in the headers section of a part. The CRLF has already been stripped from a_Data / a_Size */
void ParseHeaderLine(const char * a_Data, size_t a_Size);
- // cEnvelopeParser overrides:
- virtual void OnHeaderLine(const AString & a_Key, const AString & a_Value) override;
+ // cEnvelopeParser /*override*/s:
+ virtual void OnHeaderLine(const AString & a_Key, const AString & a_Value) /*override*/;
} ;
diff --git a/src/HTTPServer/SslHTTPConnection.h b/src/HTTPServer/SslHTTPConnection.h
index c2c1585cd..5bcd642f3 100644
--- a/src/HTTPServer/SslHTTPConnection.h
+++ b/src/HTTPServer/SslHTTPConnection.h
@@ -35,9 +35,9 @@ protected:
/** The private key used for the certificate */
cCryptoKeyPtr m_PrivateKey;
- // cHTTPConnection overrides:
- virtual bool DataReceived (const char * a_Data, size_t a_Size) override; // Data is received from the client
- virtual void GetOutgoingData(AString & a_Data) override; // Data can be sent to client
+ // cHTTPConnection /*override*/s:
+ virtual bool DataReceived (const char * a_Data, size_t a_Size) /*override*/; // Data is received from the client
+ virtual void GetOutgoingData(AString & a_Data) /*override*/; // Data can be sent to client
} ;