From 48d3977632fd6eed6977d2eab0ac421efd454b8e Mon Sep 17 00:00:00 2001
From: Ian Barber <ian.barber@gmail.com>
Date: Tue, 12 Jun 2012 14:51:33 +0100
Subject: [PATCH] Revert "Fix condition so that PGM and EPGM sockets always
 create pipes immediately, even if delay_attach_on_connect is set. This allows
 passing through the icanhasall flag, and is realistic given the fact those
 protocols should be able to connect immediately"

This reverts commit b5ace39e2a48b906237d869f4f819f1a28a8cee7.
---
 src/socket_base.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index f0e6e751..45cfc345 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -536,7 +536,7 @@ int zmq::socket_base_t::connect (const char *addr_)
     if (protocol == "pgm" || protocol == "epgm")
         icanhasall = true;
 
-    if (options.delay_attach_on_connect != 1 || icanhasall) {
+    if (options.delay_attach_on_connect != 1 && icanhasall != true) {
         //  Create a bi-directional pipe.
         object_t *parents [2] = {this, session};
         pipe_t *pipes [2] = {NULL, NULL};