Insert blank after REFER (bug #997)

Correct path to VM sample (bug #994)
Make manager interface non-blocking (bug #861)
Don't bork on empty from in SIP (bug #887)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2138 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 4 insertions, 0 deletions

diff --git a/manager.c b/manager.c
index fe8d2769b..ed285ec69 100755
--- a/manager.c
+++ b/manager.c
@@ -727,6 +727,7 @@ static void *accept_thread(void *ignore)
 	struct mansession *s;
 	struct protoent *p;
 	int arg = 1;
+	int flags;
 	pthread_attr_t attr;
 
 	pthread_attr_init(&attr);
@@ -752,6 +753,9 @@ static void *accept_thread(void *ignore)
 		} 
 		memset(s, 0, sizeof(struct mansession));
 		memcpy(&s->sin, &sin, sizeof(sin));
+		/* For safety, make sure socket is non-blocking */
+		flags = fcntl(as, F_GETFL);
+		fcntl(as, F_SETFL, flags | O_NONBLOCK);
 		ast_mutex_init(&s->lock);
 		s->fd = as;
 		ast_mutex_lock(&sessionlock);