From merlyn@jacobs.jacobs.mn.org Sun Nov 21 22:02:43 EST 1993
Article: 2673 of comp.os.linux.development
Path: samba.oit.unc.edu!concert!news-feed-1.peachnet.edu!umn.edu!kksys.com!haapi!jacobs!jacobs!not-for-mail
From: merlyn@jacobs.jacobs.mn.org (Doug McIntyre)
Newsgroups: comp.os.linux.development
Subject: Mosaic-2.0 patches
Date: 19 Nov 1993 12:13:57 -0600
Organization: Jacobs Ladder BBS, Minneapolis, MN, USA
Lines: 66
Message-ID: <2cj2d5$gi8@jacobs.jacobs.mn.org>
NNTP-Posting-Host: localhost.jacobs.mn.org

Here are the patches I made to Mosaic-2.0 to get it to working under
Linux. I think I mentioned this to the person in charge of net2Debugged
as well. It patches around Mosaic 2.0 trying to do non-blocking I/O on
a connect to a socket. Apparently, it works okay when doing normal blocking
I/O on the socket as well.. 

The patches are tiny. They just #if 0 out two small patches of code. 

It would be nice to get HDF compiled under Linux to get linked in, but HDF
requires DTM, and DTM uses sendmsg(), which Linux doesn't have yet. I wish
I was more savvy in network programming to be able to program around sendmsg()
but my attempts to fail about 50% of the time :( 
There was somebody who did Collage for Linux, and I asked for their patches, 
but all I got was a brush off from them ????? (Collage is a wrapper around
HDF mainly). 

--- HTTCP.c.old	Tue Nov  9 11:14:51 1993
+++ HTTCP.c	Thu Nov 18 16:06:47 1993
@@ -335,6 +335,7 @@
   /* Now, let's get a socket set up from the server for the data: */      
   *s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
+#if 0
   /*
    * Make the socket non-blocking, so the connect can be canceled.
    * This means that when we issue the connect we should NOT
@@ -352,6 +353,8 @@
         HTProgress(line);
       }
   }
+#endif
+
   HTClearActiveIcon();
 
   /*
@@ -360,7 +363,6 @@
    * status.
    */
   status = connect(*s, (struct sockaddr*)&soc_address, sizeof(soc_address));
-
   /*
    * According to the Sun man page for connect:
    *     EINPROGRESS         The socket is non-blocking and the  con-
@@ -465,7 +467,7 @@
             }
 	}
     }
-
+#if 0
   /*
    * Make the socket blocking again on good connect
    */
@@ -490,7 +492,7 @@
     {
 	close(*s);
     }
-
+#endif
   return status;
 }
 
-- 
merlyn@jacobs.mn.org
I don't wanna watch TV...	     
I don't wanna listen to the Corporations..
I don't wanna drown in American Society..		-- L7