Commit Graph

3194 Commits

Author SHA1 Message Date
Marian Krivos
7d1ac2014c Merge branch 'develop' of https://github.com/pocoproject/poco into pocoproject-develop
# Conflicts:
#	.gitignore
2015-06-15 20:25:59 +02:00
Aleksandar Fabijanic
2d6fc27dd1 Var BadCastException #861 2015-06-10 09:03:12 -05:00
Alex Fabijanic
006f9e4d59 updated gitignore 2015-06-09 23:08:47 -05:00
Aleksandar Fabijanic
86a33e9b75 style fixes 2015-06-09 23:04:48 -05:00
Aleksandar Fabijanic
99f013f678 Merge pull request #852 from fbraem/develop
Database::count() can parse different types of 'n' attribute in result.
2015-06-05 08:59:32 -05:00
Aleksandar Fabijanic
753db852fb Merge pull request #856 from Torndeco/patch-1
CMake Fix for non MSVC Installs
2015-06-05 08:58:53 -05:00
Torndeco
0859133d47 CMake Fix for non MSVC Installs
The return function is causing Data/CMakeLists.txt to exit early before they include sub directories.
i.e Data/MySQL Data/ODBC  Data/SQLite

http://www.cmake.org/cmake/help/v3.0/command/return.html
2015-06-05 03:04:08 +01:00
Aleksandar Fabijanic
348ffed548 Merge pull request #854 from larivierec/patch-1
remove un-needed headers
2015-06-04 18:31:55 -05:00
Christopher Lariviere
f3ad7bb9ac remove un-needed headers
These files were there multiple times and may be just a simple aesthetic problem.
They are included in [WebSocket.h](https://github.com/tml1024/poco/blob/develop/Net/include/Poco/Net/WebSocket.h)
2015-06-03 16:39:34 -04:00
unknown
1c26b58452 Optional force scan for DirectoryWatcher #853 2015-06-03 14:55:05 -05:00
fbraem
aaabc3c9e9 Database::count() can parse different types of 'n' attribute in result. 2015-06-03 20:34:05 +02:00
Guenter Obiltschnig
5b80826437 added HTTPServerRequest::secure() method 2015-06-02 20:51:33 +02:00
Aleksandar Fabijanic
3baf590485 Merge pull request #850 from pwm1234/feature/cmake-pwm-squashed
cmake improvements for msvc
2015-06-02 13:36:25 -05:00
Philip Miller
f918793228 add macro POCO_INSTALL_PDB to install MSVC pdb files 2015-06-02 12:05:15 -04:00
Philip Miller
2efe9b05cb add option ENABLE_MSVC_MP for parallel MSVC builds 2015-06-02 12:04:31 -04:00
unknown
86301edc09 Merge branch 'develop' of https://github.com/pocoproject/poco into develop 2015-06-01 10:30:30 -05:00
unknown
956f38574a optimize order preservation (keep pointers to keys instead of copies); remove (unnecessary) prserveOrder flag from Stringifier::stringify() 2015-06-01 10:29:51 -05:00
Aleksandar Fabijanic
f2d1ae2cee Merge pull request #846 from matejk/develop-thread-os-id
Posix OS thread ID, added %O (thread ID) to logger
2015-06-01 09:35:09 -05:00
unknown
4ac92e5cb2 JSON Stringifier fails with preserve insert order #819 2015-06-01 09:28:00 -05:00
Matej Kenda
e26bb65a5b Logger: added %O to message format to display numeric thread id in logs. 2015-06-01 10:00:56 +02:00
Matej Kenda
f1e6cba313 Thread POSIX: tid is numeric OS thread ID on Linux and OSX instead of pthread_t. 2015-06-01 09:59:01 +02:00
Aleksandar Fabijanic
375eca2ec4 Problem with make install command #842 2015-05-29 10:56:18 -05:00
Aleksandar Fabijanic
15a7bc3a0b Merge pull request #841 from fbraem/develop
Added const to Document/Array::isType
2015-05-28 12:16:28 -05:00
fbraem
0a68bbfbea Fix: indentation of array elements in toString(). 2015-05-28 16:39:24 +02:00
fbraem
623dfe7606 Added const to Document/Array::isType 2015-05-28 16:32:00 +02:00
Aleksandar Fabijanic
57daa51b1b Merge pull request #839 from matejk/develop-objectpool
Timeout in ObjectPool not to return null immediately if max capacity is exhausted.
2015-05-27 21:33:55 -05:00
Matej Kenda
01fc7f2e1c Added condition variable and timeout to ObjectPool::borrowObject/returnObject to block caller until an object is available. 2015-05-27 14:01:39 +02:00
Aleksandar Fabijanic
9ce48223e9 Merge pull request #835 from aaboyd/link-android-log
add 'log' to SYSLIBS when compiling Foundation for android
2015-05-26 18:42:42 -05:00
Alex Boyd
c23f6f0b57 add 'log' to SYSLIBS when compiling Foundation for android 2015-05-26 15:37:36 -04:00
Aleksandar Fabijanic
92f287ffd8 Merge pull request #833 from fbraem/develop
Add SELECT ... WHERE field IN ( ... ) sample
2015-05-25 15:13:06 -05:00
fbraem
ca1a79f6b1 Add SELECT ... WHERE field IN ( ... ) sample 2015-05-25 20:33:42 +02:00
Alex Fabijanic
6ef38bff0b updated Crypto and NetSSL VS projects, progen files; rebuilt openssl binaries 2015-05-22 00:11:56 -05:00
Alex Fabijanic
d0e22dbbdd move openssl headers 2015-05-21 20:06:25 -05:00
Alex Fabijanic
f38cf4a484 removed openssl headers, updated Crypto, teststuie progen files and VS projects 2015-05-21 20:05:44 -05:00
Alex Fabijanic
995832639e Merge branch 'develop' into OpenSSLBuild 2015-05-21 19:46:58 -05:00
Marian Krivos
4fe4c55a67 git ignnore 2015-05-21 19:54:57 +02:00
Marian Krivoš
c96ad153bf Merge pull request #13 from pocoproject/develop
Sync 21.5.2015
2015-05-21 19:51:51 +02:00
Günter Obiltschnig
9dce2a10d2 Merge pull request #825 from gpongelli/develop
Update OpenSSL initialize to use alse not deprecated code
2015-05-21 09:31:25 +02:00
Aleksandar Fabijanic
54e704428f Merge pull request #820 from Gamadril/develop
Fixed issue #705 Error building with ENABLE_UTIL=ON and ENABLE_XML=OFF
2015-05-20 19:03:39 -05:00
gpongelli
b6f0f24d70 Merge pull request #1 from gpongelli/openssl_1.0.2a_patch
Update OpenSSL initialize with not deprecated code
2015-05-21 00:40:58 +02:00
Günter Obiltschnig
abdb04a52f Merge pull request #824 from gpongelli/patch-1
Update iPhone TOOL_PREFIX path and compilers
2015-05-20 19:19:12 +02:00
gpongelli
82cbabc27b Update OpenSSL initialize with not deprecated code
OpenSSL's 1.0.2a CRYPTO_set_id_callback is deprecated.
This patch let use OpenSSL with deprecated code and with newer and not deprecated ones.
2015-05-20 19:13:28 +02:00
Gamadril
05f5a0946b Fixed issue #705 Error building with ENABLE_UTIL=ON and ENABLE_XML=OFF 2015-05-19 16:12:39 +02:00
Aleksandar Fabijanic
70f6bbde8e Update FAQ.md 2015-05-18 20:50:10 -05:00
Aleksandar Fabijanic
a4879c69ea Update FAQ.md 2015-05-18 19:52:02 -05:00
Aleksandar Fabijanic
5f9a02c449 Create FAQ.md 2015-05-18 19:43:28 -05:00
Aleksandar Fabijanic
45ab455174 JSON Stringifier fails with preserve insert order #819 2015-05-14 22:10:45 -05:00
Aleksandar Fabijanic
95a61b9844 Merge pull request #818 from fbraem/develop
Fix #817 - Use std::list instead of std::set for storing elements in Document
2015-05-14 15:42:12 -05:00
fbraem
7cfd70d56f $orderby must be -1 or 1. The latest MongoDB release throws an error when using 0. 2015-05-14 18:36:18 +02:00
fbraem
732ae1c75a Add testCommand 2015-05-14 18:35:13 +02:00