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)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@173460 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-02-04 18:55:32 +00:00
parent 826418a799
commit 8c1a726973

View File

@@ -387,8 +387,10 @@ void *ast_make_file_from_fd(void *data)
/*
* 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);