[asterisk-commits] kharwell: trunk r431695 - in /trunk: ./ res/ari/ari_websockets.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Feb 11 11:45:03 CST 2015


Author: kharwell
Date: Wed Feb 11 11:45:00 2015
New Revision: 431695

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431695
Log:
ari_websockets: removed extra check on websocket session read

When merging the websocket timeout issue (ASTERISK-24701) an extra, almost
duplicate, check was left in the code that should not have been. This removes
it.

ASTERISK-24701 #close
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/4412/
........

Merged revisions 431693 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/ari/ari_websockets.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/ari/ari_websockets.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/ari/ari_websockets.c?view=diff&rev=431695&r1=431694&r2=431695
==============================================================================
--- trunk/res/ari/ari_websockets.c (original)
+++ trunk/res/ari/ari_websockets.c Wed Feb 11 11:45:00 2015
@@ -104,12 +104,6 @@
 		return NULL;
 	}
 
-
-	if (ast_websocket_fd(session->ws_session) <= 0) {
-		return NULL;
-	}
-
-
 	while (!message) {
 		int res;
 		char *payload;




More information about the asterisk-commits mailing list