generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-02 17:50:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into pr/1113

Browse Source
This commit is contained in:
Alex Fabijanic 2016-03-10 08:57:21 -08:00
commit 31d23d2d2a
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,8 +44,6 @@ private:
#if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX) #if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX)
sem_t* _sem; sem_t* _sem;
#else #else
int _lockfd; // lock file descriptor
int _semfd; // file used to identify semaphore
int _semid; // semaphore id int _semid; // semaphore id
#endif #endif
}; };

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

@ -47,8 +47,6 @@ private:
#if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX) #if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX)
sem_t* _sem; sem_t* _sem;
#else #else
int _lockfd; // lock file descriptor
int _semfd; // file used to identify semaphore
int _semid; // semaphore id int _semid; // semaphore id
#endif #endif
}; };

1
MongoDB/include/Poco/MongoDB/GetMoreRequest.h
View File

@ -58,7 +58,6 @@ protected:
void buildRequest(BinaryWriter& writer); void buildRequest(BinaryWriter& writer);
private: private:
Int32 _flags;
std::string _fullCollectionName; std::string _fullCollectionName;
Int32 _numberToReturn; Int32 _numberToReturn;
Int64 _cursorID; Int64 _cursorID;

11
NetSSL_OpenSSL/src/SecureSocketImpl.cpp
View File

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

4
Redis/include/Poco/Redis/AsyncReader.h
View File

@ -67,10 +67,8 @@ private:
AsyncReader(const AsyncReader&); AsyncReader(const AsyncReader&);
AsyncReader& operator = (const AsyncReader&); AsyncReader& operator = (const AsyncReader&);
Activity<AsyncReader> _activity;
Client& _client; Client& _client;
Activity<AsyncReader> _activity;
}; };