Pieter Hintjens
14afbf9b48
Merge pull request #1074 from dmeehan1968/ignore-suo-in-subfolders
...
Exclude MSVC temp files regardless of where they are in builds/msvc
2014-06-05 13:02:03 +02:00
Dave Meehan
79575b0dd9
Exclude MSVC SUO files regardless of where they are in the builds/msvc folder
2014-06-05 11:59:23 +01:00
Pieter Hintjens
78ada21eb7
Merge pull request #1073 from evoskuil/master
...
VS set switch /Z7 in debug static (DebugLIB/DebugLTCG) base props.
2014-06-05 12:51:16 +02:00
evoskuil
f1111ceb0d
VS set switch /Z7 in debug static (DebugLIB/DebugLTCG) base props.
2014-06-05 03:28:03 -07:00
evoskuil
cbad7de0ae
Whitespace in VS projects.
2014-06-05 03:20:08 -07:00
Pieter Hintjens
4b543e2c98
Merge pull request #1072 from olafmandel/issue_1071
...
Extend zmq::wsa_error_to_errno()
2014-06-04 17:56:26 +02:00
Olaf Mandel
de9eef3063
Extend zmq::wsa_error_to_errno()
...
The list of error codes is taken from zmq::wsa_error_no(). Most of the
new WSA error codes result in EFAULT, but some return a more specific
value (even EAGAIN).
Fixes #1071
2014-06-04 17:28:01 +02:00
Pieter Hintjens
ad9838859f
Merge pull request #1069 from evoskuil/master
...
Update VS import props to allow delinking, reset PDB out path change.
2014-06-04 15:14:15 +02:00
Telford Berkey
920371ee6b
Corrected installer source path for VS pdb debug symbols file. Removed prefix path to platform.h
2014-06-04 08:47:22 -04:00
Martin Hurton
8e7a8a43b4
Merge pull request #1070 from ricnewton/master
...
Fix for issue https://github.com/zeromq/libzmq/issues/1065
2014-06-04 13:38:29 +02:00
Richard Newton
c9e86acf61
Set up hwm's before we connect the other end of the pipe in ctx_t::connect_inproc_sockets
2014-06-04 12:13:15 +01:00
evoskuil
6af46c39c7
Update VS import props to allow delinking by dependent projects.
2014-06-04 01:26:39 -07:00
evoskuil
4a02604cc2
Reset PDB out path change in base VS props.
2014-06-04 01:25:41 -07:00
Ian Barber
764a3495c6
Merge pull request #1067 from hintjens/master
...
Problem: email addresses in AUTHORS harvested for spam
2014-06-03 11:10:02 +01:00
Pieter Hintjens
ff07d85594
Problem: email addresses in AUTHORS harvested for spam
...
Solution: remove these email addresses, since authors are reachable
via their Git commit history.
2014-06-03 12:00:37 +02:00
Pieter Hintjens
b42b9c9d67
Merge pull request #1066 from hurtonm/master
...
Style fixes
2014-06-03 11:25:25 +02:00
Martin Hurton
f447386936
Style fixes
2014-06-03 10:42:29 +02:00
Pieter Hintjens
c6e38ec1b7
Merge pull request #1064 from evoskuil/master
...
cosmetic msvc xml fix
2014-06-03 07:31:53 +02:00
Pieter Hintjens
77f50f9ab8
Merge pull request #1061 from dmeehan1968/fix-perf-platform-hpp-windows
...
Fix for perf/platform.hpp not being cleaned up by distclean
2014-05-31 16:11:49 +02:00
Dave Meehan
451c94af8e
Fix for perf/platform.hpp not being cleaned up by distclean
2014-05-31 13:51:41 +01:00
Pieter Hintjens
b118acb710
Merge pull request #1059 from dmeehan1968/msvc-pdb-output
...
Added ProgramDataBaseFile directive
2014-05-30 19:05:43 +02:00
Dave Meehan
ed49057fd7
Added ProgramDataBaseFile directive so that .pdb file goes into same directory as the .lib so that debug builds can find it
2014-05-30 17:47:01 +01:00
evoskuil
d456e70d7d
cosmetic msvc xml fix
2014-05-26 21:16:43 -07:00
Pieter Hintjens
cfc754f393
Merge pull request #1020 from jemc/inproc_simult
...
Add failing test reproducing issue #1015 .
2014-05-23 16:03:15 +02:00
Pieter Hintjens
ac244b41c5
Merge pull request #1057 from hurtonm/master
...
Add const qualifier to register_endpoint param
2014-05-23 14:29:38 +02:00
Martin Hurton
dd2be381ad
Add const qualifier to register_endpoint param
2014-05-23 12:27:01 +02:00
Joe Eli McIlvain
8b47d36875
Revert "Mark failing test for issue #1015 as XFAIL"
...
This reverts commit b6c577a9ec
.
2014-05-22 12:21:32 -07:00
Pieter Hintjens
99dba23dc7
Merge pull request #1055 from hurtonm/master
...
Fix race condition in connecting inproc sockets
2014-05-22 10:40:38 +02:00
Martin Hurton
3901d94b27
Fix race condition in connecting inproc sockets
2014-05-22 09:09:45 +02:00
Pieter Hintjens
313b2ec84e
Merge pull request #1054 from evoskuil/master
...
Minor updates to VS build configuration and NuGet packaging.
2014-05-21 16:53:40 +02:00
Pieter Hintjens
77514e0e9f
Merge pull request #1053 from hurtonm/master
...
Code cleanup
2014-05-21 14:24:36 +02:00
Martin Hurton
414fc86b22
Code cleanup
...
- limit visibility of pending_connection_t
- add const qualifiers
2014-05-21 13:08:15 +02:00
evoskuil
be99f060b3
Update NuGet packaging.
2014-05-21 01:35:52 -07:00
evoskuil
c0c89a3bc5
Update VS version resource and package version.
2014-05-21 01:35:34 -07:00
evoskuil
51c1a1c408
Generalize dependency reference in GSL config/script.
2014-05-21 00:14:09 -07:00
evoskuil
0c60256727
Revert change to VS props references because of VS UI limitation.
2014-05-21 00:13:43 -07:00
Pieter Hintjens
96501d7271
Merge pull request #1051 from hurtonm/master
...
Small code cleanup
2014-05-20 22:20:57 +02:00
Martin Hurton
5f4145e7cb
Small code cleanup
...
- add const modifier to address parameter of event generating functions
2014-05-20 21:48:59 +02:00
Martin Hurton
6bdedcbca3
Merge pull request #1049 from hintjens/master
...
Minor fixes
2014-05-20 16:12:38 +02:00
Pieter Hintjens
4b67919f93
Minor trim of man page title
2014-05-20 15:42:35 +02:00
Pieter Hintjens
11175a33f1
Problem: security tests block on zmq_send
...
The expect_bounce_fail () helper assumed that messages could always
be sent. However in some cases zmq_send() blocks, due to there not
being any outgoing pipe. This changed in 77f5f7, where previously
there would be a pipe that kept trying to reconnect forever.
Solution: use a send timeout and check for EAGAIN if sending failed.
2014-05-20 15:42:35 +02:00
Pieter Hintjens
a1fbd97330
Merge pull request #1048 from hurtonm/master
...
PLAIN: Small simplification
2014-05-19 21:04:40 +02:00
Martin Hurton
32b3daad7e
PLAIN: Small simplification
2014-05-19 20:45:42 +02:00
Pieter Hintjens
155feccb3f
Merge pull request #1047 from mrvn/pull-testutil-expect_bounce_fail-send-timeout
...
Add a send timeout in expect_bounce_fail()
2014-05-19 17:52:27 +02:00
Pieter Hintjens
11357df0e0
Merge pull request #1046 from mrvn/pull-testutil-set-alarm
...
Set an alarm(60) in setup_test_environment() when not on windows so test...
2014-05-19 17:51:42 +02:00
Goswin von Brederlow
2ba5af6d83
Set an alarm(60) in setup_test_environment() when not on windows so tests
...
will not block too long if they go wrong.
2014-05-19 17:03:41 +02:00
Goswin von Brederlow
0ebf94e429
Add a send timeout in expect_bounce_fail() so tests for authentication
...
failures don't block.
2014-05-19 17:03:24 +02:00
Pieter Hintjens
77f5f7adae
Merge pull request #1043 from hurtonm/dont_reconnect_on_protocol_errors
...
Don't reconnect on protocol errors
2014-05-18 10:53:32 +02:00
Pieter Hintjens
de639c34ae
Merge pull request #1042 from hurtonm/master
...
Fix bug in reporting protocol errors
2014-05-18 10:09:38 +02:00
Martin Hurton
045dab91a5
Merge pull request #1037 from hintjens/master
...
Problem: artificial restriction on binary identities
2014-05-18 09:14:06 +02:00