[asterisk-commits] mnicholson: branch 1.6.2 r273351 - in /branches/1.6.2: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Jul  1 09:36:50 2010
New Revision: 273351

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273351
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/manager.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/manager.c?view=diff&rev=273351&r1=273350&r2=273351
==============================================================================
--- branches/1.6.2/main/manager.c (original)
+++ branches/1.6.2/main/manager.c Thu Jul  1 09:36:50 2010
@@ -3215,10 +3215,9 @@
 	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;