--- libwww/Library/src/HTTCP.c	1996/11/06 15:27:56	2.94.2.6
+++ libwww/Library/src/HTTCP.c	1996/11/07 18:47:36	2.94.2.7
@@ -3,7 +3,7 @@
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: HTTCP.c,v 2.94.2.6 1996/11/06 15:27:56 eric Exp $
+**	@(#) $Id: HTTCP.c,v 2.94.2.7 1996/11/07 18:47:36 frystyk Exp $
 **
 **	This code is in common between client and server sides.
 **
@@ -223,9 +223,9 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 		**  connection.
 		*/
 #ifdef HT_MUX
-		HTMuxChannel * muxch = HTHost_muxChannel(me);
+		HTMuxChannel * muxch = HTMuxChannel_find(me);
 		HTProtocol * protocol = HTNet_protocol(net);
-		HTMuxSession_connect(muxch, net, HTProtocol_id(protocol));
+		net->session = HTMuxSession_connect(muxch, net, HTProtocol_id(protocol));
 #endif /* HT_MUX */
 
 		/*
@@ -269,12 +269,9 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 	    **  new session.
 	    */
 	    {
-		HTChannel * channel = HTHost_channel(me);
 		HTProtocol * protocol = HTNet_protocol(net);
-		HTMuxChannel * muxch = HTMuxChannel_new(me, channel);
-		HTHost_setMuxChannel(me, muxch);
-		HTHost_setMode(me, HT_TP_INTERLEAVE);
-		HTMuxSession_connect(muxch, net, HTProtocol_id(protocol));
+		HTMuxChannel * muxch = HTMuxChannel_new(me);
+		net->session = HTMuxSession_connect(muxch, net, HTProtocol_id(protocol));
 	    }
 #endif /* HT_MUX */
 
@@ -463,8 +460,7 @@ PUBLIC int HTDoAccept (HTNet * net, HTNe
 	HTHost * host = (*accepted)->host;
 	HTChannel * ch = HTChannel_new(HTNet_socket(*accepted), NO);
 #ifdef HT_MUX
-	HTMuxChannel * muxch = HTMuxChannel_new(host, ch);
-	HTHost_setMuxChannel(host, muxch);
+	HTMuxChannel_new(host);
 #endif /* HT_MUX */
 	HTHost_setChannel(host, ch);
     }