0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 23:51:04 +08:00

3140 Commits

Author SHA1 Message Date
xantares
ce4c4f2a05 Fixed mingw poll detection 2014-04-14 21:49:57 +02:00
Pieter Hintjens
98a64716ab Merge pull request #973 from HughPowell/master
Change ToolsVersion to 4.0 for VS2010
2014-04-14 21:40:14 +02:00
Hugh Powell
213d111def Reference default locations for libsodium for VS2010 2014-04-14 20:13:39 +01:00
Hugh Powell
6cb742c7bb Change ToolsVersion to 4.0 for VS2010 2014-04-14 20:01:47 +01:00
Pieter Hintjens
6409c0ec1c Merge pull request #972 from mditzel/master
Fix issue #971
2014-04-14 14:13:49 +02:00
Maarten Ditzel
802d1bcb03 Fix issue #971 2014-04-14 13:56:01 +02:00
Maarten Ditzel
91e77e6aa4 Fix issue #969 2014-04-13 15:25:22 +02:00
Pieter Hintjens
d40580c368 Merge pull request #970 from mditzel/master
Fix issue #969
2014-04-13 14:31:40 +02:00
Ian Barber
52cfab3e21 Merge pull request #968 from hintjens/master
Fixed issue #967
2014-04-10 10:11:23 +01:00
Pieter Hintjens
407b7fb474 Removed duplicate zmq_z85_* methods from zmq.h
Fixes #967
2014-04-10 09:43:16 +02:00
Ian Barber
b9823a1388 Merge pull request #965 from evoskuil/master
Update VS build configurations.
2014-04-09 12:18:05 +01:00
evoskuil
51be440a28 Update VS build configurations. 2014-04-09 03:27:27 -07:00
Pieter Hintjens
f9ef2dd343 Merge pull request #964 from evoskuil/master
Incorporate libsodium option and linkage, generalize, update packaging.
2014-04-08 06:22:08 +01:00
evoskuil
c392c266df Merge branch 'evoskuil/master' 2014-04-07 19:40:31 -07:00
evoskuil
34f4851c23 Incorporate libsodium option and linkage, generalize, update packaging. 2014-04-07 19:38:59 -07:00
Pieter Hintjens
dd227d7a11 Merge pull request #961 from evoskuil/master
Update NuGet packaging metadata.
2014-04-07 08:46:28 +02:00
evoskuil
f01b48c484 Update packaging metadata. 2014-04-06 22:53:36 -07:00
Pieter Hintjens
28c074ee63 Merge pull request #960 from evoskuil/master
Rationalize and update Visual Studio projects and packaging.
2014-04-06 13:32:20 +02:00
evoskuil
b7675eaace Update packaging metadata. 2014-04-06 03:41:35 -07:00
evoskuil
69fa001bab Merge branch 'evoskuil/master' 2014-04-06 02:52:06 -07:00
evoskuil
e01801f5b9 Rationalize and update Visual Studio projects and packaging. 2014-04-06 02:39:15 -07:00
Pieter Hintjens
8fcda0d5da Cleaned up XFAIL on resources
- this failing test was confusing users
- ZMTP v3.0 now does not define resources at all
- resources, along with other unimplemented aspects moved to
  RFC 37 ZMTP v3.1
2014-04-05 15:32:43 +02:00
Pieter Hintjens
84bf625477 Merge pull request #959 from evoskuil/master
Update and add executable projects to VS2013 solution.
2014-04-04 12:31:42 +02:00
evoskuil
cbbfa14798 Merge branch 'zeromq/master' 2014-04-04 01:18:30 -07:00
evoskuil
5d0701d71d Add executable projects to VS2013 solution. 2014-04-04 01:17:25 -07:00
evoskuil
2ad6469cb2 Modify MSVC link incremental setting for deconfliction with LTCG flag. 2014-04-04 01:15:51 -07:00
Pieter Hintjens
c1f7e1f48a Merge pull request #958 from hurtonm/master
Resolve issue #939
2014-04-03 20:19:22 +02:00
Martin Hurton
a53d703160 Resolve issue #939
This bug is caused by fq which can terminate pipe before sending all
frames of a message first. So sometimes two messages were mixed and this
confused ZAP handler.

This patch just modifies one pipe parameter so that socket consumes all
messages before dropping the pipe.
2014-04-03 19:52:42 +02:00
Pieter Hintjens
7140bf041a Merge pull request #957 from jkryl/master
sockets created by accept are leaked to child processes (ticket #956)
2014-04-02 18:31:31 +02:00
Jan Kryl
48b37f217f sockets created by accept are leaked to child processes (ticket #956) 2014-04-02 12:25:40 -04:00
Pieter Hintjens
55bde2a7b5 Merge pull request #952 from evoskuil/master
Organize Visual Studio solutions and integrate NuGet packaging.
2014-03-30 13:41:28 +02:00
evoskuil
2e802a467f Change NuGet package id. 2014-03-30 04:01:12 -07:00
evoskuil
441fdd7cb6 Typo. 2014-03-30 03:26:22 -07:00
evoskuil
ee69fa51b3 In nuget package copy copied DLLs to bin with linked name. 2014-03-30 03:22:00 -07:00
evoskuil
c044f73bb7 Add nuget package generation and GUI selection of OpenPGM option. 2014-03-30 02:38:20 -07:00
evoskuil
f3c156ba2b Merge branch 'zeromq/master' 2014-03-29 23:17:28 -07:00
evoskuil
86ef40d171 Reorganize and clean up visual studio build configurations. 2014-03-29 23:13:00 -07:00
Pieter Hintjens
29586d303d Merge pull request #950 from phreed/master
Make a NuGet package
2014-03-25 23:49:49 +01:00
Fred Eisele
91c409fd93 updated with better owner, author and copyright information 2014-03-25 17:34:09 -05:00
Fred Eisele
394e4c6032 corrected some issues with the autopkg, include the dll 2014-03-25 16:55:23 -05:00
Fred Eisele
af5b960177 added files to assist in building nuget packages 2014-03-25 16:03:29 -05:00
Pieter Hintjens
4706a18cf3 Merge pull request #945 from twwlogin/patch-2
Allow iov_base as char * on Solaris 8/9/10.
2014-03-21 12:13:42 +02:00
Pieter Hintjens
20f22e0463 Merge pull request #944 from twwlogin/patch-1
Include zmq.h after platform.hpp
2014-03-21 12:13:14 +02:00
twwlogin
b7a663f1c1 Allow iov_base as char * on Solaris 8/9/10.
On Solaris 8, 9, 10/SPARC, iov_base is of type caddr_t which is char *. The Sun C++ compiler errors with "Cannot assign void* to char*". Using a static case to override this. On Solaris 11, HP-UX, AIX, and RHEL, iov_base is void * so no issues there. This seems a rather hackish solution so open to something better.
2014-03-21 01:32:01 -05:00
twwlogin
9051456f18 Include zmq.h after platform.hpp
zmq.h requires definitions from platform.hpp so include platform.hpp before zmq.h. This is only an intermediate fix though. zmq.h should not require definitions from platform.hpp because platform.hpp is not installed. So, when zmq.h wants to include <inttypes.h> on ZMQ_HAVE_SOLARIS || ZMQ_HAVE_OPENVMS, it will not and fall back to #include <stdint.h> which will fail when building something like pyzmq on Solaris 8, 9/SPARC which do not have <stdint.h>
2014-03-21 01:24:25 -05:00
Pieter Hintjens
c217ab73b1 Merge pull request #941 from veegee/master
Fix building on MinGW64 Windows
2014-03-20 18:30:03 +02:00
V G
89cbd3d2fa Fix building on MinGW64 Windows
Mingw64 provides mstcpip.h and the build fails (redefinition) if the struct tcp_keepalive is redefined. Do not define the struct if __MINGW64__ is defined. Note that I had to manually pass the compile definition to cmake: -D__MINGW64__=1
2014-03-20 12:22:15 -04:00
Pieter Hintjens
faacb1413f Merge pull request #938 from bebopagogo/master
norm_engine update with no encoder_base_t::has_data() dependency
2014-03-20 07:22:57 +02:00
Pieter Hintjens
8116fe55b7 Merge pull request #937 from snikulov/fix_dll_out_path
cmake // fixed msvc dll output path
2014-03-20 07:22:41 +02:00
bebopagogo
cd9755e4aa removed norm_engine dependency on deprecated encoder_base::has_data() method 2014-03-19 15:02:06 -04:00