public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Dirkjan Ochtman (djc)" <djc@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/zeromq/files: 2.1.6-msg-mask.patch
Date: Wed,  4 May 2011 08:29:13 +0000 (UTC)	[thread overview]
Message-ID: <20110504082913.91CD120057@flycatcher.gentoo.org> (raw)

djc         11/05/04 08:29:13

  Added:                2.1.6-msg-mask.patch
  Log:
  Take upstream fix for bad assertion.
  
  (Portage version: 2.1.9.46/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-libs/zeromq/files/2.1.6-msg-mask.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/zeromq/files/2.1.6-msg-mask.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/zeromq/files/2.1.6-msg-mask.patch?rev=1.1&content-type=text/plain

Index: 2.1.6-msg-mask.patch
===================================================================
https://github.com/zeromq/zeromq2-1/commit/71cb36d04bd74ca82aca3868e665831733995be7
--- src/decoder.cpp.bak	2011-05-04 10:19:21.000000000 +0200
+++ src/decoder.cpp	2011-05-04 10:18:50.000000000 +0200
@@ -109,7 +109,7 @@
 bool zmq::decoder_t::flags_ready ()
 {
     //  Store the flags from the wire into the message structure.
-    in_progress.flags = tmpbuf [0];
+    in_progress.flags = tmpbuf [0] | ~ZMQ_MSG_MASK;
 
     next_step (zmq_msg_data (&in_progress), zmq_msg_size (&in_progress),
         &decoder_t::message_ready);






                 reply	other threads:[~2011-05-04  8:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110504082913.91CD120057@flycatcher.gentoo.org \
    --to=djc@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox