summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-02-19 22:52:31 +0000
committerRobert Gemmell <robbie@apache.org>2012-02-19 22:52:31 +0000
commit3a419d9fa4436982df96d94da92f31b2d739b6ed (patch)
treedce1701a9fa7447bf2085e7d737e23cce7797c0e
parent476c5295fc8e2f082213f7c2592839bf3f338abc (diff)
downloadqpid-python-3a419d9fa4436982df96d94da92f31b2d739b6ed.tar.gz
NO-JIRA: update docs to mention new qpid.tcp_nodelay option instead of older sytem property and add note of default change
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291087 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/doc/book/src/Programming-In-Apache-Qpid.xml16
1 files changed, 10 insertions, 6 deletions
diff --git a/qpid/doc/book/src/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
index 19baf74a90..275fce1796 100644
--- a/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
+++ b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
@@ -3340,7 +3340,7 @@ amqp://guest:guest@/test?failover='roundrobin?cyclecount='2''
</entry>
<entry>
If <literal>tcp_nodelay='true'</literal>, TCP packet
- batching is disabled.
+ batching is disabled. Defaults to true since Qpid 0.14.
</entry>
</row>
</tbody>
@@ -3756,11 +3756,15 @@ log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n
<entry><para>The length of time (in milliseconds) to wait for a synchronous operation to complete.</para><para>For compatibility with older clients, the synonym <varname>amqj.default_syncwrite_timeout</varname> is supported.</para></entry>
</row>
<row>
- <entry>amqj.tcp_nodelay</entry>
- <entry>boolean</entry>
- <entry>false</entry>
- <entry><para>Sets the TCP_NODELAY property of the underlying socket.</para><para>This could also be set per connection as well (see connection paramters).</para></entry>
- </row>
+ <entry>qpid.tcp_nodelay</entry>
+ <entry>boolean</entry>
+ <entry>true</entry>
+ <entry>
+ <para>Sets the TCP_NODELAY property of the underlying socket. The default was changed to true as of Qpid 0.14.</para>
+ <para>This can also be set per connection using the <link linkend="section-jms-connection-url">Connection URL</link> options.</para>
+ <para>For compatibility with older clients, the synonym <varname>amqj.tcp_nodelay</varname> is supported.</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</table>