diff options
82 files changed, 24298 insertions, 282 deletions
@@ -1,5 +1,119 @@ # Generated by Makefile. Do not edit. +commit 3420eb7304ec05e2d7f36ac6f811abf2d0ba8bff +Author: Pieter Hintjens <ph@imatix.com> +Date: Wed Mar 30 14:09:19 2011 +0200 + + Updated NEWS for 2.1.4 + + NEWS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e621c48ba04fe5dbe77f416bed185a60273e5be0 +Author: Pieter Hintjens <ph@imatix.com> +Date: Mon Mar 28 20:52:22 2011 +0200 + + Restored HTML man pages output + + doc/Makefile.am | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +commit a18d55633378e6949a4dd619ade3bd434ec3614e +Author: Pieter Hintjens <ph@imatix.com> +Date: Sat Mar 26 09:53:06 2011 +0100 + + Added missing HWP/inproc change to 2.1.1 notes + + NEWS | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 20e6dc44164bea5b247225dac8dcbf7630314f72 +Merge: 1a8d95d 55d6932 +Author: Mikko Koppanen <mkoppanen@php.net> +Date: Wed Mar 23 14:21:02 2011 +0000 + + Merge branch 'master' of https://github.com/zeromq/zeromq2-1 + +commit 1a8d95da9eae484df2c3b6879b3c6f76b48a98cb +Author: Mikko Koppanen <mkoppanen@php.net> +Date: Wed Mar 23 14:20:57 2011 +0000 + + Fix make dist + + Makefile.am | 7 ++++++- + configure.in | 3 +++ + foreign/openpgm/Makefile.am | 4 +++- + 3 files changed, 12 insertions(+), 2 deletions(-) + +commit 55d6932031da03d1321e728a376a64217ecf0d61 +Author: Pieter Hintjens <ph@imatix.com> +Date: Wed Mar 23 11:45:38 2011 +0100 + + Upgraded OpenPGM to 5.1.115 + + NEWS | 5 +++++ + foreign/openpgm/libpgm-5.1.114~dfsg.tar.gz | Bin 1051807 -> 0 bytes + foreign/openpgm/libpgm-5.1.115~dfsg.tar.gz | Bin 0 -> 1054630 bytes + 3 files changed, 5 insertions(+), 0 deletions(-) + +commit f392d73332d5642f17a85ffe337c7f45217f4124 +Author: Steven McCoy <steven.mccoy@miru.hk> +Date: Wed Mar 23 14:55:00 2011 +0800 + + OpenPGM 5.1.115 to fix assertion with messages smaller than an IP header length. + + Signed-off-by: Steven McCoy <steven.mccoy@miru.hk> + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 4c988d321a60279bf324140c539b6e586d5c29d2 +Author: Pieter Hintjens <ph@imatix.com> +Date: Tue Mar 22 22:31:30 2011 +0100 + + Prepared for 2.1.4 release + + NEWS | 11 +++++++++++ + include/zmq.h | 2 +- + 2 files changed, 12 insertions(+), 1 deletions(-) + +commit 34b7f54b0fa6e7884a76792633ca66f176d25906 +Merge: b10138f 91bdf04 +Author: Pieter Hintjens <ph@imatix.com> +Date: Tue Mar 22 22:29:12 2011 +0100 + + Merge branch 'openpgm-no-artifact' of https://github.com/mkoppanen/zeromq2-1 into mkoppanen-openpgm-no-artifact + +commit 91bdf04ac5d70c265efe44ae9462c403ec8a93e7 +Author: Mikko Koppanen <mkoppanen@php.net> +Date: Tue Mar 22 09:21:05 2011 +0000 + + Make sure that OpenPGM artifacts are not installed during ZeroMQ installation and remove unnecessary OpenPGM build defines + + .gitignore | 1 + + Makefile.am | 2 +- + configure.in | 53 +++--------------------------------------- + foreign/openpgm/Makefile.am | 6 +++++ + 4 files changed, 12 insertions(+), 50 deletions(-) + +commit b10138f6ec803b9b616c483a7792fb5ed4e9ccc6 +Author: Pieter Hintjens <ph@imatix.com> +Date: Mon Mar 21 21:08:23 2011 +0100 + + Fixed RHAT packaging for removed devices + + builds/redhat/zeromq.spec | 8 +------- + 1 files changed, 1 insertions(+), 7 deletions(-) + +commit 3c0180fbda42d04659268e50241ca75c1668d01e +Author: Pieter Hintjens <ph@imatix.com> +Date: Mon Mar 21 14:05:48 2011 +0100 + + Fixed error in OpenPGM news + + NEWS | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + commit 31d8b7f74daa3f094347876db2774112d80611fe Author: Pieter Hintjens <ph@imatix.com> Date: Mon Mar 21 10:08:42 2011 +0100 diff --git a/Makefile.am b/Makefile.am index 9fa7001..1e4a404 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,12 @@ ACLOCAL_AMFLAGS = -I config -SUBDIRS = $(pgm_srcdir) src doc perf tests -DIST_SUBDIRS = src doc perf tests builds/msvc +if BUILD_PGM +SUBDIRS = foreign/openpgm src doc perf tests +else +SUBDIRS = src doc perf tests +endif + +DIST_SUBDIRS = foreign/openpgm src doc perf tests builds/msvc EXTRA_DIST = \ autogen.sh \ diff --git a/Makefile.in b/Makefile.in index c85fd32..7ce18c2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -230,6 +230,7 @@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pgm_basename = @pgm_basename@ pgm_srcdir = @pgm_srcdir@ +pgm_subdir = @pgm_subdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -243,8 +244,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I config -SUBDIRS = $(pgm_srcdir) src doc perf tests -DIST_SUBDIRS = src doc perf tests builds/msvc +@BUILD_PGM_FALSE@SUBDIRS = src doc perf tests +@BUILD_PGM_TRUE@SUBDIRS = foreign/openpgm src doc perf tests +DIST_SUBDIRS = foreign/openpgm src doc perf tests builds/msvc EXTRA_DIST = \ autogen.sh \ version.sh \ @@ -1,3 +1,19 @@ +0MQ version 2.1.4 (Stable), released on 2011/03/30 +================================================== + +Bug fixes +--------- + +* Fix to OpenPGM which was asserting on small messages (Steven McCoy). + +Changes +------- + +* Upgraded OpenPGM to version 5.1.115 (Pieter Hintjens). + +* OpenPGM build changed to not install OpenPGM artifacts. + + 0MQ version 2.1.3 (Stable), released on 2011/03/21 ================================================== @@ -10,9 +26,6 @@ Bug fixes * Fix to PUB sockets, which would sometimes deliver tail frames of a multipart message to new subscribers (Martin Sustrik). -* Re-add PGM_TXW_MAX_RTE in order to have rate limiting on pgm transport - over OpenPGM (Steven McCoy). - * Windows build was broken due to EPROTONOSUPPORT not being defined. This has now been fixed (Martin Sustrik). @@ -92,6 +105,9 @@ New functionality * If memory is exhausted, 0MQ warns with an explicit message before aborting the process. +* Size of inproc HWM and SWAP is sum of peers' HWMs and SWAPs (Douglas + Greager, Martin Sustrik). + Bug fixes --------- diff --git a/builds/msvc/Makefile.in b/builds/msvc/Makefile.in index c3ba84f..a841118 100644 --- a/builds/msvc/Makefile.in +++ b/builds/msvc/Makefile.in @@ -175,6 +175,7 @@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pgm_basename = @pgm_basename@ pgm_srcdir = @pgm_srcdir@ +pgm_subdir = @pgm_subdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for zeromq 2.1.3. +# Generated by GNU Autoconf 2.67 for zeromq 2.1.4. # # Report bugs to <zeromq-dev@lists.zeromq.org>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='zeromq' PACKAGE_TARNAME='zeromq' -PACKAGE_VERSION='2.1.3' -PACKAGE_STRING='zeromq 2.1.3' +PACKAGE_VERSION='2.1.4' +PACKAGE_STRING='zeromq 2.1.4' PACKAGE_BUGREPORT='zeromq-dev@lists.zeromq.org' PACKAGE_URL='' @@ -754,9 +754,10 @@ ON_MINGW_FALSE ON_MINGW_TRUE BUILD_PGM_FALSE BUILD_PGM_TRUE +pgm_basename subdirs pgm_srcdir -pgm_basename +pgm_subdir INSTALL_MAN_FALSE INSTALL_MAN_TRUE BUILD_DOC_FALSE @@ -1454,7 +1455,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zeromq 2.1.3 to adapt to many kinds of systems. +\`configure' configures zeromq 2.1.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1524,7 +1525,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zeromq 2.1.3:";; + short | recursive ) echo "Configuration of zeromq 2.1.4:";; esac cat <<\_ACEOF @@ -1634,7 +1635,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zeromq configure 2.1.3 +zeromq configure 2.1.4 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2389,7 +2390,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zeromq $as_me 2.1.3, which was +It was created by zeromq $as_me 2.1.4, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3208,7 +3209,7 @@ fi # Define the identity of the package. PACKAGE='zeromq' - VERSION='2.1.3' + VERSION='2.1.4' cat >>confdefs.h <<_ACEOF @@ -6283,13 +6284,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6286: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6287: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6289: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6290: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6292: output\"" >&5) + (eval echo "\"\$as_me:6293: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7492,7 +7493,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7495 "configure"' > conftest.$ac_ext + echo '#line 7496 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9516,11 +9517,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9519: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9520: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9523: \$? = $ac_status" >&5 + echo "$as_me:9524: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9855,11 +9856,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9858: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9859: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9862: \$? = $ac_status" >&5 + echo "$as_me:9863: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9960,11 +9961,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9963: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9964: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9967: \$? = $ac_status" >&5 + echo "$as_me:9968: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10015,11 +10016,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10018: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10019: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10022: \$? = $ac_status" >&5 + echo "$as_me:10023: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12399,7 +12400,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12402 "configure" +#line 12403 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12495,7 +12496,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12498 "configure" +#line 12499 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14451,11 +14452,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14454: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14455: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14458: \$? = $ac_status" >&5 + echo "$as_me:14459: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14550,11 +14551,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14553: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14554: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14557: \$? = $ac_status" >&5 + echo "$as_me:14558: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14602,11 +14603,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14605: $lt_compile\"" >&5) |