lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-08-12 01:22:40 +03:00
Code Activity

Auto format code after merge

Browse Source
This commit is contained in:
bel
2016-05-22 21:34:59 +02:00
parent 23f8726eed
commit 92c91a67cc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/CivetServer.h
View File

@@ -198,7 +198,7 @@ class CIVETWEB_API CivetWebSocketHandler
* wrapper for mg_callbacks * wrapper for mg_callbacks
*/ */
struct CIVETWEB_API CivetCallbacks : public mg_callbacks { struct CIVETWEB_API CivetCallbacks : public mg_callbacks {
CivetCallbacks(); CivetCallbacks();
}; };
/** /**
@@ -226,7 +226,8 @@ class CIVETWEB_API CivetServer
* *
* @throws CivetException * @throws CivetException
*/ */
CivetServer(const char **options, const struct CivetCallbacks *callbacks = 0); CivetServer(const char **options,
const struct CivetCallbacks *callbacks = 0);
CivetServer(std::vector<std::string> options, CivetServer(std::vector<std::string> options,
const struct CivetCallbacks *callbacks = 0); const struct CivetCallbacks *callbacks = 0);

2
src/CivetServer.cpp
View File

@@ -265,7 +265,7 @@ CivetServer::webSocketCloseHandler(const struct mg_connection *conn,
CivetCallbacks::CivetCallbacks() CivetCallbacks::CivetCallbacks()
{ {
memset(this, 0, sizeof(*this)); memset(this, 0, sizeof(*this));
} }
CivetServer::CivetServer(const char **options, CivetServer::CivetServer(const char **options,