Commit Graph

3814 Commits

Author SHA1 Message Date
Constantin Rack
eb34533728 Merge pull request #1367 from evoskuil/master
Problem: wrong default VC rt lib for release dynamic exe.
2015-03-14 13:18:06 +01:00
evoskuil
1e27b364a4 Fix default VC rt lib for release dynamic exe. 2015-03-14 05:10:40 -07:00
Constantin Rack
6b06bc310f Merge pull request #1366 from xantares/patch-1
fix CMP0053 warning with cmake 3.1
2015-03-11 10:46:06 +01:00
xantares
032c5eda3d fix CMP0053 warning with cmake 3.1 2015-03-11 10:35:59 +01:00
Constantin Rack
ec4200a9d3 Merge pull request #1365 from xantares/master
fix cmake build system
2015-03-11 10:25:45 +01:00
xantares
0f24f675f5 set soversion without ZMQ_BUILD_FRAMEWORK 2015-03-11 09:15:40 +00:00
xantares
80044c9ed6 mutualize win32 flags 2015-03-11 09:10:23 +00:00
xantares
7dfa7b7a5d do not mix DLL_EXPORT & ZMQ_STATIC definitions 2015-03-11 09:03:21 +00:00
xantares
1d2b34dbe4 install *.txt in share/zmq 2015-03-11 08:51:59 +00:00
xantares
866e752b04 do not install sources 2015-03-11 08:50:39 +00:00
Constantin Rack
1a5ced9f47 Merge pull request #1361 from rodgert/master
Allow zmq_msg_gets checks to assert rather than segfault
2015-02-20 05:59:31 +01:00
Thomas Rodgers
d47980a6ed Allow zmq_msg_gets checks to assert rather than segfault 2015-02-19 20:28:10 -06:00
Pieter Hintjens
f053854e51 Merge pull request #1360 from hurtonm/master
Adjust number of sent messages on hiccups
2015-02-19 22:09:58 +01:00
Martin Hurton
5ed6ac60e2 Adjust number of sent messages on hiccups
Not adjusting the sent message count may lead to situation when SUB
socket does not forward its subscriptions.
2015-02-19 21:47:26 +01:00
Constantin Rack
b7e52755e4 Merge pull request #1359 from rodgert/master
resolve #1347 addresses issue of no metadata on identity frame
2015-02-19 20:33:32 +01:00
Thomas Rodgers
700f7bfede resolve #1347 addresses issue of no metadata on identity frame 2015-02-19 13:22:32 -06:00
Pieter Hintjens
1e6e5b1c0a Merge pull request #1357 from rodgert/master
Support limited metadata for STREAM sockets
2015-02-19 09:25:53 +01:00
Thomas Rodgers
4b948b1f3b Code cleanup 2015-02-18 21:24:57 -06:00
Thomas Rodgers
cf0804bb7c Remove unused include 2015-02-18 21:10:50 -06:00
Thomas Rodgers
8daa74dc77 Fix comment from prior commit 2015-02-18 13:05:05 -06:00
Thomas Rodgers
fefe0d42fa Update gitignore to include recently added tests for server sockets 2015-02-18 12:30:05 -06:00
Thomas Rodgers
638ddeb404 resolve #1347 Support limited metadata for STREAM sockets 2015-02-18 12:28:58 -06:00
Joe Eli McIlvain
8a526874ab Merge pull request #1356 from rodgert/master
Fix autogen.sh warning about trailing whitespace
2015-02-18 09:07:58 -09:00
Thomas Rodgers
39338e2fe4 Fix autogen.sh warning about trailing whitespace 2015-02-18 12:02:24 -06:00
Pieter Hintjens
fe2ce47a44 Merge pull request #1355 from evoskuil/master
Fix error return for clock_gettime.
2015-02-14 08:18:46 +01:00
evoskuil
bc53d710ff Fix error return for clock_gettime. 2015-02-13 23:10:39 -08:00
Pieter Hintjens
759c3e314c Merge pull request #1354 from evoskuil/master
Problem: build break in OSX, VS2010, VS2012
2015-02-14 07:59:24 +01:00
evoskuil
a8f11b3c3d Add clock_gettime implementation for OSX. 2015-02-13 22:50:28 -08:00
evoskuil
6630f19686 Apply VS2013 changes to VS2010 and VS2012. 2015-02-13 15:08:17 -08:00
Pieter Hintjens
55886b8b46 Merge pull request #1352 from somdoron/master
thread safety bug - lock when sending
2015-02-13 09:10:18 +01:00
somdoron
deaa89656f thread safety bug - lock when sending 2015-02-13 09:30:29 +02:00
Pieter Hintjens
cac4d7aa10 Merge pull request #1350 from zeromq/revert-1345-bzimmerman_CMAKE
Revert "Bzimmerman cmake"
2015-02-12 20:35:29 +01:00
Doron Somech
a4de3df73e Revert "Bzimmerman cmake" 2015-02-12 21:29:09 +02:00
Pieter Hintjens
5d42fe1bf7 Merge pull request #1349 from somdoron/master
problem: client and server sockets are not thread safe
2015-02-12 20:06:08 +01:00
somdoron
5a897f7509 allocate reaper_signal only when needed 2015-02-12 20:42:31 +02:00
somdoron
bbdd8662ba thread safety - supporting windows 2015-02-12 18:54:23 +02:00
somdoron
6749c9b3eb thread safety 2015-02-12 18:54:22 +02:00
Pieter Hintjens
88c6e696ab Merge pull request #1348 from evoskuil/master
Problem: VS projects missing client/server.
2015-02-11 23:02:08 +01:00
evoskuil
6bf1609a10 Update VS DLL and NuGet versioning to 4.2.0. 2015-02-11 13:23:58 -08:00
evoskuil
91eead1d20 Add client.cpp/hpp and server.cpp/hpp to VS projects. 2015-02-11 13:17:13 -08:00
evoskuil
2fd2fca531 Make implicit cast explicit. 2015-02-11 13:10:55 -08:00
evoskuil
6724f41427 Fix forcing to bool. 2015-02-11 13:09:25 -08:00
Pieter Hintjens
405a749525 Merge pull request #1345 from QbaseLLC/bzimmerman_CMAKE
Bzimmerman cmake
2015-02-09 22:38:28 +01:00
Bryan Zimmerman
c743bd95b4 changed test tools to compile statically 2015-02-09 13:32:29 -05:00
Bryan Zimmerman
caf4276710 removed packaged export
added version to builds
other cleanup
2015-02-09 10:47:05 -05:00
Bryan Zimmerman
fef20b1c83 Merge remote-tracking branch 'remotes/origin/HEAD' into bzimmerman_CMAKE 2015-02-09 08:46:00 -05:00
Constantin Rack
c9418db684 Merge pull request #1344 from febeling/cond-build-tools
Problem: Cross compile for iOS isn't working for auxiliary tools
2015-02-07 16:17:50 +01:00
Florian Ebeling
54b56210ad Problem: curve keygen build cannot be switched off 2015-02-07 15:36:14 +01:00
Florian Ebeling
2d59594a3a Problem: perf tools build cannot be switched off 2015-02-07 15:36:14 +01:00
Telford Berkey
49f58c0021 Merge remote-tracking branch 'remotes/upstream/master' 2015-02-06 11:27:46 -05:00