FS-10762: [freeswitch-core] Websocket logic error #resolve

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 7465198045392fb072af0d1f8fce3a8db98f3833..0fbb6a3b653041e55b2f4822325c4f39cb474939 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Mon Nov 13 13:48:40 CST 2017
+Tue Nov 14 12:28:03 CST 2017

diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
index 32fee259b4cab0821bf312a74b3ec2fc12a08720..834fa3c139c4cf401ef24b281bd5779b38111d74 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
@@ -442,7 +442,9 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
                        }
 
                        if (r == -1) {
-                               if ((ssl_err = SSL_get_error(wsh->ssl, r)) != SSL_ERROR_WANT_WRITE) {
+                               ssl_err = SSL_get_error(wsh->ssl, r);
+
+                               if (ssl_err != SSL_ERROR_WANT_WRITE && ssl_err != SSL_ERROR_WANT_READ) {
                                        break;
                                }
                                ssl_err = 0;

diff --git a/src/mod/endpoints/mod_verto/ws.c b/src/mod/endpoints/mod_verto/ws.c
index 32fee259b4cab0821bf312a74b3ec2fc12a08720..834fa3c139c4cf401ef24b281bd5779b38111d74 100644 (file)
--- a/src/mod/endpoints/mod_verto/ws.c
+++ b/src/mod/endpoints/mod_verto/ws.c
@@ -442,7 +442,9 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
                        }
 
                        if (r == -1) {
-                               if ((ssl_err = SSL_get_error(wsh->ssl, r)) != SSL_ERROR_WANT_WRITE) {
+                               ssl_err = SSL_get_error(wsh->ssl, r);
+
+                               if (ssl_err != SSL_ERROR_WANT_WRITE && ssl_err != SSL_ERROR_WANT_READ) {
                                        break;
                                }
                                ssl_err = 0;