From fd74c49296fe65ab7e6b3dad9d9b28995acd6c90 Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Thu, 1 Jul 2010 14:36:50 +0000 Subject: [PATCH] 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 --- main/manager.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/main/manager.c b/main/manager.c index 8502268e71..d17fd1b3d4 100644 --- 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;