generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-13 10:32:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pocoproject/poco into develop

Browse Source
This commit is contained in:
Guenter Obiltschnig 2014-12-02 09:08:23 +01:00
commit 755c31a4fd
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Foundation/include/Poco/AbstractEvent.h
View File

@ -54,7 +54,7 @@ class AbstractEvent
/// only. /// only.
/// ///
/// BasicEvent works with a standard delegate. They allow one object to register /// BasicEvent works with a standard delegate. They allow one object to register
/// onr or more delegates with an event. In contrast, a PriorityDelegate comes with an attached priority value /// one or more delegates with an event. In contrast, a PriorityDelegate comes with an attached priority value
/// and allows one object to register for one priority value one or more delegates. Note that PriorityDelegates /// and allows one object to register for one priority value one or more delegates. Note that PriorityDelegates
/// only work with PriorityEvents: /// only work with PriorityEvents:
/// ///

3
MongoDB/src/Database.cpp
View File

@ -80,9 +80,6 @@ Poco::MongoDB::Document::Ptr Database::ensureIndex(Connection& connection, const
insertRequest->documents().push_back(index); insertRequest->documents().push_back(index);
connection.sendRequest(*insertRequest); connection.sendRequest(*insertRequest);
insertRequest->documents().push_back(index);
connection.sendRequest(*insertRequest);
return getLastErrorDoc(connection); return getLastErrorDoc(connection);
} }

2
Net/samples/WebSocketServer/src/WebSocketServer.cpp
View File

@ -163,7 +163,7 @@ public:
app.logger().information(it->first + ": " + it->second); app.logger().information(it->first + ": " + it->second);
} }
if(request.find("Upgrade") != request.end() && request["Upgrade"] == "websocket") if(request.find("Upgrade") != request.end() && Poco::icompare(request["Upgrade"], "websocket") == 0)
return new WebSocketRequestHandler; return new WebSocketRequestHandler;
else else
return new PageRequestHandler; return new PageRequestHandler;