diff --git a/README b/README
index 2d6d7b990..ead37bb97 100644
--- a/README
+++ b/README
@@ -136,7 +136,9 @@ Win32 issues
this.
* The test harness appears to be broken under VC8.0. Debugging shows a problem
- the _close() function which is weird.
+ the _close() function which is weird. CGI is also broken under VC8.0.
+
+* CGI works under Win32, but needs some more work to get it right.
Solaris issues
==============
diff --git a/config/win32config b/config/win32config
index 574081492..4c197c83f 100644
--- a/config/win32config
+++ b/config/win32config
@@ -16,11 +16,11 @@ CONFIG_PLATFORM_WIN32=y
# Microsoft Compiler Options
#
# CONFIG_VISUAL_STUDIO_6_0 is not set
-# CONFIG_VISUAL_STUDIO_7_0 is not set
-CONFIG_VISUAL_STUDIO_8_0=y
+CONFIG_VISUAL_STUDIO_7_0=y
+# CONFIG_VISUAL_STUDIO_8_0 is not set
CONFIG_VISUAL_STUDIO_6_0_BASE=""
-CONFIG_VISUAL_STUDIO_7_0_BASE=""
-CONFIG_VISUAL_STUDIO_8_0_BASE="c:\\Program Files\\Microsoft Visual Studio 8"
+CONFIG_VISUAL_STUDIO_7_0_BASE="c:\\Program Files\\Microsoft Visual Studio .NET 2003"
+CONFIG_VISUAL_STUDIO_8_0_BASE=""
CONFIG_EXTRA_CFLAGS_OPTIONS=""
CONFIG_EXTRA_LDFLAGS_OPTIONS=""
@@ -61,9 +61,9 @@ CONFIG_HTTP_PORT=80
CONFIG_HTTP_TIMEOUT=0
CONFIG_HTTP_INITIAL_SLOTS=10
CONFIG_HTTP_MAX_USERS=100
-# CONFIG_HTTP_HAS_CGI is not set
-CONFIG_HTTP_CGI_EXTENSION=""
-# CONFIG_HTTP_DIRECTORIES is not set
+CONFIG_HTTP_HAS_CGI=y
+CONFIG_HTTP_CGI_EXTENSION=".php"
+CONFIG_HTTP_DIRECTORIES=y
# CONFIG_HTTP_PERM_CHECK is not set
# CONFIG_HTTP_HAS_IPV6 is not set
CONFIG_HTTP_VERBOSE=y
diff --git a/docsrc/Makefile b/docsrc/Makefile
index 574d5ebda..a9a1e502c 100644
--- a/docsrc/Makefile
+++ b/docsrc/Makefile
@@ -1,18 +1,18 @@
#
# Copyright(C) 2006
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# This library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
+# This license is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# You should have received a copy of the GNU Lesser General Public License
+# along with this license; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
diff --git a/www/test_dir/health.sh b/www/test_dir/health.sh
new file mode 100755
index 000000000..4a4cdfb41
--- /dev/null
+++ b/www/test_dir/health.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+echo "Content-type: text/html"
+echo
+
+echo ""
+echo "System Health"
+
+echo "System Health for '`hostname`'
"
+echo "Processes
"
+echo ""
+ps -ef | sed -e "s/\(.*\)/| \1<\/td><\/tr>/"
+echo " |
"
+
+echo "Free FileSystem Space
"
+echo ""
+df -h . | sed -e "s/\(.*\)/| \1<\/td><\/tr>/"
+echo " |
"
+
+echo ""
+
diff --git a/www/test_dir/tmp b/www/test_dir/tmp
new file mode 120000
index 000000000..cad230910
--- /dev/null
+++ b/www/test_dir/tmp
@@ -0,0 +1 @@
+/tmp
\ No newline at end of file