Update POCO library.

vendor/POCO/MongoDB/src/Array.cpp

@@ -20,7 +20,7 @@ namespace Poco {
 namespace MongoDB {
 
 
-Array::Array(): 
+Array::Array():
 	Document()
 {
 }
@@ -31,7 +31,7 @@ Array::~Array()
 }
 
 
-Element::Ptr Array::get(int pos) const
+Element::Ptr Array::get(std::size_t pos) const
 {
 	std::string name = Poco::NumberFormatter::format(pos);
 	return Document::get(name);

vendor/POCO/MongoDB/src/Cursor.cpp

@@ -33,6 +33,12 @@ Cursor::Cursor(const std::string& fullCollectionName, QueryRequest::Flags flags)
 }
 
 
+Cursor::Cursor(const Document& aggregationResponse) :
+    _query(aggregationResponse.get<Poco::MongoDB::Document::Ptr>("cursor")->get<std::string>("ns")),
+    _response(aggregationResponse.get<Poco::MongoDB::Document::Ptr>("cursor")->get<Int64>("id"))
+{
+}
+
 Cursor::~Cursor()
 {
 	try

vendor/POCO/MongoDB/src/Database.cpp

@@ -43,7 +43,7 @@ namespace
 	std::map<std::string, std::string> parseKeyValueList(const std::string& str)
 	{
 		std::map<std::string, std::string> kvm;
-		std::string::const_iterator it = str.begin(); 
+		std::string::const_iterator it = str.begin();
 		std::string::const_iterator end = str.end();
 		while (it != end)
 		{
@@ -66,7 +66,7 @@ namespace
 		Poco::StreamCopier::copyToString(decoder, result);
 		return result;
 	}
-	
+
 	std::string encodeBase64(const std::string& data)
 	{
 		std::ostringstream ostr;
@@ -133,8 +133,8 @@ bool Database::authenticate(Connection& connection, const std::string& username,
 {
 	if (username.empty()) throw Poco::InvalidArgumentException("empty username");
 	if (password.empty()) throw Poco::InvalidArgumentException("empty password");
-	
-	if (method == AUTH_MONGODB_CR) 
+
+	if (method == AUTH_MONGODB_CR)
 		return authCR(connection, username, password);
 	else if (method == AUTH_SCRAM_SHA1)
 		return authSCRAM(connection, username, password);
@@ -167,13 +167,13 @@ bool Database::authCR(Connection& connection, const std::string& username, const
 	md5.update(username);
 	md5.update(credsDigest);
 	std::string key = digestToHexString(md5);
-	
+
 	pCommand = createCommand();
 	pCommand->selector()
 		.add<Poco::Int32>("authenticate", 1)
 		.add<std::string>("user", username)
 		.add<std::string>("nonce", nonce)
-		.add<std::string>("key", key); 
+		.add<std::string>("key", key);
 
 	connection.sendRequest(*pCommand, response);
 	if (response.documents().size() > 0)
@@ -189,20 +189,20 @@ bool Database::authSCRAM(Connection& connection, const std::string& username, co
 {
 	std::string clientNonce(createNonce());
 	std::string clientFirstMsg = Poco::format("n=%s,r=%s", username, clientNonce);
-	
+
 	Poco::SharedPtr<QueryRequest> pCommand = createCommand();
 	pCommand->selector()
 		.add<Poco::Int32>("saslStart", 1)
 		.add<std::string>("mechanism", AUTH_SCRAM_SHA1)
 		.add<Binary::Ptr>("payload", new Binary(Poco::format("n,,%s", clientFirstMsg)))
-		.add<bool>("authAuthorize", true); 
-		
+		.add<bool>("authAuthorize", true);
+
 	ResponseMessage response;
 	connection.sendRequest(*pCommand, response);
-	
+
 	Int32 conversationId = 0;
 	std::string serverFirstMsg;
-	
+
 	if (response.documents().size() > 0)
 	{
 		Document::Ptr pDoc = response.documents()[0];
@@ -215,7 +215,7 @@ bool Database::authSCRAM(Connection& connection, const std::string& username, co
 		else return false;
 	}
 	else throw Poco::ProtocolException("empty response for saslStart");
-	
+
 	std::map<std::string, std::string> kvm = parseKeyValueList(serverFirstMsg);
 	const std::string serverNonce = kvm["r"];
 	const std::string salt = decodeBase64(kvm["s"]);
@@ -223,40 +223,40 @@ bool Database::authSCRAM(Connection& connection, const std::string& username, co
 	const Poco::UInt32 dkLen = 20;
 
 	std::string hashedPassword = hashCredentials(username, password);
-		
+
 	Poco::PBKDF2Engine<Poco::HMACEngine<Poco::SHA1Engine> > pbkdf2(salt, iterations, dkLen);
 	pbkdf2.update(hashedPassword);
 	std::string saltedPassword = digestToBinaryString(pbkdf2);
-	
+
 	std::string clientFinalNoProof = Poco::format("c=biws,r=%s", serverNonce);
 	std::string authMessage = Poco::format("%s,%s,%s", clientFirstMsg, serverFirstMsg, clientFinalNoProof);
-	
+
 	Poco::HMACEngine<Poco::SHA1Engine> hmacKey(saltedPassword);
 	hmacKey.update(std::string("Client Key"));
 	std::string clientKey = digestToBinaryString(hmacKey);
-	
+
 	Poco::SHA1Engine sha1;
 	sha1.update(clientKey);
 	std::string storedKey = digestToBinaryString(sha1);
-	
+
 	Poco::HMACEngine<Poco::SHA1Engine> hmacSig(storedKey);
 	hmacSig.update(authMessage);
 	std::string clientSignature = digestToBinaryString(hmacSig);
-	
+
 	std::string clientProof(clientKey);
 	for (std::size_t i = 0; i < clientProof.size(); i++)
 	{
 		clientProof[i] ^= clientSignature[i];
 	}
-	
+
 	std::string clientFinal = Poco::format("%s,p=%s", clientFinalNoProof, encodeBase64(clientProof));
-	
+
 	pCommand = createCommand();
 	pCommand->selector()
 		.add<Poco::Int32>("saslContinue", 1)
 		.add<Poco::Int32>("conversationId", conversationId)
 		.add<Binary::Ptr>("payload", new Binary(clientFinal));
-	
+
 	std::string serverSecondMsg;
 	connection.sendRequest(*pCommand, response);
 	if (response.documents().size() > 0)
@@ -274,17 +274,17 @@ bool Database::authSCRAM(Connection& connection, const std::string& username, co
 	Poco::HMACEngine<Poco::SHA1Engine> hmacSKey(saltedPassword);
 	hmacSKey.update(std::string("Server Key"));
 	std::string serverKey = digestToBinaryString(hmacSKey);
-	
+
 	Poco::HMACEngine<Poco::SHA1Engine> hmacSSig(serverKey);
 	hmacSSig.update(authMessage);
 	std::string serverSignature = digestToBase64(hmacSSig);
-	
+
 	kvm = parseKeyValueList(serverSecondMsg);
 	std::string serverSignatureReceived = kvm["v"];
-	
-	if (serverSignature != serverSignatureReceived) 	
+
+	if (serverSignature != serverSignatureReceived)
 		throw Poco::ProtocolException("server signature verification failed");
-	
+
 	pCommand = createCommand();
 	pCommand->selector()
 		.add<Poco::Int32>("saslContinue", 1)

vendor/POCO/MongoDB/src/DeleteRequest.cpp

@@ -20,8 +20,8 @@ namespace MongoDB {
 
 
 DeleteRequest::DeleteRequest(const std::string& collectionName, DeleteRequest::Flags flags):
-	RequestMessage(MessageHeader::OP_DELETE), 
-	_flags(flags), 
+	RequestMessage(MessageHeader::OP_DELETE),
+	_flags(flags),
 	_fullCollectionName(collectionName),
 	_selector()
 {

vendor/POCO/MongoDB/src/Element.cpp

@@ -24,7 +24,7 @@ Element::Element(const std::string& name) : _name(name)
 }
 
 
-Element::~Element() 
+Element::~Element()
 {
 }
 

vendor/POCO/MongoDB/src/GetMoreRequest.cpp

@@ -21,7 +21,7 @@ namespace MongoDB {
 
 
 GetMoreRequest::GetMoreRequest(const std::string& collectionName, Int64 cursorID):
-	RequestMessage(MessageHeader::OP_GET_MORE), 
+	RequestMessage(MessageHeader::OP_GET_MORE),
 	_fullCollectionName(collectionName),
 	_numberToReturn(100),
 	_cursorID(cursorID)

vendor/POCO/MongoDB/src/InsertRequest.cpp

@@ -20,7 +20,7 @@ namespace MongoDB {
 
 
 InsertRequest::InsertRequest(const std::string& collectionName, Flags flags):
-	RequestMessage(MessageHeader::OP_INSERT), 
+	RequestMessage(MessageHeader::OP_INSERT),
 	_flags(flags),
 	_fullCollectionName(collectionName)
 {

vendor/POCO/MongoDB/src/KillCursorsRequest.cpp

@@ -37,7 +37,7 @@ void KillCursorsRequest::buildRequest(BinaryWriter& writer)
 	for (std::vector<Int64>::iterator it = _cursors.begin(); it != _cursors.end(); ++it)
 	{
 		writer << *it;
-	}		
+	}
 }
 
 

vendor/POCO/MongoDB/src/Message.cpp

@@ -19,7 +19,7 @@ namespace Poco {
 namespace MongoDB {
 
 
-Message::Message(MessageHeader::OpCode opcode): 
+Message::Message(MessageHeader::OpCode opcode):
 	_header(opcode)
 {
 }

vendor/POCO/MongoDB/src/MessageHeader.cpp

@@ -20,10 +20,10 @@ namespace Poco {
 namespace MongoDB {
 
 
-MessageHeader::MessageHeader(OpCode opCode): 
-	_messageLength(0), 
-	_requestID(0), 
-	_responseTo(0), 
+MessageHeader::MessageHeader(OpCode opCode):
+	_messageLength(0),
+	_requestID(0),
+	_responseTo(0),
 	_opCode(opCode)
 {
 }

vendor/POCO/MongoDB/src/ObjectId.cpp

@@ -32,7 +32,7 @@ ObjectId::ObjectId(const std::string& id)
 	poco_assert_dbg(id.size() == 24);
 
     const char* p = id.c_str();
-    for (std::size_t i = 0; i < 12; ++i) 
+    for (std::size_t i = 0; i < 12; ++i)
     {
 		_id[i] = fromHex(p);
 		p += 2;

vendor/POCO/MongoDB/src/QueryRequest.cpp

@@ -20,10 +20,10 @@ namespace MongoDB {
 
 
 QueryRequest::QueryRequest(const std::string& collectionName, QueryRequest::Flags flags):
-	RequestMessage(MessageHeader::OP_QUERY), 
-	_flags(flags), 
+	RequestMessage(MessageHeader::OP_QUERY),
+	_flags(flags),
 	_fullCollectionName(collectionName),
-	_numberToSkip(0), 
+	_numberToSkip(0),
 	_numberToReturn(100),
 	_selector(),
 	_returnFieldSelector()

vendor/POCO/MongoDB/src/RegularExpression.cpp

@@ -25,8 +25,8 @@ RegularExpression::RegularExpression()
 }
 
 
-RegularExpression::RegularExpression(const std::string& pattern, const std::string& options): 
-	_pattern(pattern), 
+RegularExpression::RegularExpression(const std::string& pattern, const std::string& options):
+	_pattern(pattern),
 	_options(options)
 {
 }

vendor/POCO/MongoDB/src/ReplicaSet.cpp

@@ -21,7 +21,7 @@ namespace Poco {
 namespace MongoDB {
 
 
-ReplicaSet::ReplicaSet(const std::vector<Net::SocketAddress> &addresses): 
+ReplicaSet::ReplicaSet(const std::vector<Net::SocketAddress> &addresses):
 	_addresses(addresses)
 {
 }
@@ -81,8 +81,8 @@ Connection::Ptr ReplicaSet::isMaster(const Net::SocketAddress& address)
 	{
 		conn = 0;
 	}
-	
-	return 0; 
+
+	return 0;
 }
 
 

vendor/POCO/MongoDB/src/ResponseMessage.cpp

@@ -21,10 +21,20 @@ namespace MongoDB {
 
 
 ResponseMessage::ResponseMessage():
-	Message(MessageHeader::OP_REPLY), 
-	_responseFlags(0), 
-	_cursorID(0), 
-	_startingFrom(0), 
+	Message(MessageHeader::OP_REPLY),
+	_responseFlags(0),
+	_cursorID(0),
+	_startingFrom(0),
+	_numberReturned(0)
+{
+}
+
+
+ResponseMessage::ResponseMessage(const Int64& cursorID):
+	Message(MessageHeader::OP_REPLY),
+	_responseFlags(0),
+	_cursorID(cursorID),
+	_startingFrom(0),
 	_numberReturned(0)
 {
 }
@@ -50,7 +60,7 @@ void ResponseMessage::read(std::istream& istr)
 	clear();
 
 	BinaryReader reader(istr, BinaryReader::LITTLE_ENDIAN_BYTE_ORDER);
-	
+
 	_header.read(reader);
 
 	reader >> _responseFlags;

vendor/POCO/MongoDB/src/UpdateRequest.cpp

@@ -20,7 +20,7 @@ namespace MongoDB {
 
 
 UpdateRequest::UpdateRequest(const std::string& collectionName, UpdateRequest::Flags flags):
-	RequestMessage(MessageHeader::OP_UPDATE), 
+	RequestMessage(MessageHeader::OP_UPDATE),
 	_flags(flags),
 	_fullCollectionName(collectionName),
 	_selector(),