[sr-dev] git:pd/websocket: core: rolled back changes to receive.c

Module: sip-router Branch: pd/websocket Commit: 9349870abc5eb0688cf0fd50c0fa54098158fa79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9349870… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 23:11:15 2012 +0100 core: rolled back changes to receive.c - Not actually needed because the recent change to ws_frame.c covers it all (I think) --- receive.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/receive.c b/receive.c index 9c53e0e..a4018ff 100644 --- a/receive.c +++ b/receive.c @@ -172,9 +172,9 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* check for the alias stuff */ #ifdef USE_TCP if (msg->via1->alias && cfg_get(tcp, tcp_cfg, accept_aliases) && - (((rcv_info->proto==PROTO_TCP || rcv_info->proto==PROTO_WS) && !tcp_disable) + (((rcv_info->proto==PROTO_TCP) && !tcp_disable) #ifdef USE_TLS - || ((rcv_info->proto==PROTO_TLS || rcv_info->proto==PROTO_WSS) && !tls_disable) + || ((rcv_info->proto==PROTO_TLS) && !tls_disable) #endif ) ){ @@ -186,11 +186,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) } #endif - /* Force connection reuse for responses if the message arrived on a - WebSocket */ - if (rcv_info->proto==PROTO_WS || rcv_info->proto==PROTO_WSS) - msg->rpl_send_flags.f |= SND_F_FORCE_CON_REUSE; - /* skip: */ DBG("preparing to run routing scripts...\n"); #ifdef STATS