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
Telford Berkey
702008666c
Adding Bryan's changes.
2015-02-06 11:27:11 -05:00
Bryan Zimmerman
2bb72add49
update to use new find_program syntax
2015-02-06 11:03:14 -05:00
Bryan Zimmerman
552c13616e
replace check_library and check_include with find_file and find_library
2015-02-06 10:42:23 -05:00
Pieter Hintjens
e05c805688
Merge pull request #1342 from chickenkiller/master
...
acinclude.m4: make kernel-specific flags cacheable
2015-02-06 15:22:12 +01:00
Lionel Orry
9daf6dd7c4
acinclude.m4: make kernel-specific flags cacheable
...
Specifically when cross-compiling, one can be willing to force these
variable values using the environment of a config.cache file. This
commit makes this possible.
The affected variables are:
* libzmq_cv_sock_cloexec
* libzmq_cv_so_keepalive
* libzmq_cv_tcp_keepcnt
* libzmq_cv_tcp_keepidle
* libzmq_cv_tcp_keepintvl
* libzmq_cv_tcp_keepalive
Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
2015-02-06 15:11:07 +01:00
Telford Berkey
ade54d72e7
Merge remote-tracking branch 'remotes/upstream/master'
2015-02-05 10:52:05 -05:00
Joe Eli McIlvain
8e89d11628
Merge pull request #1339 from evoskuil/master
...
Add missing EOL at EOF.
2015-02-04 15:42:03 -09:00
evoskuil
1a0d134666
Add missing EOL at EOF.
2015-02-04 16:27:57 -08:00
Richard Newton
ca94cf568b
Add appveyor support for building on windows.
2015-02-04 17:54:26 +00:00
Telford Berkey
05df7072d6
Merge remote-tracking branch 'remotes/upstream/master'
2015-02-02 10:27:25 -05:00
Richard Newton
34cd718e0f
Merge pull request #1337 from somdoron/JenkinsFix
...
problem: jenkins build failed
2015-02-02 14:52:45 +00:00
somdoron
ee962117ef
fix jenkins build
2015-02-02 16:42:50 +02:00
Pieter Hintjens
edb3a13fd4
Merge pull request #1336 from somdoron/ClientSocket
...
problem: client socket is missing
2015-02-02 15:23:18 +01:00
somdoron
79f162aa7b
test the client socket can drop multi frame messages that being sent to it
2015-02-02 16:12:21 +02:00
somdoron
14a19cd5d4
test the server socket can drop multi frame messages that being sent to it
2015-02-02 15:57:30 +02:00
somdoron
862cd41c65
implement client socket type and drop messages when more flag is set on client and server
2015-02-02 11:59:13 +02:00
Pieter Hintjens
a6362a454f
Merge pull request #1334 from somdoron/ServerSocket
...
Problem: sockets are not thread safe
2015-02-02 10:23:58 +01:00
somdoron
5632b57b4a
adds server socket type and routing id to msg
2015-02-02 01:17:37 +02:00
Telford Berkey
d5e7922d41
Merge remote-tracking branch 'remotes/upstream/master'
2015-01-30 08:39:44 -05:00
taotetek
9826a7b19d
Merge pull request #1333 from hintjens/master
...
Problem: test cases are failing on slower PCs (eee PC)
2015-01-30 12:12:16 +01:00
Pieter Hintjens
a7a512ab3d
Problem: test cases are failing on slower PCs (eee PC)
...
Solution: raise timeouts from 100-150 msec to 250 msec
2015-01-30 11:57:31 +01:00
Telford Berkey
e351cbdd8f
Merge remote-tracking branch 'remotes/upstream/master'
2015-01-29 10:16:56 -05:00
Constantin Rack
9fc0d2f1a3
Merge pull request #1331 from jemc/master
...
Problem: qt-android build script out of date
2015-01-29 07:45:56 +01:00
Joe Eli McIlvain
2894634829
Problem: qt-android build script out of date
...
Solution: copy changes from latest zproject
2015-01-28 17:30:35 -08:00
Joe Eli McIlvain
153e0487de
Merge pull request #1330 from rodgert/master
...
Use GCC/Clang compiler intrinsics for atomic operations
2015-01-28 14:55:13 -08:00
Thomas Rodgers
937d485e74
Add cast to make Clang happy
2015-01-28 16:38:14 -06:00
Telford Berkey
be8cdc2bf6
Merge branch 'master' of https://github.com/zeromq/libzmq
2015-01-28 12:49:38 -05:00
