Jelajahi Sumber

core: rolled back changes to receive.c

- Not actually needed because the recent change to ws_frame.c covers it all
  (I think)
Peter Dunkley 13 tahun lalu
induk
melakukan
9349870abc
1 mengubah file dengan 2 tambahan dan 7 penghapusan
  1. 2 7
      receive.c

+ 2 - 7
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