diff options
| author | Alan Conway <aconway@apache.org> | 2014-09-04 16:00:37 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2014-09-04 16:00:37 +0000 |
| commit | 16a652bd02661747db2b7c6741196542a5b3b4b2 (patch) | |
| tree | 56492ec12bf2a372a7de5341b246485dd681c398 /qpid/cpp/src | |
| parent | 8a3de7651333492990aee20717a87dbfd2acf768 (diff) | |
| download | qpid-python-16a652bd02661747db2b7c6741196542a5b3b4b2.tar.gz | |
[AMQP 1.0] tcp-nodelay not supported yet on 1.0 connections
Fixed.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1622507 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/messaging/amqp/SslTransport.cpp | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/messaging/amqp/TcpTransport.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/messaging/amqp/SslTransport.cpp b/qpid/cpp/src/qpid/messaging/amqp/SslTransport.cpp index ffb64c4421..e8ef2d587b 100644 --- a/qpid/cpp/src/qpid/messaging/amqp/SslTransport.cpp +++ b/qpid/cpp/src/qpid/messaging/amqp/SslTransport.cpp @@ -63,6 +63,7 @@ struct StaticInit SslTransport::SslTransport(TransportContext& c, boost::shared_ptr<Poller> p) : context(c), connector(0), aio(0), poller(p) { const ConnectionOptions* options = context.getOptions(); + options->configureSocket(socket); if (options->sslCertName != "") { QPID_LOG(debug, "ssl-cert-name = " << options->sslCertName); socket.setCertName(options->sslCertName); diff --git a/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.cpp b/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.cpp index c66f64567a..a919e974d6 100644 --- a/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.cpp +++ b/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.cpp @@ -20,6 +20,7 @@ */ #include "TcpTransport.h" #include "ConnectionContext.h" +#include "qpid/messaging/ConnectionOptions.h" #include "qpid/sys/AsynchIO.h" #include "qpid/sys/ConnectionCodec.h" #include "qpid/sys/Poller.h" @@ -54,6 +55,7 @@ void TcpTransport::connect(const std::string& host, const std::string& port) { assert(!connector); assert(!aio); + context.getOptions()->configureSocket(*socket); connector = AsynchConnector::create( *socket, host, port, |