Merged revisions 273350 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r273350 | mnicholson | 2010-07-01 09:34:31 -0500 (Thu, 01 Jul 2010) | 2 lines

  Altered my comment about TCP_NODELAY
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273351 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/manager.c b/main/manager.c
index 8502268e71f112f989794e490f4f6d18200b207a..d17fd1b3d41a9d1c33062bc34c3424711a39e7cf 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -3215,10 +3215,9 @@ static void *session_do(void *data)
        if (session == NULL)
                goto done;
 
-       /* XXX here we set TCP_NODELAY on the socket to disable Nagle's
-        * algorithm.  A better solution might be to buffer outgoing messages
-        * until they are complete then write them to the socket in one burst
-        * rather than sending them in bits and pieces. */
+       /* here we set TCP_NODELAY on the socket to disable Nagle's algorithm.
+        * This is necessary to prevent delays (caused by buffering) as we
+        * write to the socket in bits and peices. */
        p = getprotobyname("tcp");
        if (p) {
                int arg = 1;