Merge remote-tracking branch 'pocoproject/develop' into MySQLOnTravis…

…AndAppVeyor
mean-ui-thread · Mar 10, 2016 · 41bbe9a · 41bbe9a
2 parents 1f6ccce + b2ac870
commit 41bbe9a
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/Foundation/include/Poco/NamedEvent_UNIX.h b/Foundation/include/Poco/NamedEvent_UNIX.h
@@ -44,8 +44,6 @@ class Foundation_API NamedEventImpl
 #if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX)
 	sem_t* _sem;
 #else
-	int _lockfd; // lock file descriptor
-	int _semfd;  // file used to identify semaphore
 	int _semid;  // semaphore id
 #endif
 };

diff --git a/Foundation/include/Poco/NamedMutex_UNIX.h b/Foundation/include/Poco/NamedMutex_UNIX.h
@@ -47,8 +47,6 @@ class Foundation_API NamedMutexImpl
 #if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX)
 	sem_t* _sem;
 #else
-	int _lockfd; // lock file descriptor
-	int _semfd;  // file used to identify semaphore
 	int _semid;  // semaphore id
 #endif
 };

diff --git a/Foundation/include/Poco/TaskManager.h b/Foundation/include/Poco/TaskManager.h
@@ -86,7 +86,7 @@ class Foundation_API TaskManager
 	TaskList taskList() const;
 		/// Returns a copy of the internal task list.
 
-	int count() const;
+	std::size_t count() const;
 		/// Returns the number of tasks in the internal task list.
 
 	void addObserver(const AbstractObserver& observer);
@@ -125,11 +125,11 @@ class Foundation_API TaskManager
 //
 // inlines
 //
-inline int TaskManager::count() const
+inline std::size_t TaskManager::count() const
 {
 	FastMutex::ScopedLock lock(_mutex);
 
-	return (int) _taskList.size();
+	return _taskList.size();
 }
 
 

diff --git a/Foundation/src/TaskManager.cpp b/Foundation/src/TaskManager.cpp
@@ -115,11 +115,12 @@ void TaskManager::taskStarted(Task* pTask)
 
 void TaskManager::taskProgress(Task* pTask, float progress)
 {
-	FastMutex::ScopedLock lock(_mutex);
+	ScopedLockWithUnlock<FastMutex> lock(_mutex);
 
 	if (_lastProgressNotification.isElapsed(MIN_PROGRESS_NOTIFICATION_INTERVAL))
 	{
 		_lastProgressNotification.update();
+		lock.unlock();
 		_nc.postNotification(new TaskProgressNotification(pTask, progress));
 	}
 }

diff --git a/MongoDB/include/Poco/MongoDB/GetMoreRequest.h b/MongoDB/include/Poco/MongoDB/GetMoreRequest.h
@@ -58,7 +58,6 @@ class MongoDB_API GetMoreRequest : public RequestMessage
 	void buildRequest(BinaryWriter& writer);
 
 private:
-	Int32 _flags;
 	std::string _fullCollectionName;
 	Int32 _numberToReturn;
 	Int64 _cursorID;

diff --git a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp
@@ -376,8 +376,15 @@ long SecureSocketImpl::verifyPeerCertificateImpl(const std::string& hostName)
 
 bool SecureSocketImpl::isLocalHost(const std::string& hostName)
 {
-	SocketAddress addr(hostName, 0);
-	return addr.host().isLoopback();
+	try
+	{
+		SocketAddress addr(hostName, 0);
+		return addr.host().isLoopback();
+	}
+	catch (Poco::Exception&)
+	{
+		return false;
+	}
 }
 
 

diff --git a/Redis/include/Poco/Redis/AsyncReader.h b/Redis/include/Poco/Redis/AsyncReader.h
@@ -67,10 +67,8 @@ class Redis_API AsyncReader
 	AsyncReader(const AsyncReader&);
 	AsyncReader& operator = (const AsyncReader&);
 
-
-	Activity<AsyncReader> _activity;
-
 	Client& _client;
+	Activity<AsyncReader> _activity;
 };