summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2013-04-17 22:48:02 +0000
committerAndrew Stitcher <astitcher@apache.org>2013-04-17 22:48:02 +0000
commit4fd6d4886ffc6a12b1a4b27234f9d7104ff1080f (patch)
tree2c6b95193d9044d6e8a7f2511e257655465ce27f /qpid/cpp/src
parent079fb4c596673c3f2ac89af8c8a582a6115e673a (diff)
downloadqpid-python-4fd6d4886ffc6a12b1a4b27234f9d7104ff1080f.tar.gz
QPID-3689: Change tcp nodelay to be the default
This change also alters the implementation of simple switch like options when using boost version 1.35 and later. We now allow these switches to also take an optional "=yes" or "=no" (and similar) argument. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1469088 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/Broker.cpp2
-rw-r--r--qpid/cpp/src/qpid/client/ConnectionSettings.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index ab5398a0e8..bdc49e669d 100644
--- a/qpid/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
@@ -133,7 +133,7 @@ Broker::Options::Options(const std::string& name) :
replayFlushLimit(0),
replayHardLimit(0),
queueLimit(100*1048576/*100M default limit*/),
- tcpNoDelay(false),
+ tcpNoDelay(true),
requireEncrypted(false),
knownHosts(knownHostsNone),
qmf2Support(true),
diff --git a/qpid/cpp/src/qpid/client/ConnectionSettings.cpp b/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
index 822e4af269..20804572a4 100644
--- a/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
@@ -37,7 +37,7 @@ ConnectionSettings::ConnectionSettings() :
maxChannels(32767),
maxFrameSize(65535),
bounds(2),
- tcpNoDelay(false),
+ tcpNoDelay(true),
service(qpid::saslName),
minSsf(0),
maxSsf(256),