2002-04-10 Mike Siers <mikes@poliac.com>

	* rtems_webserver/NOTES, rtems_webserver/asp.c,
	rtems_webserver/balloc.c, rtems_webserver/default.c,
	rtems_webserver/ej.h, rtems_webserver/ejIntrn.h,
	rtems_webserver/ejlex.c, rtems_webserver/ejparse.c,
	rtems_webserver/emfdb.c, rtems_webserver/emfdb.h,
	rtems_webserver/form.c, rtems_webserver/h.c,
	rtems_webserver/handler.c, rtems_webserver/license.txt,
	rtems_webserver/md5.h, rtems_webserver/md5c.c,
	rtems_webserver/mime.c, rtems_webserver/misc.c,
	rtems_webserver/ringq.c, rtems_webserver/rom.c,
	rtems_webserver/security.c, rtems_webserver/sock.c,
	rtems_webserver/sym.c, rtems_webserver/uemf.c,
	rtems_webserver/uemf.h, rtems_webserver/um.c, rtems_webserver/um.h,
	rtems_webserver/url.c, rtems_webserver/value.c,
	rtems_webserver/wbase64.c, rtems_webserver/webcomp.c,
	rtems_webserver/webpage.c, rtems_webserver/webrom.c,
	rtems_webserver/webs.c, rtems_webserver/webs.h,
	rtems_webserver/websuemf.c, rtems_webserver/wsIntrn.h:
	Update to GoAhead Webserver 2.1.4. The following URL is
	the release notes from GoAhead.

	    http://data.goahead.com/Software/Webserver/2.1.4/release.htm

	I have only done a minimal amount of testing (i.e. the network
	demo program works fine).  Please try this out and let me know
	if it works.  The patch needs to be applied on the
	c/src/libnetworking/rtems_webserver directory.

1 files changed, 14 insertions, 2 deletions

diff --git a/cpukit/httpd/uemf.c b/cpukit/httpd/uemf.c
index aa177849a2..ffe6a04cd1 100644
--- a/cpukit/httpd/uemf.c
+++ b/cpukit/httpd/uemf.c
@@ -4,6 +4,8 @@
  * Copyright (c) GoAhead Software Inc., 1995-2000. All Rights Reserved.
  *
  * See the file "license.txt" for usage and redistribution license requirements
+ *
+ * $Id$
  */
 
 /********************************** Description *******************************/
@@ -46,14 +48,24 @@ void error(E_ARGS_DEC, int etype, char_t *fmt, ...)
 
 	if (etype == E_LOG) {
 		fmtAlloc(&buf, E_MAX_ERROR, T("%s\n"), fmtBuf);
-#if DEV
+/*#ifdef DEV*/
 	} else if (etype == E_ASSERT) {
 		fmtAlloc(&buf, E_MAX_ERROR, 
 			T("Assertion %s, failed at %s %d\n"), fmtBuf, E_ARGS); 
-#endif
+/*#endif*/
 	} else if (etype == E_USER) {
 		fmtAlloc(&buf, E_MAX_ERROR, T("%s\n"), fmtBuf);
 	}
+   /*
+    * bugfix -- if etype is not E_LOG, E_ASSERT, or E_USER, the call to
+    * bfreeSafe(B_L, buf) below will fail, because 'buf' is randomly
+    * initialized. To be nice, we format a message saying that this is an
+    * unknown message type, and in doing so give buf a valid value. Thanks 
+    * to Simon Byholm.
+    */
+   else {
+      fmtAlloc(&buf, E_MAX_ERROR, T("Unknown error"));
+   }
 	va_end(args);
 
 	bfree(B_L, fmtBuf);