diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-01 14:36:50 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-01 14:36:50 +0000 |
| commit | 8e3facba87e95c8df50b8eea78f09c8b2f9a1d81 (patch) | |
| tree | 0c287c74a445655bf4a8c1d83b460f727299970a /main | |
| parent | 9a335a2d2b7633aaf44776e2a85798783bc90e13 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@273351 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/main/manager.c b/main/manager.c index 8502268e7..d17fd1b3d 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; |