Removed autogenerated file
Merge branch 'master' of github.com:chsticksel/ocamlczmq
Removed commented lines
Squashed 'zeromq/' changes from fd02f84..a52e1d6

f45dd95 Updated NEWS for release 3.2.4
a7f2ad0 Merge pull request #108 from hintjens/master
b36545f Updated NEWS
687ea29 Merge pull request #107 from jpoliv/master
2255369 Make ./configure --with-system-pgm detect the OpenPGM 5.2 system library.
c832e3d Merge pull request #105 from hintjens/master
7f44310 Revert "fixed compilation - added detection for _WIN32_WINNT"
ba597c6 Merge pull request #104 from snikulov/cmake_fixes_msvc2012
d1ea5e5 fixed compilation - added detection for _WIN32_WINNT
d246aac Merge pull request #102 from hintjens/master
143ae51 Fixed missing whitespace at end of file
2aca7b2 Merge pull request #99 from leewoosung/hotfixes/patched
00c0d58 Merge pull request #98 from steve-o/master
60b6474 Use MSVC2012's msbuild to drive everything using toolkit support for actually compilations.
aeb87cf Merge pull request #97 from steve-o/master
703c1a6 Merge remote-tracking branch 'upstream/master'
7604dd2 Add MSVC 2013 preview support; Fix upstream CMake changes wrt. PDB and lib locations.
a941934 Merge pull request #96 from pijyoi/master
51066c9 simple Makefile for mingw32
bd77676 Merge pull request #93 from cjuniet/master
20cce75 Fix a few invalid forward declarations
1b5b18c LIBZMQ-541 fix
8b6dcc8 Merge pull request #91 from hintjens/master
3d353f8 Backported test_connect_delay.cpp from libzmq
ad14c56 Merge pull request #90 from hintjens/master
37a0ec5 Fixed name of Travis file
e9755d2 Merge pull request #89 from hintjens/master
96fbeea Added support for Travis CI
0836de2 Merge pull request #88 from hintjens/master
26b182f Backported #84 and #532
d7cad1b set SO_LINGER on first signaler socket to close in order to avoid TIME_WAIT state.
573a1ea release critical section on failure to create signaler fdpair
0e5c98a Merge pull request #87 from steve-o/master
2c55496 Update to support new toolkit functionality with CMake and VS11 for XP as a target platform.
094ecee Fixed packaging for Windows, was missing errno sources
14bb2e4 Merge pull request #85 from hintjens/master
11bae19 #456 was not in 3.2.2 but will be in 3.2.4
a3dafd4 Code formatting
58c1ba8 patch for issue 456
c710a39 Resolved merge conflict
400cbc2 Merge pull request #83 from vortechs2000/fix_323_builds
bdd7282 Various cleanups to test programs
1e435f5 Add newline to end of test_connect_delay.cpp so it compiles with older versions of GCC
0f6e357 Bumped version number for next release 3.2.4

git-subtree-dir: zeromq
git-subtree-split: a52e1d69fd2526768d089b57768860f21685803d
Updated ZeroMQ to version 3.2.4
Squashed 'czmq/' changes from 8c6a6bc..b22dd58

b0e9b7f Merge pull request #450 from hintjens/master
f246c4b Updated man pages
85ec3f6 Merge pull request #449 from hintjens/master
574e8b7 Removed references to deleted msvc projects
c373e41 Updated version to 2.2.1
570b622 Merge pull request #448 from hintjens/master
af138de Updated NEWS for release 2.2.0
c2d9850 Problem: not closing messages on zmq_sendmsg errors
b4111b2 Merge pull request #447 from hintjens/master
44f7d87 Merge pull request #445 from evoskuil/master
5a58252 Generate main project filters using GSL template.
19f65b5 Merge pull request #444 from evoskuil/master
f15fbe1 Missed one file on last commit.
29eb429 Remove tools versioning from .props files and revert to new libsodium paths.
be060dc Update tools version in GSL template for both VS2012 projects.
b9aa090 Remove tools versioning from all shared props files.
e9ceec0 Update tools version in GSL template for *both* VS2010 projects.
1d1b53d Update tools version in GSL template for VS2010 projects.
ebfc0e0 Merge pull request #443 from HughPowell/master
98d1f19 Change libsodium locations to defaults for VS2010
bfa7d32 Change ToolsVersion to 4.0 for VS2010
c6cc627 Merge pull request #442 from jen20/master
591aa2b Use system uuid functions in zuuid
f281b93 Merge pull request #441 from mditzel/master
4179149 Added missing library dependencies for MinGW
b46e1ac Improved documentation of zhash_pack/unpack
3be35ea Merge pull request #430 from hintjens/master
cc26a93 Merge pull request #439 from mditzel/master
9e4ac1e Removed redundant newlines in zlog foreground output
e787975 Fixed missing CZMQ_EXPORT.
639a39e Include zmq_utils.h
010d58f Problem: can't end timers after zloop exit
cbfadbb Merge pull request #437 from evoskuil/master
3007480 Update VS build configuration.
c773fe8 Merge pull request #436 from evoskuil/master
5a65e05 Integrate libsodium and other linkage options and update package.
696c3dc Merge pull request #435 from claws/zstr_fix
950ddd1 fix bug in zstr s_send_string
e3c1d3d Merge pull request #434 from evoskuil/master
b88f26d Remove dead code.
5731b10 Update packaging metadata and add missing headers to package.
b6d065c Fix typo in visual studio meta ui extension.
eda1cb3 Merge pull request #432 from evoskuil/master
bdefab3 Update makefile.am
73e972e Conditionally define fallback for ANSI Windows API call.
f2c4ebb Update packaging metadata.
41c6ac1 Rebuild generated project files and package to include merged changes.
eed0012 Merge branch 'zeromq/master'
065fdcc Rationalize and update Visual Studio projects, add NuGet packaging.
c1163a2 Rebuilt README.md
ffd2d03 Convert conditional Windows text API calls to explicit ANSI/MBCS.
46093f8 Problem: zuuid API man page empty
52fe317 Cosmetic changes
e81846b Merge pull request #427 from hintjens/master
9236dc5 Regenerated build scripts
eabe063 Relicensed CZMQ to MPLv2
c6baad5 Fixed memory leak on zmq_sendmsg failure
b4757d9 Merge pull request #429 from HughPowell/master
e6fe8ef Add project files for VS2010
b696732 Added further prototype to zlog
b87309d Added missing prototypes for zlog class
3d42ddf Merge pull request #426 from hintjens/master
8db28c0 Added zlog system logging facility
0f964a0 Generated documentation
46a61b7 Updated man page for zchunk
0b91d17 Generated documentation
5874131 Merge pull request #424 from phreed/master
123d4cd rolled back the other changes and retained only the nuget configuration.
9ef9639 Merge pull request #423 from hintjens/master
47775db Ensure gcc defines uint -- fixed
b005835 Merge pull request #422 from hintjens/master
61a2fce Ensure gcc defines uint
ead8fd7 Merge pull request #418 from hintjens/master
b02331f Merge pull request #420 from evoskuil/master
1748981 Update projects to pull updated nuget package id.
c15b67d Add missing dependency, clean up VS soln file, fix bool expression.
ac4482a Merge branch 'zeromq/master'
578ab9a Update VS 2013 - remove hardwired libzmq ref and default to nuget.
51071b0 Added selftest for zchunk_exhausted
720f2f4 Added zchunk_consume / exhausted
2a96c8c Merge pull request #419 from mjhowell/master
17d184b Fix --with-libsodium include flags for czmq issue #387.
4fd70bc Merge remote-tracking branch 'upstream/master'
bb9fa3d Added sys_daemonize() method
0c6fd8b Removed PRINTF validation from man pages
79450df Merge pull request #417 from hintjens/master
6ec2c61 Fixed erroneous check for OS/X
4f5f19c Merge pull request #415 from ksergey/zsocket_type_str
71ed611 changed result type to const char* instead of char*
99ec43e Updated AUTHORS for relicensing
9509d4a Merge pull request #414 from rpedde/no-trailing-newline
4666575 Merge pull request #413 from hintjens/master
18b359e Fix overrun on improperly terminated configs
517c971 Updated AUTHORS list
f63e158 Added sys/un.h
95b8909 Various source cleanups
99d81bb zsockopts_test now returns void
8df928f Updated for RFC 35
3035b0f Merge pull request #412 from fichtner/zbeacon_freebsd
a54fe69 fix #407 for real
836ceda fix clang errors
b600c61 Merge pull request #411 from fichtner/format_string_fix
f9cff6e Merge pull request #410 from hintjens/master
48fc331 Fixed issue #407
330317f Merge pull request #402 from shemminger/master
ceb91d4 mark functions with printf() semantics with GCC format attribute
59afa2f Merge branch 'master', remote-tracking branch 'upstream/master'
723cd4d Fixed news for 2.0.3
c7ff6d7 Removed duplicate authors
10cb5e0 Merge pull request #408 from hintjens/master
d2a907c Cosmetic fixes
d313259 Added issues repo + 407
31430d8 Merge pull request #406 from hintjens/master
6c579db Updated man pages
1e84439 Merge pull request #405 from hintjens/master
aa8d781 Was not packaging model scripts properly
7aab8cb Bumped version for 2.2.0
84cd419 Merge pull request #404 from hintjens/master
7aba7c1 Updated NEWS for 4.1.0
e570118 Updated AUTHORS from git log
c8f5179 Merge pull request #403 from hintjens/master
c65c23c Removed non-portable includes
d093745 Removed custom frame API
d5396d9 Minor cleanups
5ff283d Fixed memory overread in chunk_load
c4118f8 Removed selftest of deprecated wrap/unwrap
b4e61fa Merge pull request #381 from ahhentz/master
57fddfa Merge pull request #401 from evoskuil/master
676220b Generate VS2013 projects from GSL model. Remove filters files. Update GSL script to include new model. Update test project as dependency of czmq project. Fix static props for test project so that it properly correlates to all czmq buils.
3f057d5 Merge pull request #399 from hintjens/master
fc0d6de added zcert_save_secret() to documentation.
2d941ed Change user of _WIN32 to __WINDOWS__ for consistency with existing impl. Fix static builds preproc instruction.
632eccd Provide empty definition of CMQ_EXPORT for non-_WIN32 systems.
56d5c3c Remove export define limitation that prevented a windows DLL from loading the library statically. Adapted snippet from libzmq.
dce0ba9 VS 2013 (v120) solution and projects, x86/x64, static/dyanamic, debug/release.
4c51541 Merge pull request #400 from genjix/master
a00ec90 add zcert_save_secret
c492dcb Deprecated zmsg_push by zmsg_prepend
0e939ff Fixed #398
b613ae6 Merge pull request #397 from hintjens/master
a0b3acb Removed experimental zservice class
8c5857d Updated man page
346aada Merge pull request #395 from mhaberler/master
5943447 zloop: interpret a pollitem with socket=NULL and fd=0 as 'poll on fd 0'
d8b9c19 Merge pull request #394 from hintjens/master
3c92a38 Simplified _dup
08f8ef7 Slight tweak on _print
12ebf56 Merge pull request #393 from sappo/master
f4578da Added dup, fprint and print methods for zchunk
f30907c Merge pull request #392 from hintjens/master
653f8d3 Problem: zmsg_dup returned NULL on empty msg
e763b04 Merge pull request #391 from sappo/master
8d468b3 Merge branch 'master' of github.com:zeromq/czmq
539ea4e Removed zprotocol as this is no use to anyone
8ea1956 Merge pull request #390 from hintjens/master
e2f3171 Problem: need to serialize ZPL to/from memory
c99a048 Allow NULL path on constructor
9f6227a Added zchunk_append method
49db9a4 Rebuilt man pages
eddcafe Merge pull request #389 from sappo/master
a156974 added test for zprotocol
04ec0d6 implemented zprotocol - needs test
381bd80 Merge pull request #388 from hintjens/master
67dc064 Added const to char * args where possible
6f4c4ba Merge pull request #378 from hintjens/master
9044a60 Fixed issue #385
5879069 Merge pull request #386 from hurtonm/master
e3c9322 Fix typo in comment
6aeee0d Improved zauth verbose output
1862b56 Added zsocket_sendmem back to API
ef42cd3 Fixed issue #377
a20e7b7 Added CZMQ bindings
d549456 Merge pull request #384 from HughPowell/master
dc47c33 Add zlist_freefn
202d3d7 Merge pull request #383 from HughPowell/master
52225f2 Fix zlist_dup
cf4ceab Merge pull request #382 from HughPowell/master
639ae90 Fix memory leaks
4bc35f2 Merge pull request #380 from guruofquality/cmake_work
433db89 Moved the CMakeLists.txt work into build-cmake.gsl.
0cef299 added CZMQ_EXPORT to the gsl source
00a0781 Adds missing zsocket_sendmem declaration
c4c8b2c added msvc support for cmake build
e1ad3ee missing CZMQ_EXPORT for two unit tests
8d21733 created working cmake build for czmq
e831fff Merge pull request #379 from mhaberler/master
e228bb1 czmq_prelude.h/safe_malloc(): C++-robustify the signature
b776c6e zframe.c: fix type error in selftest
f7d4024 Merge pull request #375 from hintjens/master
d10ef5e New zproxy was mishandling multipart messages
dc7b95b Fixed deadlock in zbeacon and zmonitor
6f8899d Fixed issue #323
ad22b21 Merge pull request #374 from sappo/master
25086f7 updated documentation
cc83548 changed api to get uints from frame, because 0 as error conflicts if one expects 0
df1cf68 Merge pull request #373 from sappo/master
f6741ea updated zframe block description
00fc770 add a block of data to a frame
ea9dc1e updated documentation for zframe put/get api
3abd26f Merge pull request #372 from hintjens/master
db18199 Small improvements to zframe_put/get integers
cd3fd8b Merge pull request #371 from sappo/master
12e577b Merge branch 'master' of github.com:zeromq/czmq
28ae3c4 put/get 8,16,32,64 bit numbers, and string in network byte order to a single frame
6621fc3 Merge pull request #367 from hintjens/master
e29b308 Removed dependency on ZMQv4 proxy functions
06daa0a Fixed #370 in zmsg, zcert, zcertstore, zauth
3c4af39 Fixed issue #370
e858d67 Use bogus hostname if getnameinfo fails
a1a4e98 Updating man pages
48564be Debugging CI build errors
b291c14 Fixed a comment
f0fc288 Whitespace & formatting fixes
d4f3966 Fixed issue #366
08279f9 Merge pull request #364 from MilfordTea/master
11971d8 Update zsys.c
dfab143 Merge pull request #363 from sappo/master
553a803 zmsg recv no wait extension
b0e9215 Merge pull request #362 from m-marsella/master
fa88aa6 Fix invalid frame memory leak in s_beacon_recv
69c23c1 Merge pull request #361 from sappo/master
05abedd libsodium fix as long a it is still broken
e1f44db Merge pull request #360 from mhaberler/master
b502505 zloop: clarify argument of zloop_timer_end()
4ce071b Merge pull request #359 from mattconnolly/interface-detection
2e777ac Merge pull request #358 from mattconnolly/master
fc77e5f zbeacon: check ifa_flags when scanning interfaces
ca444a8 zsys_interface: use default value from an environment variable if supplied.
3bc821d Merge pull request #357 from claws/fix_zconfig_second_attempt
3faa266 the real fix
138a500 Merge pull request #356 from claws/fix_zconfig_in_readme
fb23b59 simple cleanups
3b8686c Merge pull request #355 from mhaberler/zloop_timer-doc-fix
90b73ee zloop_timer: correct documentation of return value
b5730c5 Merge pull request #354 from hintjens/master
abf2ff2 Updated copyrights for 2014
0b0f994 Added initial skeleton for zservice class
14efd75 Fixed issue #353
97e968c Added MECHANISM option
1fe0c26 Added small tool to check for missing options
d0ef37c Merge pull request #352 from hintjens/master
4a3e88d Various small fixes
d6ea57e Merge pull request #349 from ulikoehler/fix348
a38d6cb Selfishly added myself to AUTHORS
9d9c001 Added comment to txp socket init, fixes #348
1ac21b7 Merge pull request #347 from hintjens/master
9f07d4f Cleaned up zbeacon
5a17f8a Merge pull request #346 from hintjens/master
0bf4e92 Compiler warning/failure on libzmq 3.2
0619687 Simplified zproxy
48d8f58 Merge pull request #345 from taotetek/master
6df9cc3 fix for broken identity test in zproxy
2b1ab52 Merge pull request #343 from Talksum/master
4436f0f adding tests for zproxy set identity options
5696042 adding ability to set front and back socket identity
57b8290 Merge pull request #342 from claws/add_runtime_version
7a7241c Add runtime czmq version check function
91d777e Merge pull request #341 from mhaberler/zbeacon-unicast
41ad1bb selftest: disable broken zproxy_test() for now
22b4a65 zbeacon: enable sending/receiving of UDP unicast packets
1dcd406 Merge pull request #339 from pijyoi/master
eee5cff Merge pull request #340 from claws/zmonitor_shutdown
308f0a1 bypass autoconf detection of libuuid under Windows platform
f5d67fc Deregister socket monitor on destroy
b729e74 avoid EADDRINUSE error when running selftest repeatedly
4b8d386 Merge pull request #338 from Talksum/master
6aadbfe zproxy terminate will now time out and assert instead of infinite hang on problem
534b9a3 Merge pull request #337 from hintjens/master
7e8f9c9 Removed bogus assertion of buffer alignment
2ef7132 Merge pull request #336 from Talksum/master
bdfead8 zproxy - updating docs - will hand edit into nicer format later.
854b48b zproxy comment cleanup
1253590 zproxy changes for better handling of different libzmq versions
e354acb Merge pull request #335 from Talksum/master
6d3df36 zproxy - added a free to response from terminate command
abeec03 beginning support for zmq_proxy_steerable and improved backwards compatibility
fe08dac Merge pull request #334 from claws/update_docs
da41b99 Update docs
66b5931 Merge pull request #333 from hintjens/master
2810209 Updated man pages
a04ca6b Had remnant use of HAVE_LIBCRYPTO, removed
ee3c1b3 Fixed use of deprecated API
4481e9b Merge pull request #332 from hintjens/master
8533a8f Rationalized _print/_fprint method names
f52b585 Merge pull request #331 from hintjens/master
303bf14 ZMQ_PROBE_ROUTER isn't readable via libzmq API
e5d5acb ZMQ_PROBE_ROUTER was defined as read-only
d5f5560 Merge pull request #330 from claws/add_diffserv_socket_option
efc687a Add Diffserv sockopt
01884c3 Merge pull request #329 from shancat/master
8a6684d Fix Windows build.
121b9d9 Merge pull request #327 from shancat/master
12cf6a9 Add missing #defines for Android.
2ec0c69 Merge pull request #328 from shancat/sha1_windows
4271c8c Fix #326
3fb5362 Merge pull request #324 from hintjens/master
932a28c zproxy fix for older versions was not working
d215f54 zproxy did not build with pre-4.x versions of ZeroMQ
6009411 Fixed #325
e020d57 Additional files for issue #322
d67a2c0 Fixed #322
f71f083 Merge pull request #318 from claws/cancel_timer_by_id
28b42d1 fix selftest, return lcrypto
c866bdd Merge branch 'master' of https://github.com/zeromq/czmq into cancel_timer_by_id
f728b59 Merge pull request #320 from davipt/master
3ed3925 fixes MacOSX 'can't find libzmq' when installed on /usr/local/lib, by copying a configure block from jzmq ;)
1d81428 Link in libuuid
472db28 cancel timers by identifier
e70a008 Merge pull request #317 from hintjens/master
e67efaf Improved doc/Makefile.am generation (fixed issue in edgenet/drops)
efd822f Merge pull request #316 from hintjens/master
0076aa5 Fixed issue #312
7c26b85 Merge pull request #315 from hintjens/master
84c5304 Fixed doc/Makefile.am generation for private classes
b46e3f3 Fixed bad backslashes in project generation templates
71f83c1 Merge pull request #313 from hintjens/master
871d8eb Allow classes to be private, with header file in src directory
726f4c5 Merge pull request #311 from shancat/master
e72842a Compile under Windows without warnings.
c881f20 Merge pull request #310 from hintjens/master
59723f1 Install the project generation scripts into /usr/local/bin
8167fd0 Restored variable string processing for MSVC
c07d0d1 Man page updates
a60b311 Merge pull request #309 from hintjens/master
f4b8b64 Bumped version on development master to 2.1.0
4d87de8 Merge pull request #308 from hintjens/master
b0046f0 Fixed issue #307
7495cb6 Merge pull request #306 from pijyoi/master
20b2b21 Merge pull request #304 from hintjens/master
57575ed add additional test for zsys_vprintf exposing bug in implementation
a7b7ffc Added zuuid_dup method
d6ba011 Added access to uuid binary value
00361b1 Renamed zuuid_cpy to zuuid_export for clarity
29b6d9b Clarified zlist manpage
9262d94 Merge pull request #305 from pijyoi/win32_ctrlc
2c4e778 test against __WINDOWS__ not __WIN32__
d5510fc Was missing API export for zhash_unpack
acc1bde Updated man pages
5c93e7e Removed empty ChangeLog
2810e74 Trivial code cleanups
33eede3 Small improvements to zlist
87ff169 Merge pull request #299 from shancat/feature/remove_empty_readme
55ddc5e Merge pull request #296 from hintjens/master
7c865e9 Was trying to include uuid.h when not installed
2abac5c Fixed some build errors on new digest code
babd62f Fixed memory misuse error
796f671 Moved some classes from FileMQ into CZMQ
a00d164 Allow project to survive without README
09dd088 Minor style changes
3cbaf49 Added pack/unpack methods
bfb272f Fixed zauth selftest
384c45c Updated year
4840c98 Added zcert_meta_keys method
9a403c1 Fixed zpoller for ZMQ v2
2a7405d Disabled zmonitor for libzmq v3.2
415cfd8 Extending Travis CI build to ZMQ 3.2
d10d9cc Extending Travis CI build to ZMQ 3.2
4e3b533 Fixed to make work with ZMQ v3.2
a1e4d9f Merge pull request #302 from pijyoi/win32_ctrlc
26ea5a8 Ctrl-C handler for Windows
f65802e fixes to be compilable by mingw32
3002503 Merge pull request #301 from shancat/feature/travis-libsodium
2b13b0f libsodium is no longer broken.
ba4cd95 Remove empty README file.
09dccd1 Merge pull request #300 from shancat/feature/doc_update
d78813d Docs seem to be out of date so update them.
094ad10 Merge pull request #298 from shancat/feature/poller_add
da9afe0 Add an "add" function for zpoller.
bbe882c Merge pull request #293 from hintjens/master
8561193 Fixed zproxy to deal with socket exhausted errors
676eb00 Fixed response to file handle exhaustion
0d6a1b7 Should continue if process has no file handles left
11df942 Merge pull request #292 from hintjens/master
efea921 Added index to czmq man page
9b65e2b Merge pull request #290 from Talksum/master
6d2cf67 zproxy refactor to match naming conventions of other agent style czmq classes
42cd8c5 Added argument assertion
50ef091 Merge pull request #289 from hintjens/master
b69c09d Closing test sockets explicitly, to fix occasional valgrind complaints
28807cd Minor code cleanups
e9653ef Changed zbeacon constructor
7baf797 Rebuild man pages
5f71be4 Merge pull request #288 from hintjens/master
40ba660 Added UUID support class
747e296 Merge pull request #287 from Talksum/master
8c26dda fixing merge conflict in zproxy.c
e14404d zproxy api adjustments (zproxy_bind now spawns attached thread and starts proxy) + test improvements
6c584db Merge pull request #286 from claws/zproxy-readme-update
48ce75f Include zproxy in README
bb279ce Merge pull request #284 from hintjens/master
b7c7320 Whitespace fixes
dce17b5 Merge pull request #283 from Talksum/master
77e4c9b adding initial generated documentation for the zproxy class
c6eef22 fixing merge conflict between auto generated files concerning zmonitor and zproxy additions
4383ed8 initial check in of new zproxy feature
e62447a Merge pull request #282 from hintjens/master
98caf10 Code cleanups
b0acd32 Merge pull request #281 from claws/zmonitor_addition
b2a7c0b zmonitor addition
911f00f Merge pull request #280 from hintjens/master
4ef837d Merge pull request #279 from MCE-KobyBo/master
1d435bb Classes that return allocated values now provide a free method
e18c486 Added support for using zctx_shadow on a context which didn't create sockets yet
77c3685 Merge pull request #276 from claws/upstream
72b5df6 remove duplicate truncated ztree API reference
5ccaf3a Merge pull request #271 from hintjens/master
6c466ef Merge branch 'master' of github.com:hintjens/czmq
925c941 Removed use of strndup and non-portable code
34b5991 Simplified zrex API and added zrex_eq()
d7f506f Updated README on adding new classes
a96853d Generating all project files from single XML model now
a5e5c36 Added silent rules to build process
acd79a9 Merge pull request #273 from shubred1/master
799fab3 Merge pull request #275 from woldan/master
ae7e239 Added work-around for missing `strndup()` on Windows with MS runtime.
90d54fc ﻿make zbeacon interface selection more robust
66029cb Merge pull request #272 from shubred1/master
56011f7 Removed assert from zbeacon_test() that caused failure on TravisCI machine
eb11ddf Generating all project files from single XML model now
ae2b3ca Merge pull request #270 from shubred1/master
7903219 Added silent rules to build process
5ab5396 Merge pull request #268 from hintjens/master
c21d3d5 Merge pull request #269 from ulikoehler/zctx_new_from
b54f9dc Fixed unitialized variable warning
7d2b30a Added missing CZMQ_EXPORT to new function
617599f Rename zctx_new_from_zmq_ctx to zctx_shadow_zmq_ctx
824b72f Added zctx_new_from_zmq_ctx
9f5810e Broadcast address patch and interface selection fix
a69fd81 Restored all selftests
83f87fe Finished first draft of zrex
25e2608 First patch for regular expression support in CZMQ
e1b0e2c Imported trex regexp library from http://tiny-rex.sourceforge.net/
523cc23 Merged scripts directory into model to clean up root a little
4ac7282 Merge pull request #267 from claws/platform_h_issue
9128a88 Merge remote-tracking branch 'upstream/master' into platform_h_issue
21da01d include platform.h in zsockopt and zauth to re-enable curve functionality
cd18a58 Broadcast address patch and interface selection fix
b706756 Merge pull request #266 from hintjens/master
343a1c1 Temporary workaround for broken libsodium install
42063fe Merge pull request #264 from jasedit/master
3b8ca21 Using the broadcast address we get, if it has been set.
6af6e55 Merge pull request #262 from hintjens/master
b6ada92 Bumped version to 2.0.3
3e6c11a Merge pull request #261 from hintjens/master
9cb1f6f No longer assumes zmq.h constants are enums
e3295e8 Merge pull request #259 from hintjens/master
5e17ce7 Removed test case on zmutex_try
9d02f56 Fix for compiling zbeacon on FreeBSD
81649ca Updated CZMQ to support enum constants in ZMQ v4 header
8e3a91c Merge pull request #257 from hintjens/master
2f96410 Added restat functionality to be compatible with FileMQ
e319821 Merge pull request #256 from hintjens/master
b738fd3 Added support for symbolic links to zfile
9b01034 Merge pull request #255 from pijyoi/master
c265002 close file before delete
7ba9e15 Merge pull request #254 from pijyoi/master
f6c4b5e update simple Makefile.mingw32
6f55469 Merge pull request #252 from hintjens/master
aeed28f Merge pull request #253 from momo-the-monster/master
06876a5 MSVC: compile as C++
282982b MSVC: ignore lib, opensdf, suo and sdf files
0a24cb0 Merge from upstream
02b593a Merge from upstream
f942d81 Added cast to keep MSVC happy
bfc8505 Added platform.h and other fixes for MSVC
80b37de Fixed compilation for MSVC
92977bc Merge pull request #251 from hintjens/master
d44e4db Merge pull request #246 from ulikoehler/zmutex_try_lock
0a6b871 Fixes for issue #224
15d89e4 Various cleanups to zctx
56ca582 Merge pull request #249 from pijyoi/master
70fe59c bugfix: leaking sockets list, sndhwm/rcvhwm not shadow copied
1d03f87 Merge remote-tracking branch 'upstream/master'
c1d6fc8 Merge pull request #245 from ulikoehler/zctx-sync
575be1c On failed zlist_push, unlock before zmq_close
30a08f3 Implemented zmutex_try_lock
6b88d57 Remove mutex locking in zctx_destroy
072d7ac Add zmutex to assertions to check for nullptr mutexes
0ff2c4f Added mutex locking to zctx socket list
78a0c73 Merge pull request #244 from ulikoehler/fix-zocket-assert
fb56f36 Ensure zctx_destroy ignores NULL zockets, instead of asserting and failing
bfd2c49 Merge pull request #243 from TTimo/master
0a1c4c5 fix out of tree build
bb88edf Merge pull request #242 from mattconnolly/master
ded435b Solaris/SmartOS fix for libsodium
b7e2edf Allow libsodium to be installed in a custom path
ca0da9a Merge pull request #241 from hintjens/master
63d8e32 Was not building properly without libsodium installed
8adecd6 define S_IRUSR as _S_IREAD for MSVC
95c4443 Prelude - define sleep as Sleep for MSVC
aa57248 Zchunk - cast to byte* and remove aligned (need windows equivalent)
55a7510 Add missing headers/implementations to msvc11 project
8c1e5f8 Add explicit casts for MSVC compilation
28137fb Merge pull request #240 from hintjens/master
fcb88b9 Reload certstore slightly better (not yet perfect)
c005218 Bumped library version to 2:0:1
cbf9111 Merge remote-tracking branch 'upstream/master'
bc353e8 Fixed incorrect method names
3c37eda Merge pull request #238 from hintjens/master
d79b412 Updated build instructions
d276632 Merge remote-tracking branch 'upstream/master'
71f7f61 Merge pull request #237 from hintjens/master
fa1c785 Fixed accidental deleted #ifdef
24accb3 Fixed authentication classes to work over ZMQ v3.2
b7d20f8 Merge remote-tracking branch 'upstream/master'
ee410de Merge pull request #236 from hintjens/master
3e93fd8 Updated NEWS for release 2.0.1
d880d07 Merge pull request #235 from hintjens/master
08eeae2 Updated CZMQ to work with ZeroMQ 4.0
89272e2 Bumped version number for next release, 2.0.1
e38abd0 Merge pull request #234 from hintjens/master
105469a Generated documentation
0937d29 Updated NEWS for 2.0.0
fa55b33 Merge pull request #233 from hintjens/master
73946cc Added security examples final cut
0b5ce84 Merge pull request #232 from hintjens/master
ae35f56 Finished security examples
59c478f Improved certificate serialization API
90a134a Fixes to zsys_dir_create and zsys_dir_delete
5c50ed7 Merge pull request #231 from hintjens/master
add04b7 Fixed reporting in security examples
b5a72c7 Added security pattern examples
08ae6a9 Added CURVE_ALLOW_ANY to permit anonymous clients over CURVE
02d08fe Simplified white/blacklisting
83548ff Show ALLOWED/DENIED outcomes if verbose is set
4911de3 Finished authentication support in CZMQ (first draft)
e81d591 Merge remote-tracking branch 'upstream/master'
e1a9211 Merge pull request #230 from hintjens/master
0897dd8 Changes for release 2.0.0, to support ZMQ/4.x and security
dd0843b Merge pull request #229 from hintjens/master
93f9b86 Generated documentation
423325b Generated documentation
aca930f Added prototypes for _bin sockopt methods
ad7f811 Added support for setting binary Curve keys
89fb8a2 Merge pull request #228 from hintjens/master
aa3d2e7 Extended TravisCI build to use libsodium
df85efc Merge pull request #227 from patricknoffke/master
64efc12 Support separate lib and include install directories for libzmq.
7423004 zmq_socket_set_xxx was printing error on ETERM and others; removed output
278e64e Merge pull request #226 from hintjens/master
facc836 Added support for ZMQ_ZAP_DOMAIN option setting
12d729b Merge pull request #225 from hintjens/master
440d8f1 Added test case for zhash_autofree
3dd7b7d Fixed casts and strcasecmp for MSVC
45f2511 Merge pull request #223 from felipecruz/feature/test_zsocket_unbind
847255e Add unbind test
fd39b20 Merge pull request #222 from hintjens/master
b690959 Added zsocket_unbind for completeness
99cdcb5 Merge pull request #221 from hintjens/master
7570027 Set default HWM for pipes to 1,000
8ab142c Trivial fixups
8ee86f8 zhash_load ignores lines starting with '#'
4d2899a Merge pull request #220 from hintjens/master
1081b03 Code cleanup
4b27f16 Fixes to header comment
3e29645 Values in saved hash tables can contain '='
7c971c0 Save ZPL values as strings, to guard against parsing on reload
ca91178 Merge pull request #213 from hintjens/master
bd5267f Merge pull request #219 from weberr13/addedHWM
0a6ab8f Fixed HWM support, fixed shadow_copy linger
9b9d65f Added more tests for zhash_rename
7e9f508 Fixed crash when subscribe used without publish
92cdadc Code cleanup for zhash_rename
b02ceac Safer fix for issue #212
9a7e459 Revert "Removed definition of 'inline' for Windows"
82d7739 Revert "inline not safe to use in czmq_prelude.h, removed"
18d01db inline not safe to use in czmq_prelude.h, removed
a1b6680 Merge pull request #217 from claws/master
cd64e0a zmsg_load should return NULL if unable to load msg
06a666f Merge pull request #211 from hintjens/master
b703c61 Removed definition of 'inline' for Windows
f576f36 Use zmq_strerror to show real error cause
824636d Merge pull request #210 from hintjens/master
1b77c99 Added note about tivotisation
5ad4cf2 update Makefile with ztree.o
6b51e6b Merge pull request #209 from hintjens/master
a6ca7f7 Added comment on iteration
9e4cf25 Fixed issue #208
cf36309 Merge pull request #206 from hintjens/master
6258550 Did not signal error when trying to send empty message
a36a9b5 Merge pull request #205 from hintjens/master
e7883be Minor cleanup of variable name
be75011 Merge pull request #204 from hintjens/master
413d42f Fixed use of ZMQ_STREAM to work with older libzmq
f3f1d3f Trivial name change
8ff5c2b Using proper test keys for CURVE
e91ed56 Fixed socket options to track latest libzmq master
28907c2 Merge pull request #203 from gavinmcniff/master
8a9cbe4 ZMQ_STREAM incorporated
29c9507 Merge pull request #202 from hintjens/master
5100329 Fixed use of errno (fixes #199)
f65a17a Merge pull request #200 from vortechs2000/print_to_stream
bfe1f93 Update remaining generated .txt file based on current source code
7e50f24 Update docs based on previous changes to zmsg.c and zframe.c
9af09c3 Change name of new functions from *_to_file() to *_to_stream()
c657ec0 Add API to write zmsg_dump output (and zframe_print output) to FILE stream
54d670c Merge pull request #198 from hintjens/master
224d281 Added zframe_set_more method
cf56d80 Merge pull request #197 from hintjens/master
3595408 Fixed execute bit
c9db7b9 Merge pull request #196 from hintjens/master
bd3acf9 Fixed spelling
685fa73 Merge pull request #195 from hintjens/master
d0d7284 Updated man pages
9785db2 libsodium not needed in Travic CI build
9905afb Merge pull request #194 from hakankpunkt/master
4f4efdd ztree.h was missing
b40579b Merge pull request #193 from mattconnolly/master
8566358 zbeacon: improve search for interface to skip interfaces with null broadcast address, which happens on SmartOS / Solaris.
83abd3f Update flags to build on SmartOS / Solaris
c323af6 Tentative fix for #187
a374292 Merge pull request #192 from shemminger/master
41b9320 ztree: switch to alternative source
ac7c84e ztree: add some tests for ztree_update
5ebd45f ztree: fix comments around ztree_save/load
7c63421 ztree: add missing autofree to ztree_dup()
4a4b542 Merge pull request #191 from shemminger/master
7ebf23b Make local test functions static
0fb1257 Fix sparse warning
e50a30b Merge pull request #190 from hintjens/master
d3fbbc7 Whitespace and formatting fixes
c4eea79 Merge pull request #189 from shemminger/master
a71d98e Added support for ztree
49e6c7a Merge pull request #188 from hintjens/master
3688e5f Working on issue #187
7d05b8c Removed old unused build file
050ee31 Removing demo directory - these examples appear to be dead - code style is not consistent with CZMQ style standards (CLASS) - we have more complete demos elsewhere (FileMQ, Zyre at least)
4d77dad Updated platform builds to cover all classes
1b374c3 Version number should be 1.4.2
52b296c Version number is now updated in include/czmq.h only
ba2eaa1 Removed zcurve class - no real use cases for CZMQ applications - moving to clab experimental/incubator project
1deb260 Selftest tags were wrong
63e2cac Renamed zbeacon_pipe to zbeacon_socket - left old method for compatibility, but marked as deprecated - 'pipe' was too specific about internal use of this socket - want to make this consistent with zsecure_socket ()
1160021 Merge pull request #186 from hintjens/master
dae628c Merge pull request #185 from felipecruz/feature/readme_txt_travis
2bd1e32 Renamed zconfig _set methods for consistency
7133e23 Finished zcurve first implementation and test cases
d6a8afa Trivial code cleanup
fca45e3 ZPL name parsing was not accurate
eb15a80 add travis image to README.txt
7c87123 Merge pull request #184 from felipecruz/feature/readme_travis_status
43bfc74 add travis ci build image to readme
baf4d8e Merge pull request #183 from hintjens/master
348fff8 Added support for libsodium
6617306 Added ldconfig after dependency builds
41f2e1f Merge pull request #182 from hintjens/master
aadf53c Fixing yet more merge conflicts, gaaargh
a57e98f Merge pull request #180 from hintjens/master
0a247f5 Another attempt to fix Travis CI build
94d1817 Disabled selftest on zcurve to patch broken master
1a74ced Merge pull request #178 from hintjens/master
a9c8740 Fixed name of Travis file
63cf9b7 Added cast from zmalloc, and STRONGER WARNINGS
87db002 Fixed const on string options
552ac19 Regenerated source code to match headers
41c40d6 Testing Travis CI
5340db9 Using 'class' everywhere for consistency
eee617a Methods to allow creation of private files
6e3693a Added zconfig module
ac37d86 Cosmetic change to source header formatting
fbcacf5 Merge pull request #179 from shemminger/v1.4.x-fixes
64c0a22 zsockopt: fix prototype mismatch
f991973 zcurve: fix unused variable errors
4d7d464 Merge pull request #177 from hintjens/master
61ec219 Merge pull request #176 from jlopezr/master
0ed6679 Adding a more informational assert
77a5bb4 Ignoring ENOTSOCK error from zsock_set_linger
de8c1bc Zero-copy methods slated for removal
90c7d6e zframe_reset_zero_copy removed due to multiple errors - if free_fn is null, ignores data - at end, copies data in any case, so isn't zero-copy - makes API complex for uncertain benefit
271e249 Merge pull request #174 from mkoppanen/zloop-rebuild-on-end
bb4f361 Merge pull request #173 from pijyoi/master
1c421b1 vsnprintf: use stack buffer instead of heap
1a7b1a2 Merge pull request #172 from mkoppanen/master
dee30e0 Merge pull request #171 from hintjens/master
1d66e56 Updated man pages
e7030b0 Added zcurve_decode for message decoding
801ffa5 Revert "Removed latest zero_copy additions in zframe and zsocket"
e811286 Minor code cleanups
d26fde6 Uses state to know when ready for messages
4f56956 Refactored into cleaner encrypt/decrypt calls
c641898 Refactoring internals to use shared encrypt/decrypt functions
2f961d5 Removed latest zero_copy additions in zframe and zsocket - the code was complex and I'm skeptical that it is necessary - it was leaking memory in selftests and I did not find the cause - if we do *need* zerocopy all over the place I'd like to find a better API
72d0000 Fixed lots of small faults in recently added code - variable names like 'i' and 'strSomethingBogus' - memory leaks in selftests - general indentation and layout
2ae5143 Added -lpthread to link statement
1049417 zcurve works with variable messages - beginning to support metadata - removed zblob class again, it's not needed
ea1b812 Second draft of zcurve module - sending/receiving frames over DEALER-ROUTER, in selftest - new module, zblob, for size-specified binary strings
79ff218 Man pages rebuilt automatically
0643885 Fixes an issue where calling zloop_poller_end from handler causes potential uninitialised read on during the iteration
949cf41 Merge pull request #169 from vortechs2000/more_windows_fixes
8b30b38 Fix memory leak on EGAIN etc
eb8a24f According to documentation "Cancel all timers for a specific argument (as provided in zloop_timer)"
fc908d2 Add zcurve.[ch] to the czmq project
1c39f37 Make build directory for Win32 RelWitDebInfo $(PlatformName)\$(ConfigurationName)
6970ef2 Change so we only don't include platform.h when using visual studio, but do otherwise
bb58500 Add RelWithDebInfo configuration
841f37a Changes nothing, just rearranges the sections as visual studio likes
9449363 Fix zcurve.c so it builds on Windows  * Don't include platform.h when building using Visual Studio  * umask doesn't work the way it was used here, so just don't call    it on Windows  * Make sure to cast void * to the type you're assigning it to on Windows
6aa043d Merge pull request #168 from jlopezr/master
ad7b555 Removing syslog.h from czmq_prelude.h
d16ed33 Merge pull request #166 from pijyoi/fix-vsnprintf
e20729b fix vsnprintf usage
4a30573 MSVC vsnprintf differs from POSIX
23f24f6 va_{start,end} needs to be called for each vsnprintf
dd9dc9d Merge pull request #161 from hintjens/master
5d48452 Cosmetic style fixes
87677ec First version of zcurve, with fixed length messages
752e0bb Merge pull request #163 from ulikoehler/zsocket_sendmem
fe03da2 Make socket first argument in zsocket_sendmem functions
eb6c13e Fix sendmem docsg
2cb4d48 Moved sendmem functions to zsocket
229870b Merge pull request #162 from ulikoehler/docfix
da26652 Fix linefolding
38a3729 Added documentation for functions from previous pull requests
b90dd64 Merge pull request #159 from ulikoehler/zframe_send_docfix
94a3e52 Merge pull request #160 from ulikoehler/zsockopt_const_subscribe
2989043 Merge pull request #157 from ulikoehler/zframe_sendmem
9260291 Update doc/zsockopt.txt
b80f9e4 Update doc/zframe.txt
c5f8be0 Merge pull request #158 from ulikoehler/missing_headerdecls
06eabc0 Make zsockopt_set_subscribe, ..._unsubscribe and ..._identity take a const char* argument
5115b2d Fix incorrect return code documentation for zframe_send
94c3aa5 Added missing header decls from previous pull requests
f94a4cb Added zframe_sendmem + zero-copy version + tests
baaea8f Merge pull request #156 from ulikoehler/zframe_new_empty
bf5b815 Added zframe_new_empty (and corresponding test)
4b61207 Merge pull request #155 from ulikoehler/zmsg_reset_zero_copy
0987c22 Improve zframe_reset_zero_copy documentation
c1c3392 added zframe_reset_zero_copy selftest
6eb37bf Added zmsg_reset_zero_copy
ce88220 Post-package version bump to 1.4.2

git-subtree-dir: czmq
git-subtree-split: b22dd58b9d363d8894ad986e0444770d2e02c34c
Updated CZMQ to version 2.2.0
Merge branch 'master' of github.com:chsticksel/ocamlczmq
Call aclocal from autogen.sh