CVS update: metaserver

[Vanilla CVS Development <vanilla-devel@us.netrek.org>]

Date:	Friday November 12, 1999 @ 19:15
Author:	unbelver

Update of /home/netrek/cvsroot/metaserver
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv6549

Modified Files:
	disp_web.c scan.c 
Log Message:

Oops, James informed me that the server header comes AFTER the
request, not before.  Source adjusted as necessary.

--Carlos V.



****************************************

Index: metaserver/disp_web.c
diff -u metaserver/disp_web.c:1.4 metaserver/disp_web.c:1.5
--- metaserver/disp_web.c:1.4	Thu Nov 11 19:12:41 1999
+++ metaserver/disp_web.c	Fri Nov 12 19:14:59 1999
@@ -4,7 +4,7 @@
  * MetaServerII
  * Copyright (c) 1993 by Andy McFadden
  * 
- * $Id: disp_web.c,v 1.4 1999/11/12 01:12:41 unbelver Exp $
+ * $Id: disp_web.c,v 1.5 1999/11/13 01:14:59 unbelver Exp $
  * 
  */
 #include <stdio.h>
@@ -33,8 +33,7 @@
 }
 
 
-int
-display_web1(idx, port_idx)
+int display_web(idx, port_idx)
      int idx, port_idx;
 {
   register int i;
@@ -56,38 +55,12 @@
   up->data_size = up->buf_size = up->pos = 0;
 
   now = time(0);
- 
 
   /* print server header */
   Uprintf(idx, "HTTP/1.0 200 OK\n");
   Uprintf(idx, "Server: netrekmetarc/1.0\n");
   Uprintf(idx, "MIME-version: 1.0\n");
   Uprintf(idx, "Content-type: text/html\n\n");
-  return 0;
-}
-
-display_web2(idx, port_idx)
-     int idx, port_idx;
-{
-  register int i;
-  USER *up;
-  SERVER *sp;
-  time_t now;
-  int srv, ago, *sorted;
-  char flagbuf[8], buf[128];
-  char *cp;
-
-  up = &users[idx];
-
-  if(up->buf)
-    {
-      free(up->buf);
-      up->buf = NULL;
-    }
-
-  up->data_size = up->buf_size = up->pos = 0;
-
-  now = time(0);
 
   /* print page */
   Uprintf(idx, "\
Index: metaserver/scan.c
diff -u metaserver/scan.c:2.8 metaserver/scan.c:2.9
--- metaserver/scan.c:2.8	Thu Nov 11 19:12:41 1999
+++ metaserver/scan.c	Fri Nov 12 19:14:59 1999
@@ -4,7 +4,7 @@
  * MetaServerII
  * Copyright (c) 1993 by Andy McFadden
  * 
- * $Id: scan.c,v 2.8 1999/11/12 01:12:41 unbelver Exp $
+ * $Id: scan.c,v 2.9 1999/11/13 01:14:59 unbelver Exp $
  * 
  */
 #include <stdio.h>
@@ -1340,26 +1340,13 @@
   alarm(MAX_WEB_TIME);  /* just in case the browser takes too long */
 
   /* display the server header */
-  display_web1(idx, port_idx);
-
-  while(users[idx].data_size)
-    {
-      if ((cc = write(idx, users[idx].buf+users[idx].pos, users[idx].data_size)) < 0)
-	{    
-	  log_msg("write error in handle_web = %d", errno);
-	  close_user(idx);
-	  return;
-	}
-      users[idx].pos += cc;
-      users[idx].data_size -= cc;
-    }
-
+  
   /* wait for browser "request" */
   /* I don't care what I get */
   recv(idx, inpacket, MAX_WEB_BYTES, 0);
 
   /* display "web page" */
-  display_web2(idx, port_idx );
+  display_web(idx, port_idx );
 
   while(users[idx].data_size)
     {