generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-09 11:17:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from pocoproject/develop

Browse Source 
upstream refresh
This commit is contained in:
Marian Krivoš 2014-12-09 14:44:10 +01:00
commit d01ec3f8c5
6 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -13,6 +13,8 @@
*.la *.la
*.a *.a
*.d *.d
*.vsp
*.psess
# Make # # Make #
######## ########

3
Foundation/include/Poco/Bugcheck.h
View File

@ -148,6 +148,9 @@ protected:
// //
GCC_DIAG_OFF(unused-local-typedefs) // supress numerous gcc warnings
template <bool x> template <bool x>
struct POCO_STATIC_ASSERTION_FAILURE; struct POCO_STATIC_ASSERTION_FAILURE;

9
Foundation/src/LogStream.cpp
View File

@ -47,9 +47,12 @@ int LogStreamBuf::writeToDevice(char c)
{ {
if (c == '\n' || c == '\r') if (c == '\n' || c == '\r')
{ {
Message msg(_logger.name(), _message, _priority); if (_message.find_first_not_of("\r\n") != std::string::npos)
_message.clear(); {
_logger.log(msg); Message msg(_logger.name(), _message, _priority);
_message.clear();
_logger.log(msg);
}
} }
else _message += c; else _message += c;
return c; return c;

10
Foundation/src/Path_WIN32.cpp
View File

@ -55,14 +55,16 @@ std::string PathImpl::systemImpl()
std::string PathImpl::homeImpl() std::string PathImpl::homeImpl()
{ {
std::string result; std::string result;
if (EnvironmentImpl::hasImpl("USERPROFILE"))
// windows service has no home dir, return system directory instead {
try result = EnvironmentImpl::getImpl("USERPROFILE");
}
else if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH"))
{ {
result = EnvironmentImpl::getImpl("HOMEDRIVE"); result = EnvironmentImpl::getImpl("HOMEDRIVE");
result.append(EnvironmentImpl::getImpl("HOMEPATH")); result.append(EnvironmentImpl::getImpl("HOMEPATH"));
} }
catch (NotFoundException&) else
{ {
result = systemImpl(); result = systemImpl();
} }

10
Foundation/src/Path_WIN32U.cpp
View File

@ -65,14 +65,16 @@ std::string PathImpl::systemImpl()
std::string PathImpl::homeImpl() std::string PathImpl::homeImpl()
{ {
std::string result; std::string result;
if (EnvironmentImpl::hasImpl("USERPROFILE"))
// windows service has no home dir, return system directory instead {
try result = EnvironmentImpl::getImpl("USERPROFILE");
}
else if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH"))
{ {
result = EnvironmentImpl::getImpl("HOMEDRIVE"); result = EnvironmentImpl::getImpl("HOMEDRIVE");
result.append(EnvironmentImpl::getImpl("HOMEPATH")); result.append(EnvironmentImpl::getImpl("HOMEPATH"));
} }
catch (NotFoundException&) else
{ {
result = systemImpl(); result = systemImpl();
} }

2
Net/include/Poco/Net/HTTPRequest.h
View File

@ -159,7 +159,7 @@ private:
enum Limits enum Limits
{ {
MAX_METHOD_LENGTH = 32, MAX_METHOD_LENGTH = 32,
MAX_URI_LENGTH = 4096, MAX_URI_LENGTH = 16384,
MAX_VERSION_LENGTH = 8 MAX_VERSION_LENGTH = 8
}; };