3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-14 09:47:56 +08:00
Code Issues Projects Releases Wiki Activity
3,154 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

3154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Gatny
3c414c4aac GSSAPI mechanism now fully working with encryption 2014-04-24 14:17:36 -07:00
Mike Gatny
eb2862525b Methods to send/recv gssapi-wrapped messages 2014-04-24 14:17:36 -07:00
Mike Gatny
1445516c41 Establishing GSSAPI sec context is working now 2014-04-24 14:17:36 -07:00
Mike Gatny
6290ba168f Added gss produce/process routines. 
For exchanging tokens.
 2014-04-24 14:17:05 -07:00
Mike Gatny
c00b8c347b Refactored common impl into gssapi_mechanism_base. 
E.g., both client and server need to produce and process GSSAPI tokens.
 2014-04-24 14:17:05 -07:00
Mike Gatny
a4a0dc6644 Split up gssapi mechanism into client and server. 2014-04-24 14:17:05 -07:00
Mike Gatny
abcb224318 stubbed in TOKEN command 2014-04-24 14:17:05 -07:00
Mike Gatny
4b1c851db4 Stubbed in gssapi security mechanism. 2014-04-24 14:17:05 -07:00
Pieter Hintjens
d1bdd45e80 Merge pull request #975 from evoskuil/master 
Update file tools versioning in VS projects.
 2014-04-17 18:21:35 +02:00
evoskuil
1ee980c191 Update filter file tool versions. 2014-04-15 01:43:24 -07:00
evoskuil
5a76db6f27 Merge branch 'zeromq/master' 
Conflicts:
	builds/msvc/vs2010/inproc_lat/inproc_lat.props
	builds/msvc/vs2010/inproc_thr/inproc_thr.props
	builds/msvc/vs2010/libsodium.import.props
	builds/msvc/vs2010/libzmq.import.props
	builds/msvc/vs2010/libzmq/libzmq.props
	builds/msvc/vs2010/local_lat/local_lat.props
	builds/msvc/vs2010/local_thr/local_thr.props
	builds/msvc/vs2010/properties/Common.props
	builds/msvc/vs2010/properties/Console.props
	builds/msvc/vs2010/properties/ConsoleDebugDynamic.props
	builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/ConsoleDebugStatic.props
	builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props
	builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/ConsoleReleaseStatic.props
	builds/msvc/vs2010/properties/Debug.props
	builds/msvc/vs2010/properties/Dynamic.props
	builds/msvc/vs2010/properties/DynamicDebug.props
	builds/msvc/vs2010/properties/DynamicRelease.props
	builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/Release.props
	builds/msvc/vs2010/properties/Static.props
	builds/msvc/vs2010/properties/StaticDebug.props
	builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/StaticRelease.props
	builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/Win32.props
	builds/msvc/vs2010/properties/x64.props
	builds/msvc/vs2010/remote_lat/remote_lat.props
	builds/msvc/vs2010/remote_thr/remote_thr.props
 2014-04-14 23:47:55 -07:00
evoskuil
d03a1b0d5b Fix platform tools versioning on project files. 2014-04-14 19:19:30 -07:00
evoskuil
bd45b74dd3 Remove versioning from VS .props files. 2014-04-14 19:18:36 -07:00
Pieter Hintjens
cfe2036008 Merge pull request #974 from xantares/master 
Fixed mingw poll detection
 2014-04-14 21:54:19 +02:00
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
bebopagogo
0a97e05439 removed dependency on deprecated encoder_base::has_data() method 2014-03-19 15:00:03 -04:00
Sergei Nikulov
58a1430ca0 fixed msvc dll output path 2014-03-19 22:01:45 +04:00
Richard Newton
65dcd79047 Merge pull request #936 from soundart/master 
cmake: fix test_fork,  fix fragile code related to HAVE_FORK macro
 2014-03-18 22:08:33 +00:00
Frank
8edc80f27b cmake: fix fragile code related to HAVE_FORK macro 
* report from Richard Newton indicated previous solutions was not
  working on Windows
 2014-03-18 21:07:45 +01:00
Pieter Hintjens
59b20e7f3e Merge pull request #934 from evoskuil/master 
Add Visual Studio 2013 solution and build for (v120) of libzmq project.
 2014-03-18 08:47:53 +01:00
evoskuil
8782484fb5 Visual Studio 2013 build updates. 2014-03-17 23:57:48 -07:00
Pieter Hintjens
a57cf1958a Merge pull request #933 from soundart/master 
cmake: fix test_fork
 2014-03-17 21:26:40 +01:00
Frank
9dc890c501 fix test_fork 
* was problem on debian/wheezy
 2014-03-17 21:21:06 +01:00
Ian Barber
65c0ed4727 Merge pull request #932 from ricnewton/master 
Remove delays in test_connect_rid and destroy/recreate context between tests
 2014-03-17 14:41:14 +00:00
Richard Newton
b31ea51ca0 Merge pull request #931 from Dahko/patch-1 
Fixed wrong assert in zmq_recv
 2014-03-17 13:48:32 +00:00
Richard Newton
f5eebc2ae3 Remove delays and destroy/recreate context between tests 2014-03-17 13:41:02 +00:00
Dahko
6a627acea7 Fixed wrong assert in zmq_recv 
zmq_recv returns bytes count, not error code, so 'assert (rc==0)' behaved completely wrong
 2014-03-17 16:38:19 +03:00
Ian Barber
5ced51b753 Merge pull request #930 from ricnewton/master 
Add delays in test_connect_rid
 2014-03-17 13:23:04 +00:00
Richard Newton
e27a610897 Fix tabs 2014-03-17 12:32:21 +00:00
Richard Newton
26dc643205 Add delays in test_connect_rid to allow time for socket to close before address reuse. 2014-03-17 12:24:52 +00:00
evoskuil
18e885bbe4 Add vs2013 solution and build for (v120) of libzmq project. 2014-03-17 01:49:57 -07:00
Pieter Hintjens
be6763e381 Merge pull request #928 from bebopagogo/master 
fixed another missed norm_engine issue for non-norm build
 2014-03-16 17:40:33 +01:00
Pieter Hintjens
e9523a98b5 Merge pull request #927 from ricnewton/master 
Fix cmake build on windows & travis build.
 2014-03-16 17:40:21 +01:00
bebopagogo
43071bc724 fixed another missed norm_engine issue for non-norm build 2014-03-16 12:31:19 -04:00
Richard Newton
5bd5188ec6 Fix tabs 2014-03-16 16:18:30 +00:00
Richard Newton
7cead2bfd6 Fix travis build. 2014-03-16 16:15:19 +00:00
Richard Newton
a4b0e93fc1 Fix travis build. 2014-03-16 16:01:47 +00:00
Richard Newton
05229ea673 Fix cmake build on windows. 2014-03-16 15:59:50 +00:00
Richard Newton
0e0c46aedc Merge pull request #926 from bebopagogo/master 
added uncommitted norm_engine changes
 2014-03-16 15:55:47 +00:00
bebopagogo
d3e0be1528 added uncommitted norm_engine changes 2014-03-16 09:15:31 -04:00
Ian Barber
0514aa5b51 Merge pull request #925 from hintjens/master 
Fixed comment
 2014-03-16 11:07:20 +00:00
Pieter Hintjens
b433adf49e Fixed comment 2014-03-16 11:53:40 +01:00
Pieter Hintjens
74d344ca74 Merge pull request #924 from bebopagogo/master 
NORM protocol extension
 2014-03-16 09:33:59 +01:00
bebopagogo
33f22d0d04 added norm_engine 2014-03-15 10:48:12 -04:00
bebopagogo
c91a638a5a added norm_engine 2014-03-15 10:46:21 -04:00
Ian Barber
72c02b1569 Merge pull request #923 from hintjens/master 
Revert "Fixed potential SEGFAULT."
 2014-03-14 15:06:04 +00:00
Pieter Hintjens
b1e74f79c4 Revert "Fixed potential SEGFAULT." 
This reverts commit 79b81f48402c1276d4cfd3bf0cbfb4084952b36b.
Was causing:

Assertion failed: destroyed (socket_base.cpp:154)
/bin/bash: line 5: 31344 Aborted                 ${dir}$tst
FAIL: test_many_sockets

On TravisCI.
 2014-03-14 09:39:56 +01:00
Pieter Hintjens
a5e397a55e Merge pull request #922 from horus42/master 
Fixed potential SEGFAULT in socket_base.cpp
 2014-03-13 12:46:09 +01:00
czach
03a3dd2503 Merge remote-tracking branch 'upstream/master' 2014-03-13 11:11:17 +01:00
czach
79b81f4840 Fixed potential SEGFAULT. 2014-03-13 11:05:50 +01:00
Pieter Hintjens
49e035fb40 Merge pull request #921 from mbarbisan/master 
Allow TCP addresses to be re-resolved whenever there is a reconnection a...
 2014-03-12 18:36:13 +01:00