[asterisk-commits] tilghman: branch 1.6.0 r173460 - in /branches/1.6.0: ./ main/tcptls.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Feb  4 12:55:32 2009
New Revision: 173460

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=173460
Log:
Merged revisions 173458 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r173458 | tilghman | 2009-02-04 12:48:06 -0600 (Wed, 04 Feb 2009) | 9 lines
  
  When using a socket as a FILE *, the stdio functions will sometimes try to do
  an fseek() on the stream, which is an invalid operation for a socket.  Turning
  off buffering explicitly lets the stdio functions know they cannot do this,
  thus avoiding a potential error.
  (closes issue #14400)
   Reported by: fnordian
   Patches: 
         tcptls.patch uploaded by fnordian (license 110)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/tcptls.c

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

Modified: branches/1.6.0/main/tcptls.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/tcptls.c?view=diff&rev=173460&r1=173459&r2=173460
==============================================================================
--- branches/1.6.0/main/tcptls.c (original)
+++ branches/1.6.0/main/tcptls.c Wed Feb  4 12:55:32 2009
@@ -387,8 +387,10 @@
 	/*
 	* open a FILE * as appropriate.
 	*/
-	if (!tcptls_session->parent->tls_cfg)
+	if (!tcptls_session->parent->tls_cfg) {
 		tcptls_session->f = fdopen(tcptls_session->fd, "w+");
+		setvbuf(tcptls_session->f, NULL, _IONBF, 0);
+	}
 #ifdef DO_SSL
 	else if ( (tcptls_session->ssl = SSL_new(tcptls_session->parent->tls_cfg->ssl_ctx)) ) {
 		SSL_set_fd(tcptls_session->ssl, tcptls_session->fd);