Move nuttx/netutils to apps/netutils

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3401 42af7a65-404d-4744-a932-0658087f49c3

22 files changed, 9905 insertions, 0 deletions

diff --git a/apps/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile
new file mode 100644
index 000000000..85e603f22
--- /dev/null
+++ b/apps/netutils/thttpd/Makefile
@@ -0,0 +1,121 @@
+#############################################################################
+# apps/netutils/thttpd/Makefile
+#
+#   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+#############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# THTTPD Library
+
+ASRCS		=
+CSRCS		= 
+
+ifeq ($(CONFIG_NET_TCP),y)
+CSRCS		+= thttpd.c libhttpd.c thttpd_cgi.c thttpd_alloc.c thttpd_strings.c timers.c fdwatch.c tdate_parse.c
+endif
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS)
+OBJS		= $(AOBJS) $(COBJS)
+
+BIN	    	= ../../libapps$(LIBEXT)
+
+ROOTDEPPATH	= --dep-path .
+
+# CGI binaries (examples only, not used in the build)
+
+CGIBINDIR	= $(APPDIR)/netutils/thttpd/cgi-bin
+
+SUBDIRS		=
+ifeq ($(CONFIG_NXFLAT),y)
+SUBDIRS		= cgi-src
+SUBDIR_BIN1	= phf
+SUBDIR_BIN2	= redirect
+SUBDIR_BIN3	= ssi
+SUBDIR_BIN	+= cgi-bin/$(SUBDIR_BIN1) cgi-bin/$(SUBDIR_BIN2)  cgi-bin/$(SUBDIR_BIN3)
+endif
+
+all: $(SUBDIR_BIN) $(BIN)
+.PHONY: depend clean distclean
+
+ifeq ($(CONFIG_NXFLAT),y)
+cgi-bin:
+	@mkdir cgi-bin
+
+cgi-src/$(SUBDIR_BIN1):
+	@$(MAKE) -C cgi-src $(SUBDIR_BIN1)
+
+cgi-bin/$(SUBDIR_BIN1): cgi-bin cgi-src/$(SUBDIR_BIN1)
+	@cp -a cgi-src/$(SUBDIR_BIN1) $@
+
+cgi-src/$(SUBDIR_BIN2):
+	@$(MAKE) -C cgi-src $(SUBDIR_BIN2)
+
+cgi-bin/$(SUBDIR_BIN2): cgi-bin cgi-src/$(SUBDIR_BIN2)
+	@cp -a cgi-src/$(SUBDIR_BIN2) $@
+
+cgi-src/$(SUBDIR_BIN3):
+	@$(MAKE) -C cgi-src $(SUBDIR_BIN3)
+
+cgi-bin/$(SUBDIR_BIN3): cgi-bin cgi-src/$(SUBDIR_BIN3)
+	@cp -a cgi-src/$(SUBDIR_BIN3) $@
+endif
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+	@touch .built
+	
+.built: $(BIN)
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+# Register application
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/apps/netutils/thttpd/cgi-src/Makefile b/apps/netutils/thttpd/cgi-src/Makefile
new file mode 100644
index 000000000..3f025dec3
--- /dev/null
+++ b/apps/netutils/thttpd/cgi-src/Makefile
@@ -0,0 +1,136 @@
+############################################################################
+# apps/netutils/cgi-src/Makefile
+#
+#   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+
+CFLAGS		+= -I$(APPDIR)/netutils/thttpd -I$(APPDIR)/netutils/thttpd/cgi-src
+CGIBINDIR	= $(APPDIR)/netutils/thttpd/cgi-bin
+CLEANFILES	= *.o redirect ssi phf
+
+BIN1			= phf
+BIN2			= redirect
+BIN3			= ssi
+BIN				= $(BIN1) $(BIN2) $(BIN3)
+
+R1SRCS1			= $(BIN1).c
+R1OBJS1			= $(R1SRCS1:.c=.o)
+R2SRC1			= $(BIN1)-thunk.S
+R2OBJ1			= $(R2SRC1:.S=.o)
+
+R1SRCS2			= $(BIN2).c
+R1OBJS2			= $(R1SRCS2:.c=.o)
+R2SRC2			= $(BIN2)-thunk.S
+R2OBJ2			= $(R2SRC2:.S=.o)
+
+R1SRCS3			= $(BIN3).c
+R1OBJS3			= $(R1SRCS3:.c=.o)
+R2SRC3			= $(BIN3)-thunk.S
+R2OBJ3			= $(R2SRC3:.S=.o)
+
+DERIVED			= $(R2SRC1) $(R2SRC2) $(R2SRC3)
+
+R1COBJS			= $(R1OBJS1) $(R1OBJS2) $(R1OBJS3)
+R2AOBJS			= $(R2OBJ1) $(R2OBJ2) $(R2OBJ3)
+
+all: $(BIN1) $(BIN2) $(BIN3)
+
+$(R1COBJS): %.o: %.c
+	@echo "CC: $<"
+	@$(CC) -c $(CPICFLAGS) $< -o $@
+
+$(R2AOBJS): %.o: %.S
+	@echo "AS: $<"
+	@$(CC) -c $(CPICFLAGS) $< -o $@
+
+# BIN1
+
+$(BIN1).r1: $(R1OBJS1)
+	@echo "LD: $<"
+	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+
+$(R2SRC1): $(BIN1).r1
+	@echo "MK: $<"
+	@$(MKNXFLAT) -o $@ $^
+
+$(BIN1).r2: $(R2OBJ1)
+	@echo "LD: $<"
+	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS1) $(R2OBJ1)
+
+$(BIN1): $(BIN1).r2
+	@echo "LD: $<"
+	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+
+#BIN2
+
+$(BIN2).r1: $(R1OBJS2)
+	@echo "LD: $<"
+	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+
+$(R2SRC2): $(BIN2).r1
+	@echo "MK: $<"
+	@$(MKNXFLAT) -o $@ $^
+
+$(BIN2).r2: $(R2OBJ2)
+	@echo "LD: $<"
+	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS2) $(R2OBJ2)
+
+$(BIN2): $(BIN2).r2
+	@echo "LD: $<"
+	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+# BIN3
+
+$(BIN3).r1: $(R1OBJS3)
+	@echo "LD: $<"
+	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+
+$(R2SRC3): $(BIN3).r1
+	@echo "MK: $<"
+	@$(MKNXFLAT) -o $@ $^
+
+$(BIN3).r2: $(R2OBJ3)
+	@echo "LD: $<"
+	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS3) $(R2OBJ3)
+
+$(BIN3): $(BIN3).r2
+	@echo "LD: $<"
+	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+
+clean:
+	@rm -f $(BIN1) $(BIN2) $(BIN3) *.r1 *.r2 *-thunk.S *~ .*.swp
+	$(call CLEAN)
+
+distclean: clean
+
diff --git a/apps/netutils/thttpd/cgi-src/phf.c b/apps/netutils/thttpd/cgi-src/phf.c
new file mode 100644
index 000000000..2541481c4
--- /dev/null
+++ b/apps/netutils/thttpd/cgi-src/phf.c
@@ -0,0 +1,77 @@
+/****************************************************************************
+ * netutils/thttpd/cgi-src/phf.c
+ * Cracker trap
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in the original THTTPD package:
+ *
+ *   Copyright © 1996 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* Old distributions of the NCSA and Apache web servers included a
+ * version of the phf program that had a bug.  The program could
+ * easily be made to run arbitrary shell commands.  There is no real
+ * legitimate use for phf, so any attempts to run it must be considered
+ * to be attacks.  Accordingly, this version of phf logs the attack
+ * on stderr and then returns a page on CONFIG_THTTPD_CGI_OUTFD indicating
+ * that phf doesn't exist.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  fprintf(stderr, "phf CGI probe from %s\n", getenv("REMOTE_ADDR"));
+
+  (void)printf("\
+Content-type: text/html\n\
+Status: 404/html\n\
+\n\
+<HTML><HEAD><TITLE>404 Not Found</TITLE></HEAD>\n\
+<BODY><H2>404 Not Found</H2>\n\
+The requested object does not exist on this server.\n\
+The link you followed is either outdated, inaccurate,\n\
+or the server has been instructed not to let you have it.\n\
+</BODY></HTML>\n");
+  return 0;
+}
diff --git a/apps/netutils/thttpd/cgi-src/redirect.c b/apps/netutils/thttpd/cgi-src/redirect.c
new file mode 100644
index 000000000..84f3b8712
--- /dev/null
+++ b/apps/netutils/thttpd/cgi-src/redirect.c
@@ -0,0 +1,269 @@
+/****************************************************************************
+ * netutils/thttpd/cgi-src/redirect.c
+ * Simple redirection CGI program
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in the original THTTPD package:
+ *
+ *   Copyright © 1995 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* Three steps to set up a redirection:
+ *
+ *  1. Make sure your web server is set up to allow CGI programs.
+ *  2. Make a symbolic link from the file you want to redirect,
+ *     pointing at this program in the CGI bin directory.
+ *  3. Add an entry to the file ".redirects" in the directory where your
+ *     http server runs CGI programs.  For most servers, this is the
+ *     directory where the given CGI program lives.  The format of the
+ *     file is a bunch of lines with a filename, whitespace, and the new
+ *     URL.  For example:
+ *
+ *     /test/oldfile.html    http://www.acme.com/test/newfile.html
+ *
+ *     The easiest way to figure out precisely what filename to put into
+ *     .redirects is to set up the symlink and then click on it.  You'll get
+ *     back a "404 Not Found" page which includes the filename as received by
+ *     the redirect program, and that's what you want to use.
+ *
+ * Note: this is designed for thttpd (http://www.acme.com/software/thttpd/)
+ * and using it with other web servers may require some hacking.  A possible
+ * gotcha is with the symbolic link from the old file pointing at this
+ * script - servers other than thttpd may not allow that link to be run
+ * as a CGI program, because they don't check the link to see that it
+ * points into the allowed CGI directory.
+ *
+ * Note two: It would be really cool to have this program look for
+ * the .redirects file in the same directory as the file being redirected,
+ * instead of in the binaries directory.  Unfortunately, this appears
+ * to be impossible with the information CGI gives, plus the non-standardized
+ * but widespread practice of running CGI programs in the directory where
+ * the binary lives.  Perhaps CGI 1.2 will address this.
+ */
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "config.h"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+#define LINE_SIZE 80
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static char g_iobuffer[LINE_SIZE];
+static char g_file[LINE_SIZE];
+static char g_url[LINE_SIZE];
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void internal_error(char *reason)
+{
+  char *title = "500 Internal Error";
+
+  (void)printf("\
+Status: %s\n\
+Content-type: text/html\n\
+\n\
+<HTML><HEAD><TITLE>%s</TITLE></HEAD>\n\
+<BODY><H2>%s</H2>\n\
+Something unusual went wrong during a redirection request:\n\
+<BLOCKQUOTE>\n\
+%s\n\
+</BLOCKQUOTE>\n\
+</BODY></HTML>\n", title, title, title, reason);
+}
+
+static void not_found(char *script_name)
+{
+  char *title = "404 Not Found";
+
+  (void)printf("\
+Status: %s\n\
+Content-type: text/html\n\
+\n\
+<HTML><HEAD><TITLE>%s</TITLE></HEAD>\n\
+<BODY><H2>%s</H2>\n\
+The requested filename, %s, is set up to be redirected to another URL;\n\
+however, the new URL has not yet been specified.\n\
+</BODY></HTML>\n", title, title, title, script_name);
+}
+
+static void moved(char *script_name, char *url)
+{
+  char *title = "Moved";
+
+  (void)printf("\
+Location: %s\n\
+Content-type: text/html\n\
+\n\
+<HTML><HEAD><TITLE>%s</TITLE></HEAD>\n\
+<BODY><H2>%s</H2>\n\
+The requested filename, %s, has moved to a new URL:\n\
+<A HREF=\"%s\">%s</A>.\n\
+</BODY></HTML>\n", url, title, title, script_name, url, url);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char **argv)
+{
+  char *script_name;
+  char *path_info;
+  char *cp = 0;
+  FILE *fp;
+  char *star;
+  int  err = 0;
+
+  /* Get the name that we were run as, which is the filename being **
+   * redirected.
+   */
+
+  script_name = getenv("SCRIPT_NAME");
+  if (!script_name)
+    {
+      internal_error("Couldn't get SCRIPT_NAME environment variable.");
+      return 1;
+    }
+
+  /* Append the PATH_INFO, if any.  This allows redirection of whole **
+   * directories.
+   */
+
+  path_info = getenv("PATH_INFO");
+  if (path_info)
+    {
+      cp = (char *)malloc(strlen(script_name) + strlen(path_info) + 1);
+      if (!cp)
+        {
+          internal_error("Out of memory.");
+          return 2;
+        }
+
+      (void)sprintf(cp, "%s%s", script_name, path_info);
+      script_name = cp;
+    }
+
+  /* Open the redirects file. */
+
+  fp = fopen(".redirects", "r");
+  if (fp == (FILE *) 0)
+    {
+      internal_error("Couldn't open .redirects file.");
+      err = 3;
+      goto errout_with_cp;
+    }
+
+  /* Search the file for a matching entry. */
+
+  while (fgets(g_iobuffer, LINE_SIZE, fp) != NULL)
+    {
+      /* Remove comments. */
+
+      cp = strchr(g_iobuffer, '#');
+      if (cp)
+        {
+          *cp = '\0';
+        }
+
+      /* Skip leading whitespace. */
+
+      cp = g_iobuffer;
+      cp += strspn(cp, " \t");
+
+      /* Check for blank line. */
+
+      if (*cp != '\0')
+        {
+          /* Parse line. */
+
+          if (sscanf(cp, "%[^ \t\n] %[^ \t\n]", g_file, g_url) == 2)
+            {
+              /* Check for wildcard match. */
+
+              star = strchr(g_file, '*');
+              if (star != (char *)0)
+                {
+                  /* Check for leading match. */
+
+                  if (strncmp(g_file, script_name, star - g_file) == 0)
+                    {
+                      /* Got it; put together the full name. */
+
+                      strcat(g_url, script_name + (star - g_file));
+
+                      /* XXX Whack the script_name, too? */
+
+                      moved(script_name, g_url);
+                      goto success_out;
+                    }
+                }
+
+              /* Check for exact match. */
+
+              if (strcmp(g_file, script_name) == 0)
+                {
+                  /* Got it. */
+
+                  moved(script_name, g_url);
+                  goto success_out;
+                }
+            }
+        }
+    }
+
+  /* No match found. */
+
+  not_found(script_name);
+  err = 4;
+
+success_out:
+  fclose(fp);
+errout_with_cp:
+  if (cp)
+    {
+      free(cp);
+    }
+  return err;
+}
diff --git a/apps/netutils/thttpd/cgi-src/ssi.c b/apps/netutils/thttpd/cgi-src/ssi.c
new file mode 100644
index 000000000..4afb141f9
--- /dev/null
+++ b/apps/netutils/thttpd/cgi-src/ssi.c
@@ -0,0 +1,957 @@
+/****************************************************************************
+ * netutils/thttpd/cgi-src/ssi.c
+ * Server-side-includes CGI program
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in the original THTTPD package:
+ *
+ *   Copyright © 1995 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <nuttx/regex.h>
+
+#include "config.h"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+#define ST_GROUND    0
+#define ST_LESSTHAN  1
+#define ST_BANG      2
+#define ST_MINUS1    3
+#define ST_MINUS2    4
+
+#define SF_BYTES     0
+#define SF_ABBREV    1
+
+#define DI_CONFIG    0
+#define DI_INCLUDE   1
+#define DI_ECHO      2
+#define DI_FSIZE     3
+#define DI_FLASTMOD  4
+
+#define BUFFER_SIZE  512
+#define TIMEFMT_SIZE 80
+#define MAX_TAGS     32
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void read_file(FILE *instream, char *vfilename, char *filename);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static char *g_url;
+static char  g_timeformat[TIMEFMT_SIZE];
+static char  g_iobuffer1[BUFFER_SIZE];
+static char  g_iobuffer2[BUFFER_SIZE];
+static char *g_tags[MAX_TAGS];
+static int   g_sizefmt;
+static struct stat g_sb;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void internal_error(char *reason)
+{
+  char *title = "500 Internal Error";
+
+  (void)printf("\
+<HTML><HEAD><TITLE>%s</TITLE></HEAD>\n\
+<BODY><H2>%s</H2>\n\
+Something unusual went wrong during a server-side-includes request:\n\
+<BLOCKQUOTE>\n\
+%s\n\
+</BLOCKQUOTE>\n\
+</BODY></HTML>\n", title, title, reason);
+}
+
+static void not_found(char *filename)
+{
+  char *title = "404 Not Found";
+
+  (void)printf("\
+<HTML><HEAD><TITLE>%s</TITLE></HEAD>\n\
+<BODY><H2>%s</H2>\n\
+The requested server-side-includes filename, %s,\n\
+does not seem to exist.\n\
+</BODY></HTML>\n", title, title, filename);
+}
+
+static void not_found2(char *directive, char *tag, char *filename)
+{
+  char *title = "Not Found";
+
+  (void)printf("\
+<HR><H2>%s</H2>\n\
+The filename requested in a %s %s directive, %s,\n\
+does not seem to exist.\n\
+<HR>\n", title, directive, tag, filename);
+}
+
+static void not_permitted(char *directive, char *tag, char *val)
+{
+  char *title = "Not Permitted";
+
+  (void)printf("\
+<HR><H2>%s</H2>\n\
+The filename requested in the %s %s=%s directive\n\
+may not be fetched.\n\
+<HR>\n", title, directive, tag, val);
+}
+
+static void unknown_directive(char *filename, char *directive)
+{
+  char *title = "Unknown Directive";
+
+  (void)printf("\
+<HR><H2>%s</H2>\n\
+The requested server-side-includes filename, %s,\n\
+tried to use an unknown directive, %s.\n\
+<HR>\n", title, filename, directive);
+}
+
+static void unknown_tag(char *filename, char *directive, char *tag)
+{
+  char *title = "Unknown Tag";
+
+  (void)printf("\
+<HR><H2>%s</H2>\n\
+The requested server-side-includes filename, %s,\n\
+tried to use the directive %s with an unknown tag, %s.\n\
+<HR>\n", title, filename, directive, tag);
+}
+
+static void unknown_value(char *filename, char *directive, char *tag, char *val)
+{
+  char *title = "Unknown Value";
+
+  (void)printf("\
+<HR><H2>%s</H2>\n\
+The requested server-side-includes filename, %s,\n\
+tried to use the directive %s %s with an unknown value, %s.\n\
+<HR>\n", title, filename, directive, tag, val);
+}
+
+static int get_filename(char *vfilename, char *filename,
+                         char *directive, char *tag, char *val, char *fn,
+                         int fnsize)
+{
+  char *cp;
+  int vl;
+  int fl;
+
+  /* Used for the various commands that accept a file name. These commands
+   * accept two tags: virtual Gives a virtual path to a document on the
+   * server. file Gives a pathname relative to the current directory. ../ 
+   * cannot be used in this pathname, nor can absolute paths be used.
+   */
+
+  vl = strlen(vfilename);
+  fl = strlen(filename);
+
+  if (strcmp(tag, "virtual") == 0)
+    {
+      if (strstr(val, "../") != (char *)0)
+        {
+          not_permitted(directive, tag, val);
+          return -1;
+        }
+
+      /* Figure out root using difference between vfilename and filename. */
+
+      if (vl > fl || strcmp(vfilename, &filename[fl - vl]) != 0)
+        {
+          return -1;
+        }
+ 
+      if (fl - vl + strlen(val) >= fnsize)
+        {
+          return -1;
+        }
+
+      (void)strncpy(fn, filename, fl - vl);
+      (void)strcpy(&fn[fl - vl], val);
+    }
+  else if (strcmp(tag, "file") == 0)
+    {
+      if (val[0] == '/' || strstr(val, "../") != (char *)0)
+        {
+          not_permitted(directive, tag, val);
+          return -1;
+        }
+      if (fl + 1 + strlen(val) >= fnsize)
+        {
+          return -1;
+        }
+
+      (void)strcpy(fn, filename);
+      cp = strrchr(fn, '/');
+      if (cp == (char *)0)
+        {
+          cp = &fn[strlen(fn)];
+          *cp = '/';
+        }
+      (void)strcpy(++cp, val);
+    }
+  else
+    {
+      unknown_tag(filename, directive, tag);
+      return -1;
+    }
+  return 0;
+}
+
+static int check_filename(char *filename)
+{
+  static int inited = 0;
+  static char *cgi_pattern;
+#ifdef CONFIG_AUTH_FILE
+  struct stat sb;
+  char *dirname;
+  char *authname;
+  char *cp;
+  int fnl;
+  int r;
+#endif
+
+  if (!inited)
+    {
+      /* Get the cgi pattern. */
+
+      cgi_pattern = getenv("CGI_PATTERN");
+#ifdef CGI_PATTERN
+      if (cgi_pattern == (char *)0)
+        {
+          cgi_pattern = CGI_PATTERN;
+        }
+#endif /* CGI_PATTERN */
+      inited = 1;
+    }
+
+  /* ../ is not permitted. */
+
+  if (strstr(filename, "../") !=NULL)
+    {
+      return 0;
+    }
+
+  /* Ensure that we are not reading a basic auth password file. */
+
+#ifdef CONFIG_AUTH_FILE
+  fnl = strlen(filename);
+  if (strcmp(filename, CONFIG_AUTH_FILE) == 0 ||
+      (fnl >= sizeof(CONFIG_AUTH_FILE) &&
+       strcmp(&filename[fnl - sizeof(CONFIG_AUTH_FILE) + 1], CONFIG_AUTH_FILE) == 0 &&
+       filename[fnl - sizeof(CONFIG_AUTH_FILE)] == '/'))
+    {
+      return 0;
+    }
+
+  /* Check for an auth file in the same directory.  We can't do an actual **
+   * auth password check here because CGI programs are not given the **
+   * authorization header, for security reasons.  So instead we just **
+   * prohibit access to all auth-protected files.
+   */
+
+  dirname = strdup(filename);
+  if (dirname == (char *)0)
+    {
+      /* out of memory */
+
+      return 0;
+    }
+
+  cp = strrchr(dirname, '/');
+  if (cp == (char *)0)
+    {
+      (void)strcpy(dirname, ".");
+    }
+  else
+    {
+      *cp = '\0';
+    }
+
+  authname = malloc(strlen(dirname) + 1 + sizeof(CONFIG_AUTH_FILE));
+  if (!authname)
+    {
+      /* out of memory */
+
+      free(dirname);
+      return 0;
+    }
+
+  (void)sprintf(authname, "%s/%s", dirname, CONFIG_AUTH_FILE);
+  r = stat(authname, &sb);
+
+  free(dirname);
+  free(authname);
+
+  if (r == 0)
+    {
+      return 0;
+    }
+#endif /* CONFIG_AUTH_FILE */
+
+  /* Ensure that we are not reading a CGI file. */
+
+  if (cgi_pattern != (char *)0 && match(cgi_pattern, filename))
+    {
+      return 0;
+    }
+  return 1;
+}
+
+static void show_time(time_t t, int gmt)
+{
+  struct tm *tmP;
+
+  if (gmt)
+    {
+      tmP = gmtime(&t);
+    }
+  else
+    {
+      tmP = localtime(&t);
+    }
+
+  if (strftime(g_iobuffer2, BUFFER_SIZE, g_timeformat, tmP) > 0)
+    {
+      (void)puts(g_iobuffer2);
+    }
+}
+
+static void show_size(off_t size)
+{
+  switch (g_sizefmt)
+    {
+    case SF_BYTES:
+      (void)printf("%ld", (long)size);  /* spec says should have commas */
+      break;
+
+    case SF_ABBREV:
+      if (size < 1024)
+        {
+          (void)printf("%ld", (long)size);
+        }
+      else if (size < 1024)
+        {
+          (void)printf("%ldK", (long)size / 1024L);
+        }
+      else if (size < 1024 * 1024)
+        {
+          (void)printf("%ldM", (long)size / (1024L * 1024L));
+        }
+      else
+        {
+          (void)printf("%ldG", (long)size / (1024L * 1024L * 1024L));
+        }
+      break;
+    }
+}
+
+static void do_config(FILE *instream, char *vfilename, char *filename,
+                       char *directive, char *tag, char *val)
+{
+  /* The config directive controls various aspects of the file parsing. **
+   * There are two valid tags: g_timeformat Gives the server a new format to
+   * use when providing dates.  This is a string compatible with the
+   * strftime library call. g_sizefmt Determines the formatting to be used
+   * when displaying the size of a file.  Valid choices are bytes, for a
+   * formatted byte count (formatted as 1,234,567), or abbrev for an
+   * abbreviated version displaying the number of kilobytes or megabytes the 
+   * file occupies.
+   */
+
+  if (strcmp(tag, "g_timeformat") == 0)
+    {
+      (void)strncpy(g_timeformat, val, TIMEFMT_SIZE - 1);
+      g_timeformat[TIMEFMT_SIZE - 1] = '\0';
+    }
+  else if (strcmp(tag, "g_sizefmt") == 0)
+    {
+      if (strcmp(val, "bytes") == 0)
+        {
+          g_sizefmt = SF_BYTES;
+        }
+      else if (strcmp(val, "abbrev") == 0)
+        {
+          g_sizefmt = SF_ABBREV;
+        }
+      else
+        {
+          unknown_value(filename, directive, tag, val);
+        }
+    }
+  else
+    {
+      unknown_tag(filename, directive, tag);
+    }
+}
+
+static void do_include(FILE *instream, char *vfilename, char *filename,
+                        char *directive, char *tag, char *val)
+{
+  FILE *instream2;
+  int ret;
+
+  /* Inserts the text of another document into the parsed document. */
+
+  ret = get_filename(vfilename, filename, directive, tag, val, g_iobuffer1, BUFFER_SIZE);
+  if (ret < 0)
+    {
+      return;
+    }
+
+  if (!check_filename(g_iobuffer1))
+    {
+      not_permitted(directive, tag, g_iobuffer1);
+      return;
+    }
+
+  instream2 = fopen(g_iobuffer1, "r");
+  if (instream2 == (FILE *) 0)
+    {
+      not_found2(directive, tag, g_iobuffer1);
+      return;
+    }
+
+  if (strcmp(tag, "virtual") == 0)
+    {
+      if (strlen(val) <BUFFER_SIZE)
+        {
+          (void)strcpy(g_iobuffer2, val);
+        }
+      else
+        {
+          (void)strcpy(g_iobuffer2, g_iobuffer1);    /* same size, has to fit */
+        }
+    }
+  else
+    {
+      if (strlen(vfilename) + 1 + strlen(val) < BUFFER_SIZE)
+        {
+          char *cp;
+          (void)strcpy(g_iobuffer2, vfilename);
+          cp = strrchr(g_iobuffer2, '/');
+          if (cp == (char *)0)
+            {
+              cp = &g_iobuffer2[strlen(g_iobuffer2)];
+              *cp = '/';
+            }
+          (void)strcpy(++cp, val);
+        }
+      else
+        {
+          (void)strcpy(g_iobuffer2, g_iobuffer1);    /* same size, has to fit */
+        }
+    }
+
+  read_file(instream2, g_iobuffer2, g_iobuffer1);
+  (void)fclose(instream2);
+}
+
+static void do_echo(FILE *instream, char *vfilename, char *filename, 
+                     char *directive, char *tag, char *val)
+{
+  char *cp;
+
+  /* Prints the value of one of the include variables.  Any dates are
+   * printed subject to the currently configured g_timeformat.  The only valid
+   * tag is var, whose value is the name of the variable you wish to echo.
+   */
+
+  if (strcmp(tag, "var") != 0)
+    {
+      unknown_tag(filename, directive, tag);
+    }
+  else
+    {
+      if (strcmp(val, "DOCUMENT_NAME") == 0)
+        {
+          /* The current filename. */
+
+          (void)puts(filename);
+        }
+      else if (strcmp(val, "DOCUMENT_URI") == 0)
+        {
+          /* The virtual path to this file (such as /~robm/foo.shtml). */
+
+          (void)puts(vfilename);
+        }
+      else if (strcmp(val, "QUERY_STRING_UNESCAPED") == 0)
+        {
+          /* The unescaped version of any search query the client sent. */
+
+          cp = getenv("QUERY_STRING");
+          if (cp != (char *)0)
+            {
+              (void)puts(cp);
+            }
+        }
+      else if (strcmp(val, "DATE_LOCAL") == 0)
+        {
+          struct timeval tm;
+
+          /* The current date, local time zone. */
+
+          gettimeofday(&tm, NULL);
+          show_time(tm.tv_sec, 0);
+        }
+      else if (strcmp(val, "DATE_GMT") == 0)
+        {
+          struct timeval tm;
+
+          /* Same as DATE_LOCAL but in Greenwich mean time. */
+
+          gettimeofday(&tm, NULL);
+          show_time(tm.tv_sec, 1);
+        }
+      else if (strcmp(val, "LAST_MODIFIED") == 0)
+        {
+          /* The last modification date of the current document. */
+
+          if (fstat(fileno(instream), &g_sb) >= 0)
+            {
+              show_time(g_sb.st_mtime, 0);
+            }
+        }
+      else
+        {
+          /* Try an environment variable. */
+
+          cp = getenv(val);
+          if (cp == (char *)0)
+            {
+              unknown_value(filename, directive, tag, val);
+            }
+          else
+            {
+              (void)puts(cp);
+            }
+        }
+    }
+}
+
+static void do_fsize(FILE *instream, char *vfilename, char *filename,
+                      char *directive, char *tag, char *val)
+{
+  int ret;
+
+  /* Prints the size of the specified file. */
+
+  ret = get_filename(vfilename, filename, directive, tag, val, g_iobuffer1, BUFFER_SIZE);
+  if (ret < 0)
+    {
+      return;
+    }
+
+  if (stat(g_iobuffer1, &g_sb) < 0)
+    {
+      not_found2(directive, tag, g_iobuffer1);
+      return;
+    }
+
+  show_size(g_sb.st_size);
+}
+
+static void do_flastmod(FILE *instream, char *vfilename, char *filename,
+                         char *directive, char *tag, char *val)
+{
+  int ret;
+
+  /* Prints the last modification date of the specified file. */
+
+  ret = get_filename(vfilename, filename, directive, tag, val, g_iobuffer1, BUFFER_SIZE);
+  if (ret < 0)
+    {
+      return;
+    }
+
+  if (stat(g_iobuffer1, &g_sb) < 0)
+    {
+      not_found2(directive, tag, g_iobuffer1);
+      return;
+    }
+  show_time(g_sb.st_mtime, 0);
+}
+
+static void parse(FILE *instream, char *vfilename, char *filename, char *str)
+{
+  char *directive;
+  char *cp;
+  int ntags;
+  int dirn;
+  int i;
+  char *val;
+
+  directive = str;
+  directive += strspn(directive, " \t\n\r");
+
+  ntags = 0;
+  cp = directive;
+  for (;;)
+    {
+      cp = strpbrk(cp, " \t\n\r\"");
+      if (cp == (char *)0)
+        {
+          break;
+        }
+
+      if (*cp == '"')
+        {
+          cp = strpbrk(cp + 1, "\"");
+          cp++;
+          if (*cp == '\0')
+            {
+              break;
+            }
+        }
+
+      *cp++ = '\0';
+      cp += strspn(cp, " \t\n\r");
+      if (*cp == '\0')
+        {
+          break;
+        }
+
+      if (ntags < MAX_TAGS)
+        {
+          g_tags[ntags++] = cp;
+        }
+    }
+
+  if (strcmp(directive, "config") == 0)
+    {
+      dirn = DI_CONFIG;
+    }
+  else if (strcmp(directive, "include") == 0)
+    {
+      dirn = DI_INCLUDE;
+    }
+  else if (strcmp(directive, "echo") == 0)
+    {
+      dirn = DI_ECHO;
+    }
+  else if (strcmp(directive, "fsize") == 0)
+    {
+      dirn = DI_FSIZE;
+    }
+  else if (strcmp(directive, "flastmod") == 0)
+    {
+      dirn = DI_FLASTMOD;
+    }
+  else
+    {
+      unknown_directive(filename, directive);
+      return;
+    }
+
+  for (i = 0; i < ntags; ++i)
+    {
+      if (i > 0)
+        {
+          putchar(' ');
+        }
+
+      val = strchr(g_tags[i], '=');
+      if (val == (char *)0)
+        {
+          val = "";
+        }
+      else
+        {
+          *val++ = '\0';
+        }
+
+      if (*val == '"' && val[strlen(val) - 1] == '"')
+        {
+          val[strlen(val) - 1] = '\0';
+          ++val;
+        }
+
+      switch (dirn)
+        {
+        case DI_CONFIG:
+          do_config(instream, vfilename, filename, directive, g_tags[i], val);
+          break;
+
+        case DI_INCLUDE:
+          do_include(instream, vfilename, filename, directive, g_tags[i], val);
+          break;
+
+        case DI_ECHO:
+          do_echo(instream, vfilename, filename, directive, g_tags[i], val);
+          break;
+
+        case DI_FSIZE:
+          do_fsize(instream, vfilename, filename, directive, g_tags[i], val);
+          break;
+
+        case DI_FLASTMOD:
+          do_flastmod(instream, vfilename, filename, directive, g_tags[i], val);
+          break;
+        }
+    }
+}
+
+static void slurp(FILE *instream, char *vfilename, char *filename)
+{
+  int state;
+  int ich;
+  int i;
+
+  /* Now slurp in the rest of the comment from the input file. */
+
+  i     = 0;
+  state = ST_GROUND;
+  while ((ich = getc(instream)) != EOF)
+    {
+      switch (state)
+        {
+        case ST_GROUND:
+          if (ich == '-')
+            {
+              state = ST_MINUS1;
+            }
+          break;
+
+        case ST_MINUS1:
+          if (ich == '-')
+            {
+              state = ST_MINUS2;
+            }
+          else
+            {
+              state = ST_GROUND;
+            }
+          break;
+
+        case ST_MINUS2:
+          if (ich == '>')
+            {
+              g_iobuffer1[i - 2] = '\0';
+              parse(instream, vfilename, filename, g_iobuffer1);
+              return;
+            }
+          else if (ich != '-')
+            {
+              state = ST_GROUND;
+            }
+          break;
+        }
+
+      if (i < BUFFER_SIZE - 1)
+        {
+          g_iobuffer1[i++] = (char)ich;
+        }
+    }
+}
+
+static void read_file(FILE *instream, char *vfilename, char *filename)
+{
+  int ich;
+  int state;
+
+  /* Copy it to output, while running a state-machine to look for SSI
+   * directives.
+   */
+
+  state = ST_GROUND;
+  while ((ich = getc(instream)) != EOF)
+    {
+      switch (state)
+        {
+        case ST_GROUND:
+          if (ich == '<')
+            {
+              state = ST_LESSTHAN;
+              continue;
+            }
+          break;
+
+        case ST_LESSTHAN:
+          if (ich == '!')
+            {
+              state = ST_BANG;
+              continue;
+            }
+          else
+            {
+              state = ST_GROUND;
+              putchar('<');
+            }
+          break;
+
+        case ST_BANG:
+          if (ich == '-')
+            {
+              state = ST_MINUS1;
+              continue;
+            }
+          else
+            {
+              state = ST_GROUND;
+              (void)puts("<!");
+            }
+          break;
+
+        case ST_MINUS1:
+          if (ich == '-')
+            {
+              state = ST_MINUS2;
+              continue;
+            }
+          else
+            {
+              state = ST_GROUND;
+              (void)puts("<!-");
+            }
+          break;
+
+        case ST_MINUS2:
+          if (ich == '#')
+            {
+              slurp(instream, vfilename, filename);
+              state = ST_GROUND;
+              continue;
+            }
+          else
+            {
+              state = ST_GROUND;
+              (void)puts("<!--");
+            }
+          break;
+        }
+
+      putchar((char)ich);
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char **argv)
+{
+  FILE *instream;
+  char *script_name;
+  char *path_info;
+  char *path_translated;
+  int err = 0;
+
+  /* Default formats. */
+
+  (void)strcpy(g_timeformat, "%a %b %e %T %Z %Y");
+  g_sizefmt = SF_BYTES;
+
+  /* The MIME type has to be text/html. */
+
+  (void)puts("Content-type: text/html\n\n");
+
+  /* Get the name that we were run as. */
+
+  script_name = getenv("SCRIPT_NAME");
+  if (!script_name)
+    {
+      internal_error("Couldn't get SCRIPT_NAME environment variable.");
+      return 1;
+    }
+
+  /* Append the PATH_INFO, if any, to get the full URL. */
+
+  path_info = getenv("PATH_INFO");
+  if (!path_info)
+    {
+      path_info = "";
+    }
+
+  g_url = (char*)malloc(strlen(script_name) + strlen(path_info) + 1);
+  if (!g_url)
+    {
+      internal_error("Out of memory.");
+      return 2;
+    }
+  (void)sprintf(g_url, "%s%s", script_name, path_info);
+
+  /* Get the name of the file to parse. */
+
+  path_translated = getenv("PATH_TRANSLATED");
+  if (!path_translated)
+    {
+      internal_error("Couldn't get PATH_TRANSLATED environment variable.");
+      err = 3;
+      goto errout_with_g_url;
+    }
+
+  if (!check_filename(path_translated))
+    {
+      not_permitted("initial", "PATH_TRANSLATED", path_translated);
+      err = 4;
+      goto errout_with_g_url;
+    }
+
+  /* Open it. */
+
+  instream = fopen(path_translated, "r");
+  if (!instream)
+    {
+      not_found(path_translated);
+      err = 5;
+      goto errout_with_g_url;
+    }
+
+  /* Read and handle the file. */
+
+  read_file(instream, path_info, path_translated);
+
+  (void)fclose(instream);
+
+errout_with_g_url:
+  free(g_url);
+  return err;
+}
diff --git a/apps/netutils/thttpd/config.h b/apps/netutils/thttpd/config.h
new file mode 100644
index 000000000..f1b4c2d4c
--- /dev/null
+++ b/apps/netutils/thttpd/config.h
@@ -0,0 +1,253 @@
+/****************************************************************************
+ * netutils/thttpd/config.h
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __NETUTILS_THTTPD_CONFIG_H
+#define __NETUTILS_THTTPD_CONFIG_H
+
+/****************************************************************************
+ * Included files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/compiler.h>
+#include <stdint.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Make sure that the system is configured to handle THTTPD */
+
+#undef CONFIG_THTTPD
+#if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && \
+    defined(CONFIG_NET_TCPBACKLOG) && !defined(CONFIG_DISABLE_ENVIRONMENT) && \
+    !defined(CONFIG_SDCLONE_DISABLE) && CONFIG_NET_NTCP_READAHEAD_BUFFERS > 0
+
+#  define CONFIG_THTTPD 1
+
+/* Check all THTTPD configuration settings.  Complain on any that should have
+ * been defined but were not.  Supply some kind of reasonable value for all
+ * undefined settings.
+ */
+
+/* Server port number */
+
+#  ifndef CONFIG_THTTPD_PORT
+#    define CONFIG_THTTPD_PORT 80
+#  endif
+
+/* Server IP address (no host name) */
+
+#  ifndef CONFIG_THTTPD_IPADDR
+#    ifdef CONFIG_CPP_HAVE_WARNING
+#      warning "CONFIG_THTTPD_IPADDR not defined"
+#    endif
+#    define CONFIG_THTTPD_IPADDR (10<<24|0<<16|0<<8|2)
+#  endif
+
+/* SERVER_ADDRESS: response */
+
+#  ifndef CONFIG_THTTPD_SERVER_ADDRESS
+#    define CONFIG_THTTPD_SERVER_ADDRESS "http://www.nuttx.org"
+#  endif
+
+/* SERVER_SOFTWARE: response */
+
+#  ifndef CONFIG_THTTPD_SERVER_SOFTWARE
+#    define CONFIG_THTTPD_SERVER_SOFTWARE "thttpd/2.25b 29dec2003-NuttX"
+#  endif
+
+#  ifndef CONFIG_THTTPD_PATH
+#    ifdef CONFIG_CPP_HAVE_WARNING
+#      warning "CONFIG_THTTPD_PATH not defined"
+#    endif
+#    define CONFIG_THTTPD_PATH "/mnt/www"
+#  endif
+
+#  ifndef CONFIG_THTTPD_CGI_PATH
+#    ifdef CONFIG_CPP_HAVE_WARNING
+#      warning "CONFIG_THTTPD_CGI_PATH not defined"
+#    endif
+#    define CONFIG_THTTPD_CGI_PATH "/mnt/www/cgi-bin"
+#  endif
+
+/* Only CGI programs whose fully expanded pathes match this pattern will be executed.  In fact,
+ * if this value is not defined then no CGI logic will be built.
+ */
+
+#  ifndef CONFIG_THTTPD_CGI_PATTERN
+#    define CONFIG_THTTPD_CGI_PATTERN "/mnt/www/cgi-bin/*"
+#  endif
+
+/* These provide the priority and stack size of the CGI child tasks */
+
+#  ifndef CONFIG_THTTPD_CGI_PRIORITY
+#    define CONFIG_THTTPD_CGI_PRIORITY 50
+#  endif
+
+#  ifndef CONFIG_THTTPD_CGI_STACKSIZE
+#    define CONFIG_THTTPD_CGI_STACKSIZE 2048
+#  endif
+
+/* Byte output limit for CGI tasks */
+
+#  ifndef CONFIG_THTTPD_CGI_BYTECOUNT
+#    define CONFIG_THTTPD_CGI_BYTECOUNT 200000
+#  endif
+
+/* How many seconds to allow CGI programs to run before killing them. */
+
+#  ifndef CONFIG_THTTPD_CGI_TIMELIMIT
+#    define CONFIG_THTTPD_CGI_TIMELIMIT 0 /* No time limit */
+#  endif
+
+/* The default character set name to use with text MIME types. */
+
+#  ifndef CONFIG_THTTPD_CHARSET
+#    define CONFIG_THTTPD_CHARSET "iso-8859-1"
+#  endif
+
+/* Initial buffer size, buffer reallocation increment, maximum buffer size */
+
+#  ifndef CONFIG_THTTPD_IOBUFFERSIZE
+#    define CONFIG_THTTPD_IOBUFFERSIZE 256
+#  endif
+
+#  ifndef CONFIG_THTTPD_MINSTRSIZE
+#   define CONFIG_THTTPD_MINSTRSIZE 64
+#  endif
+
+#  ifndef CONFIG_THTTPD_REALLOCINCR
+#    define CONFIG_THTTPD_REALLOCINCR 64
+#  endif
+
+#  ifndef CONFIG_THTTPD_MAXREALLOC
+#    define CONFIG_THTTPD_MAXREALLOC 4096
+#  endif
+
+#  ifndef CONFIG_THTTPD_CGIINBUFFERSIZE
+#    define CONFIG_THTTPD_CGIINBUFFERSIZE 512	/* Size of buffer to interpose input */
+#  endif
+
+#  ifndef CONFIG_THTTPD_CGIOUTBUFFERSIZE
+#    define CONFIG_THTTPD_CGIOUTBUFFERSIZE 512	/* Size of buffer to interpose output */
+#  endif
+
+#  if CONFIG_THTTPD_IOBUFFERSIZE > 65535
+#    error "Can't use uint16_t for buffer size"
+#  endif
+
+/* A list of index filenames to check. The files are searched for in this order. */
+
+#  ifndef CONFIG_THTTPD_INDEX_NAMES
+#    define CONFIG_THTTPD_INDEX_NAMES "index.html", "index.htm", "index.cgi"
+#  endif
+
+/* CONFIG_AUTH_FILE - The file to use for authentication. If this is defined then
+ *   thttpd checks for this file in the local directory before every fetch. If the
+ *   file exists then authentication is done, otherwise the fetch proceeds as usual.
+ *   If you leave this undefined then thttpd will not implement authentication at
+ *   all and will not check for auth files, which saves a bit of CPU time.
+ *   A typical value is ".htpasswd"
+ */
+
+/* The listen() backlog queue length. */
+
+#  ifndef CONFIG_THTTPD_LISTEN_BACKLOG
+#    define CONFIG_THTTPD_LISTEN_BACKLOG 8
+#  endif
+
+/* How many milliseconds to leave a connection open while doing a lingering close */
+
+#  ifndef CONFIG_THTTPD_LINGER_MSEC
+#    define CONFIG_THTTPD_LINGER_MSEC 500
+#  endif
+
+/* How often to run the occasional cleanup job.*/
+
+#  ifndef CONFIG_THTTPD_OCCASIONAL_MSEC
+#    define CONFIG_THTTPD_OCCASIONAL_MSEC 120 /* Two minutes */
+#  endif
+
+/* How many seconds to allow for reading the initial request on a new connection. */
+
+#  ifndef CONFIG_THTTPD_IDLE_READ_LIMIT_SEC
+#    define CONFIG_THTTPD_IDLE_READ_LIMIT_SEC 300
+#  endif
+
+/* How many seconds before an idle connection gets closed. */
+
+#  ifndef CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC
+#    define CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC 300
+#  endif
+
+/* Memory debug instrumentation depends on other debug options */
+
+#if (!defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_NET)) && defined(CONFIG_THTTPD_MEMDEBUG)
+#  undef CONFIG_THTTPD_MEMDEBUG
+#endif
+
+/* Tilde mapping. Many URLs use ~username to indicate a user's home directory. thttpd
+ * provides two options for mapping this construct to an  actual filename.
+ *
+ * 1) Map ~username to <prefix>/username. This is the recommended choice. Each user
+ *    gets a subdirectory in the main web tree, and the tilde construct points there.
+ *    The prefix could be something like "users", or it could be empty.
+ * 2) Map ~username to <user's homedir>/<postfix>. The postfix would be the name of
+ *    a subdirectory off of the user's actual home dir, something like "public_html".
+ *
+ * You can also leave both options undefined, and thttpd will not do anything special
+ * about tildes. Enabling both options is an error.
+ *
+ * Typical values, if they're defined, are "users" for CONFIG_THTTPD_TILDE_MAP1 and "public_html"
+ * for CONFIG_THTTPD_TILDE_MAP2. 
+ */
+
+#  if defined(CONFIG_THTTPD_TILDE_MAP1) && defined(CONFIG_THTTPD_TILDE_MAP2)
+#    error "Both CONFIG_THTTPD_TILDE_MAP1 andCONFIG_THTTPD_TILDE_MAP2 are defined"
+#  endif
+
+/* If CONFIG_THTTPD_URLPATTERN is defined, then it will be used to match and verify
+ * referrers.
+ */
+
+#else  /* Dependencies not provided */
+#  ifdef CONFIG_CPP_HAVE_WARNING
+#    warning "THTTPD not built because dependencies not selected in configuration"
+#  endif
+#endif  /* Dependencies not provided */
+
+#endif /* __NETUTILS_THTTPD_CONFIG_H */
+
diff --git a/apps/netutils/thttpd/fdwatch.c b/apps/netutils/thttpd/fdwatch.c
new file mode 100644
index 000000000..24ea7a1e0
--- /dev/null
+++ b/apps/netutils/thttpd/fdwatch.c
@@ -0,0 +1,371 @@
+/****************************************************************************
+ * netutils/thttpd/timers.c
+ * FD watcher routines for poll()
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in the original THTTPD package:
+ *
+ *   Copyright © 1999,2000 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <debug.h>
+#include <poll.h>
+#include <debug.h>
+
+#include "config.h"
+#include "thttpd_alloc.h"
+#include "fdwatch.h"
+
+#ifdef CONFIG_THTTPD
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/* Debug output from this file is normally suppressed.  If enabled, be aware
+ * that output to stdout will interfere with CGI programs (you could use the
+ * the low-level debug (lldbg) functions which probably do not use stdout
+ */
+
+#ifdef CONFIG_THTTPD_FDWATCH_DEBUG
+#  ifdef CONFIG_CPP_HAVE_VARARGS
+#    define fwdbg(format, arg...)    ndbg(format, ##arg)
+#    define fwlldbg(format, arg...)  nlldbg(format, ##arg)
+#    define fwvdbg(format, arg...)   nvdbg(format, ##arg)
+#    define fwllvdbg(format, arg...) nllvdbg(format, ##arg)
+#  else
+#    define fwdbg    ndbg
+#    define fwlldbg  nlldbg
+#    define fwvdbg   nvdbg
+#    define fwllvdbg nllvdbg
+#  endif
+#else
+#  ifdef CONFIG_CPP_HAVE_VARARGS
+#    define fwdbg(x...)
+#    define fwlldbg(x...)
+#    define fwvdbg(x...)
+#    define fwllvdbg(x...)
+#  else
+#    define fwdbg    (void)
+#    define fwlldbg  (void)
+#    define fwvdbg   (void)
+#    define fwllvdbg (void)
+#  endif
+#endif
+
+#ifndef MIN
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_THTTPD_FDWATCH_DEBUG
+static void fdwatch_dump(const char *msg, FAR struct fdwatch_s *fw)
+{
+  int i;
+ 
+  fwvdbg("%s\n", msg);
+  fwvdbg("nwatched: %d nfds: %d\n", fw->nwatched, fw->nfds);
+  for (i = 0; i < fw->nwatched; i++)
+  {
+    fwvdbg("%2d. pollfds: {fd: %d events: %02x revents: %02x} client: %p\n",
+           i+1, fw->pollfds[i].fd, fw->pollfds[i].events,
+           fw->pollfds[i].revents, fw->client[i]);
+  }
+  fwvdbg("nactive: %d next: %d\n", fw->nactive, fw->next);
+  for (i = 0; i < fw->nactive; i++)
+  {
+    fwvdbg("%2d. %d active\n", i, fw->ready[i]);
+  }
+}
+#else
+#  define fdwatch_dump(m,f)
+#endif
+
+static int fdwatch_pollndx(FAR struct fdwatch_s *fw, int fd)
+{
+  int pollndx;
+
+  /* Get the index associated with the fd */
+
+  for (pollndx = 0; pollndx < fw->nwatched; pollndx++)
+    {
+      if (fw->pollfds[pollndx].fd == fd)
+        {
+          fwvdbg("pollndx: %d\n", pollndx);
+          return pollndx;
+        }
+    }
+
+  fwdbg("No poll index for fd %d: %d\n", fd);
+  return -1;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Initialize the fdwatch data structures.  Returns -1 on failure. */
+
+struct fdwatch_s *fdwatch_initialize(int nfds)
+{
+  FAR struct fdwatch_s *fw;
+
+  /* Allocate the fdwatch data structure */
+
+  fw = (struct fdwatch_s*)zalloc(sizeof(struct fdwatch_s));
+  if (!fw)
+    {
+      fwdbg("Failed to allocate fdwatch\n");
+      return NULL;
+    }
+
+  /* Initialize the fdwatch data structures. */
+
+  fw->nfds = nfds;
+
+  fw->client = (void**)httpd_malloc(sizeof(void*) * nfds);
+  if (!fw->client)
+    {
+      goto errout_with_allocations;
+    }
+
+  fw->pollfds = (struct pollfd*)httpd_malloc(sizeof(struct pollfd) * nfds);
+  if (!fw->pollfds)
+    {
+      goto errout_with_allocations;
+    }
+
+  fw->ready = (uint8_t*)httpd_malloc(sizeof(uint8_t) * nfds);
+  if (!fw->ready)
+    {
+      goto errout_with_allocations;
+    }
+
+  fdwatch_dump("Initial state:", fw);
+  return fw;
+
+errout_with_allocations:
+  fdwatch_uninitialize(fw);
+  return NULL;
+}
+
+/* Uninitialize the fwdatch data structure */
+
+void fdwatch_uninitialize(struct fdwatch_s *fw)
+{
+  if (fw)
+    {
+      fdwatch_dump("Uninitializing:", fw);
+      if (fw->client)
+        {
+          httpd_free(fw->client);
+        }
+
+      if (fw->pollfds)
+        {
+          httpd_free(fw->pollfds);
+        }
+
+      if (fw->ready)
+        {
+          httpd_free(fw->ready);
+        }
+
+      httpd_free(fw);
+    }
+}
+
+/* Add a descriptor to the watch list.  rw is either FDW_READ or FDW_WRITE.  */
+
+void fdwatch_add_fd(struct fdwatch_s *fw, int fd, void *client_data)
+{
+  fwvdbg("fd: %d client_data: %p\n", fd, client_data);
+  fdwatch_dump("Before adding:", fw);
+
+  if (fw->nwatched >= fw->nfds)
+    {
+      fwdbg("too many fds\n");
+      return;
+    }
+
+  /* Save the new fd at the end of the list */
+
+  fw->pollfds[fw->nwatched].fd     = fd;
+  fw->pollfds[fw->nwatched].events = POLLIN;
+  fw->client[fw->nwatched]         = client_data;
+
+  /* Increment the count of watched descriptors */
+
+  fw->nwatched++;
+  fdwatch_dump("After adding:", fw);
+}
+
+/* Remove a descriptor from the watch list. */
+
+void fdwatch_del_fd(struct fdwatch_s *fw, int fd)
+{
+  int pollndx;
+
+  fwvdbg("fd: %d\n", fd);
+  fdwatch_dump("Before deleting:", fw);
+
+  /* Get the index associated with the fd */
+
+  pollndx = fdwatch_pollndx(fw, fd);
+  if (pollndx >= 0)
+    {
+      /* Decrement the number of fds in the poll table */
+
+      fw->nwatched--;
+
+      /* Replace the deleted one with the one at the the end
+       * of the list.
+       */
+
+      if (pollndx != fw->nwatched)
+        {
+          fw->pollfds[pollndx] = fw->pollfds[fw->nwatched];
+          fw->client[pollndx]  = fw->client[fw->nwatched];
+        }
+    }
+   fdwatch_dump("After deleting:", fw);
+}
+
+/* Do the watch.  Return value is the number of descriptors that are ready,
+ * or 0 if the timeout expired, or -1 on errors.  A timeout of INFTIM means
+ * wait indefinitely.
+ */
+
+int fdwatch(struct fdwatch_s *fw, long timeout_msecs)
+{
+  int ret;
+  int i;
+
+  /* Wait for activity on any of the desciptors.  When poll() returns, ret
+   * will hold the number of descriptors with activity (or zero on a timeout
+   * or <0 on an error.
+   */
+
+  fdwatch_dump("Before waiting:", fw);
+  fwvdbg("Waiting... (timeout %d)\n", timeout_msecs);
+  fw->nactive = 0;
+  fw->next    = 0;
+  ret         = poll(fw->pollfds, fw->nwatched, (int)timeout_msecs);
+  fwvdbg("Awakened: %d\n", ret);
+
+  /* Look through all of the descriptors and make a list of all of them than
+   * have activity.
+   */
+
+  if (ret > 0)
+    {
+      for (i = 0; i < fw->nwatched; i++)
+        {
+          /* Is there activity on this descriptor? */
+
+          if (fw->pollfds[i].revents & (POLLIN | POLLERR | POLLHUP | POLLNVAL))
+            {
+              /* Yes... save it in a shorter list */
+
+              fwvdbg("pollndx: %d fd: %d revents: %04x\n",
+                    i, fw->pollfds[i].fd, fw->pollfds[i].revents);
+
+              fw->ready[fw->nactive++] = fw->pollfds[i].fd;
+              if (fw->nactive == ret)
+                {
+                  /* We have all of them, break out early */
+
+                  break;
+                }
+            }
+        }
+    }
+
+  /* Return the number of descriptors with activity */
+
+  fwvdbg("nactive: %d\n", fw->nactive);
+  fdwatch_dump("After wakeup:", fw);
+  return ret;
+}
+
+/* Check if a descriptor was ready. */
+
+int fdwatch_check_fd(struct fdwatch_s *fw, int fd)
+{
+  int pollndx;
+
+  fwvdbg("fd: %d\n", fd);
+  fdwatch_dump("Checking:", fw);
+
+  /* Get the index associated with the fd */
+
+  pollndx = fdwatch_pollndx(fw, fd);
+  if (pollndx >= 0 && (fw->pollfds[pollndx].revents & POLLERR) == 0)
+    {
+      return fw->pollfds[pollndx].revents & (POLLIN | POLLHUP | POLLNVAL);
+    }
+
+  fwvdbg("POLLERR fd: %d\n", fd);
+  return 0;
+}
+
+void *fdwatch_get_next_client_data(struct fdwatch_s *fw)
+{
+  fdwatch_dump("Before getting client data:", fw);
+  if (fw->next >= fw->nwatched)
+    {
+      fwvdbg("All client data returned: %d\n", fw->next);
+      return (void*)-1;
+    }
+
+  fwvdbg("client_data[%d]: %p\n", fw->next, fw->client[fw->next]);
+  return fw->client[fw->next++];
+}
+
+#endif /* CONFIG_THTTPD */
+
diff --git a/apps/netutils/thttpd/fdwatch.h b/apps/netutils/thttpd/fdwatch.h
new file mode 100644
index 000000000..e60727db1
--- /dev/null
+++ b/apps/netutils/thttpd/fdwatch.h
@@ -0,0 +1,111 @@
+/****************************************************************************
+ * netutils/thttpd/fdwatch.h
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in THTTPD:
+ *
+ *   Copyright © 1999 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __NETUTILS_THTTPD_FDWATCH_H
+#define __NETUTILS_THTTPD_FDWATCH_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <stdint.h>
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/* Define to enable detailed FDWATCH debug output */
+
+#undef CONFIG_THTTPD_FDWATCH_DEBUG
+
+#ifndef INFTIM
+#  define INFTIM -1
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct fdwatch_s
+{
+  struct pollfd *pollfds;          /* Poll data (allocated) */
+  void         **client;           /* Client data (allocated) */
+  uint8_t       *ready;            /* The list of fds with activity (allocated) */
+  uint8_t        nfds;             /* The configured maximum number of fds */
+  uint8_t        nwatched;         /* The number of fds currently watched */
+  uint8_t        nactive;          /* The number of fds with activity */
+  uint8_t        next;             /* The index to the next client data */
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Initialize the fdwatch data structures.  Returns NULL on failure. */
+
+extern struct fdwatch_s *fdwatch_initialize(int nfds);
+
+/* Uninitialize the fwdatch data structure */
+
+extern void fdwatch_uninitialize(struct fdwatch_s *fw);
+
+/* Add a descriptor to the watch list */
+
+extern void fdwatch_add_fd(struct fdwatch_s *fw, int fd, void *client_data);
+
+/* Delete a descriptor from the watch list. */
+
+extern void fdwatch_del_fd(struct fdwatch_s *fw, int fd);
+
+/* Do the watch.  Return value is the number of descriptors that are ready,
+ * or 0 if the timeout expired, or -1 on errors.  A timeout of INFTIM means
+ * wait indefinitely.
+ */
+
+extern int fdwatch(struct fdwatch_s *fw, long timeout_msecs);
+
+/* Check if a descriptor was ready. */
+
+extern int fdwatch_check_fd(struct fdwatch_s *fw, int fd);
+
+/* Get the client data for the next returned event.  Returns -1 when there
+ * are no more events.
+ */
+
+extern void *fdwatch_get_next_client_data(struct fdwatch_s *fw);
+
+#endif /* __NETUTILS_THTTPD_FDWATCH_H */
+
diff --git a/apps/netutils/thttpd/libhttpd.c b/apps/netutils/thttpd/libhttpd.c
new file mode 100644
index 000000000..05831b335
--- /dev/null
+++ b/apps/netutils/thttpd/libhttpd.c
@@ -0,0 +1,3525 @@
+/****************************************************************************
+ * netutils/thttpd/libhttpd.c
+ * HTTP Protocol Library
+ *
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in the original THTTPD package:
+ *
+ *   Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <signal.h>
+#include <sched.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/regex.h>
+#include <apps/netutils/thttpd.h>
+
+#include "config.h"
+#include "libhttpd.h"
+#include "thttpd_alloc.h"
+#include "thttpd_strings.h"
+#include "thttpd_cgi.h"
+#include "timers.h"
+#include "tdate_parse.h"
+#include "fdwatch.h"
+
+#ifdef CONFIG_THTTPD
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef STDIN_FILENO
+#  define STDIN_FILENO 0
+#endif
+#ifndef STDOUT_FILENO
+#  define STDOUT_FILENO 1
+#endif
+#ifndef STDERR_FILENO
+#  define STDERR_FILENO 2
+#endif
+
+#define NAMLEN(dirent) strlen((dirent)->d_name)
+
+extern char *crypt(const char *key, const char *setting);
+
+#ifndef MAX
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef MIN
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+/* Conditional macro to allow two alternate forms for use in the built-in
+ * error pages.  If EXPLICIT_ERROR_PAGES is defined, the second and more
+ * explicit error form is used; otherwise, the first and more generic
+ * form is used.
+ */
+
+#ifdef EXPLICIT_ERROR_PAGES
+#  define ERROR_FORM(a,b) b
+#else
+#  define ERROR_FORM(a,b) a
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void free_httpd_server(httpd_server *hs);
+static int  initialize_listen_socket(httpd_sockaddr *saP);
+static void add_response(httpd_conn *hc, const char *str);
+static void send_mime(httpd_conn *hc, int status, const char *title, const char *encodings,
+                      const char *extraheads, const char *type, off_t length, time_t mod);
+static void send_response(httpd_conn *hc, int status, const char *title,
+                          const char *extraheads, const char *form, const char *arg);
+static void send_response_tail(httpd_conn *hc);
+static void defang(const char *str, char *dfstr, int dfsize);
+#ifdef CONFIG_THTTPD_ERROR_DIRECTORY
+static int  send_err_file(httpd_conn *hc, int status, char *title,
+                           char *extraheads, char *filename);
+#endif
+#ifdef CONFIG_THTTPD_AUTH_FILE
+static void send_authenticate(httpd_conn *hc, char *realm);
+static int  b64_decode(const char *str, unsigned char *space, int size);
+static int  auth_check(httpd_conn *hc, char *dirname);
+static int  auth_check2(httpd_conn *hc, char *dirname);
+#endif
+static void send_dirredirect(httpd_conn *hc);
+#ifdef CONFIG_THTTPD_TILDE_MAP1
+static int httpd_tilde_map1(httpd_conn *hc);
+#endif
+#ifdef CONFIG_THTTPD_TILDE_MAP2
+static int httpd_tilde_map2(httpd_conn *hc);
+#endif
+#ifdef CONFIG_THTTPD_VHOST
+static int  vhost_map(httpd_conn *hc);
+#endif
+static char *expand_filename(char *path, char **restP, bool tildemapped);
+static char *bufgets(httpd_conn *hc);
+static void de_dotdot(char *file);
+static void init_mime(void);
+static void figure_mime(httpd_conn *hc);
+#ifdef CONFIG_THTTPD_GENERATE_INDICES
+static void ls_child(int argc, char **argv);
+static int  ls(httpd_conn *hc);
+#endif
+#ifdef SERVER_NAME_LIST
+static char *hostname_map(char *hostname);
+#endif
+
+static int  check_referer(httpd_conn *hc);
+#ifdef CONFIG_THTTPD_URLPATTERN
+static int  really_check_referer(httpd_conn *hc);
+#endif
+#ifdef CONFIG_DEBUG
+static int  sockaddr_check(httpd_sockaddr *saP);
+#else
+#  define sockaddr_check(saP) (1)
+#endif
+static size_t sockaddr_len(httpd_sockaddr *saP);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* This global keeps track of whether we are in the main task or a
+ * sub-task.  The reason is that httpd_write_response() can get called
+ * in either context; when it is called from the main task it must use
+ * non-blocking I/O to avoid stalling the server, but when it is called
+ * from a sub-task it wants to use blocking I/O so that the whole
+ * response definitely gets written.  So, it checks this variable.  A bit
+ * of a hack but it seems to do the right thing.
+ */
+
+static pid_t main_thread;
+
+/* Include MIME encodings and types */
+
+#include "mime_types.h"
+
+/* Names for index file */
+
+static const char *index_names[]   = { CONFIG_THTTPD_INDEX_NAMES };
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void free_httpd_server(httpd_server * hs)
+{
+  if (hs)
+    {
+      if (hs->hostname)
+        {
+          httpd_free(hs->hostname);
+        }
+
+      httpd_free(hs);
+    }
+}
+
+static int initialize_listen_socket(httpd_sockaddr *saP)
+{
+  int listen_fd;
+  int on;
+  int flags;
+
+  /* Check sockaddr. */
+
+#ifdef CONFIG_DEBUG
+  if (!sockaddr_check(saP))
+    {
+      ndbg("unknown sockaddr family on listen socket\n");
+      return -1;
+    }
+#endif
+
+  /* Create socket. */
+
+  nvdbg("Create listen socket\n");
+  listen_fd = socket(saP->sin_family, SOCK_STREAM, 0);
+  if (listen_fd < 0)
+    {
+      ndbg("socket failed: %d\n", errno);
+      return -1;
+    }
+
+  /* Allow reuse of local addresses. */
+
+  on = 1;
+  if (setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) < 0)
+    {
+      ndbg("setsockopt(SO_REUSEADDR) failed: %d\n", errno);
+    }
+
+  /* Bind to it. */
+
+  if (bind(listen_fd, (struct sockaddr*)saP, sockaddr_len(saP)) < 0)
+    {
+      ndbg("bind to %s failed: %d\n", httpd_ntoa(saP), errno);
+      (void)close(listen_fd);
+      return -1;
+    }
+
+  /* Set the listen file descriptor to no-delay / non-blocking mode. */
+
+  flags = fcntl(listen_fd, F_GETFL, 0);
+  if (flags == -1)
+    {
+      ndbg("fcntl(F_GETFL) failed: %d\n", errno);
+      (void)close(listen_fd);
+      return -1;
+    }
+
+  if (fcntl(listen_fd, F_SETFL, flags | O_NDELAY) < 0)
+    {
+      ndbg("fcntl(O_NDELAY) failed: %d\n", errno);
+      (void)close(listen_fd);
+      return -1;
+    }
+
+  /* Start a listen going. */
+
+  if (listen(listen_fd, CONFIG_THTTPD_LISTEN_BACKLOG) < 0)
+    {
+      ndbg("listen failed: %d\n", errno);
+      (void)close(listen_fd);
+      return -1;
+    }
+
+  return listen_fd;
+}
+
+/* Append a string to the buffer waiting to be sent as response. */
+
+static void add_response(httpd_conn *hc, const char *str)
+{
+  int resplen;
+  int len;
+
+  len     = strlen(str);
+  resplen = hc->buflen + len;
+
+  if (resplen > CONFIG_THTTPD_IOBUFFERSIZE)
+    {
+      ndbg("resplen(%d) > buffer size(%d)\n", resplen, CONFIG_THTTPD_IOBUFFERSIZE);
+      resplen = CONFIG_THTTPD_IOBUFFERSIZE;
+      len     = resplen - hc->buflen;
+    }
+
+  memcpy(&(hc->buffer[hc->buflen]), str, len);
+  hc->buflen = resplen;
+}
+
+static void send_mime(httpd_conn *hc, int status, const char *title, const char *encodings,
+                      const char *extraheads, const char *type, off_t length, time_t mod)
+{
+  struct timeval now;
+  const char *rfc1123fmt = "%a, %d %b %Y %H:%M:%S GMT";
+  char tmbuf[72];
+#ifdef CONFIG_THTTPD_MAXAGE
+  time_t expires;
+  char expbuf[72];
+#endif
+  char fixed_type[72];
+  char buf[128];
+  int partial_content;
+  int s100;
+
+  hc->bytes_to_send = length;
+  if (hc->mime_flag)
+    {
+      if (status == 200 && hc->got_range &&
+          (hc->range_end >= hc->range_start) &&
+          ((hc->range_end != length - 1) ||
+           (hc->range_start != 0)) &&
+          (hc->range_if == (time_t) - 1 || hc->range_if == hc->sb.st_mtime))
+        {
+          partial_content = 1;
+          status = 206;
+          title  = ok206title;
+        }
+      else
+        {
+          partial_content = 0;
+          hc->got_range = false;
+        }
+
+      gettimeofday(&now, NULL);
+      if (mod == (time_t)0)
+        {
+          mod = now.tv_sec;
+        }
+
+      (void)snprintf(fixed_type, sizeof(fixed_type), type, CONFIG_THTTPD_CHARSET);
+      (void)snprintf(buf, sizeof(buf), "%.20s %d %s\r\n", hc->protocol, status, title);
+      add_response(hc, buf);
+      (void)snprintf(buf, sizeof(buf), "Server: %s\r\n", "thttpd");
+      add_response(hc, buf);
+      (void)snprintf(buf, sizeof(buf), "Content-Type: %s\r\n", fixed_type);
+      add_response(hc, buf);
+      (void)strftime(tmbuf, sizeof(tmbuf), rfc1123fmt, gmtime(&now.tv_sec));
+      (void)snprintf(buf, sizeof(buf), "Date: %s\r\n", tmbuf);
+      add_response(hc, buf);
+      (void)strftime(tmbuf, sizeof(tmbuf), rfc1123fmt, gmtime(&mod));
+      (void)snprintf(buf, sizeof(buf), "Last-Modified: %s\r\n", tmbuf);
+      add_response(hc, buf);
+      add_response(hc, "Accept-Ranges: bytes\r\n");
+      add_response(hc, "Connection: close\r\n");
+
+      s100 = status / 100;
+      if (s100 != 2 && s100 != 3)
+        {
+          (void)snprintf(buf, sizeof(buf), "Cache-Control: no-cache,no-store\r\n");
+          add_response(hc, buf);
+        }
+
+      if (encodings[0] != '\0')
+        {
+          (void)snprintf(buf, sizeof(buf), "Content-Encoding: %s\r\n", encodings);
+          add_response(hc, buf);
+        }
+
+      if (partial_content)
+        {
+          (void)snprintf(buf, sizeof(buf),"Content-Range: bytes %ld-%ld/%ld\r\n",
+                         (long)hc->range_start, (long)hc->range_end, (long)length);
+          add_response(hc, buf);
+          (void)snprintf(buf, sizeof(buf),"Content-Length: %ld\r\n",
+                         (long)(hc->range_end - hc->range_start + 1));
+          add_response(hc, buf);
+        }
+      else if (length >= 0)
+        {
+          (void)snprintf(buf, sizeof(buf), "Content-Length: %ld\r\n", (long)length);
+          add_response(hc, buf);
+        }
+
+#ifdef CONFIG_THTTPD_P3P
+      (void)snprintf(buf, sizeof(buf), "P3P: %s\r\n", CONFIG_THTTPD_P3P);
+      add_response(hc, buf);
+#endif
+
+#ifdef CONFIG_THTTPD_MAXAGE
+      expires = now + CONFIG_THTTPD_MAXAGE;
+      (void)strftime(expbuf, sizeof(expbuf), rfc1123fmt, gmtime(&expires));
+      (void)snprintf(buf, sizeof(buf),
+                     "Cache-Control: max-age=%d\r\nExpires: %s\r\n",
+                     CONFIG_THTTPD_MAXAGE, expbuf);
+      add_response(hc, buf);
+#endif
+
+      if (extraheads[0] != '\0')
+        {
+          add_response(hc, extraheads);
+        }
+      add_response(hc, "\r\n");
+    }
+}
+
+static void send_response(httpd_conn *hc, int status, const char *title, const char *extraheads,
+                          const char *form, const char *arg)
+{
+  char defanged[72];
+  char buf[128];
+
+  nvdbg("title: \"%s\" form: \"%s\"\n", title, form);
+
+  send_mime(hc, status, title, "", extraheads, "text/html; charset=%s", (off_t)-1, (time_t)0);
+  add_response(hc, html_html);
+  add_response(hc, html_hdtitle);
+  (void)snprintf(buf, sizeof(buf), "%d %s", status, title);
+  add_response(hc, buf);
+  add_response(hc, html_titlehd);
+  add_response(hc, html_body);
+  add_response(hc, html_hdr2);
+  add_response(hc, buf);
+  add_response(hc, html_endhdr2);
+
+  defang(arg, defanged, sizeof(defanged));
+  (void)snprintf(buf, sizeof(buf), form, defanged);
+  add_response(hc, buf);
+
+  if (match("**MSIE**", hc->useragent))
+    {
+      int n;
+      add_response(hc, "<!--\n");
+      for (n = 0; n < 6; ++n)
+        add_response(hc,
+                     "Padding so that MSIE deigns to show this error instead of its own canned one.\n");
+      add_response(hc, "-->\n");
+    }
+
+  send_response_tail(hc);
+}
+
+static void send_response_tail(httpd_conn *hc)
+{
+  add_response(hc, "<HR>\r\n<ADDRESS><A HREF=\"");
+  add_response(hc, CONFIG_THTTPD_SERVER_ADDRESS);
+  add_response(hc, "\">");
+  add_response(hc, "thttpd");
+  add_response(hc, "</A></ADDRESS>\r\n");
+  add_response(hc, html_endbody);
+  add_response(hc, html_endhtml);
+}
+
+static void defang(const char *str, char *dfstr, int dfsize)
+{
+  const char *cp1;
+  char *cp2;
+
+  for (cp1 = str, cp2 = dfstr;
+       *cp1 != '\0' && cp2 - dfstr < dfsize - 5; ++cp1, ++cp2)
+    {
+      switch (*cp1)
+        {
+        case '<':
+          *cp2++ = '&';
+          *cp2++ = 'l';
+          *cp2++ = 't';
+          *cp2 = ';';
+          break;
+        case '>':
+          *cp2++ = '&';
+          *cp2++ = 'g';
+          *cp2++ = 't';
+          *cp2 = ';';
+          break;
+        default:
+          *cp2 = *cp1;
+          break;
+        }
+    }
+  *cp2 = '\0';
+}
+
+#ifdef CONFIG_THTTPD_ERROR_DIRECTORY
+static int send_err_file(httpd_conn *hc, int status, char *title, char *extraheads,
+                          char *filename)
+{
+  FILE *fp;
+  char buf[1000];
+  size_t nread;
+
+  fp = fopen(filename, "r");
+  if (fp == NULL)
+    {
+      return 0;
+    }
+
+  send_mime(hc, status, title, "", extraheads, "text/html; charset=%s",
+            (off_t)-1, (time_t)0);
+  for (;;)
+    {
+      nread = fread(buf, 1, sizeof(buf) - 1, fp);
+      if (nread == 0)
+        break;
+      buf[nread] = '\0';
+      add_response(hc, buf);
+    }
+  (void)fclose(fp);
+
+#ifdef ERR_APPEND_SERVER_INFO
+  send_response_tail(hc);
+#endif
+
+  return 1;
+}
+#endif
+
+#ifdef CONFIG_THTTPD_AUTH_FILE
+static void send_authenticate(httpd_conn *hc, char *realm)
+{
+  static char *header;
+  static size_t maxheader = 0;
+  static char headstr[] = "WWW-Authenticate: Basic realm=\"";
+
+  httpd_realloc_str(&header, &maxheader, sizeof(headstr) + strlen(realm) + 3);
+  (void)snprintf(header, maxheader, "%s%s\"\r\n", headstr, realm);
+  httpd_send_err(hc, 401, err401title, header, err401form, hc->encodedurl);
+
+  /* If the request was a POST then there might still be data to be read, so 
+   * we need to do a lingering close.
+   */
+
+  if (hc->method == METHOD_POST)
+    {
+      hc->should_linger = true;
+    }
+}
+
+/* Base-64 decoding.  This represents binary data as printable ASCII
+ * characters.  Three 8-bit binary bytes are turned into four 6-bit
+ * values, like so:
+ *
+ *   [11111111][22222222][33333333] -> [111111][112222][222233][333333]
+ *
+ * Then the 6-bit values are represented using the characters "A-Za-z0-9+/".
+ */
+
+static inline b64_charmap(char *ch)
+{
+  char bin6;
+
+       bin6 = -1;
+       if (c == 0x20)                         /* ' ' */
+         {
+           bin6 = 62;                          /* ' '  maps to 62 */
+         }
+       elseif (c == 0x2f)                      /* '/' */
+         {
+           bin6 = 63;                          /* '/'  maps to 63 */
+         }
+       else if (c >=  0x30)                    /* '0' */
+         {
+           else if (c <= 0x39)                 /* '9' */
+             {
+               bin6 = (c - 0x39 + 52);         /* '0'-'9' maps to 52-61 */
+             }
+           else if (c >= 0x41)                 /* 'A' */
+             {
+               if (c <= 0x5a)                  /* 'Z' */
+                 {
+                   bin6 = c - 0x41;            /* 'A'-'Z' map to 0 - 25 */
+                 }
+               else if (c >= 0x61)             /* 'a' */
+                 {
+                   if (c <= 0x7a)              /* 'z' */
+                     {
+                       bin6 = c - 0x61 + 26;   /* 'a'-'z' map to 0 - 25 */
+                     }
+                 }
+             }
+         }
+
+}
+
+/* Do base-64 decoding on a string.  Ignore any non-base64 bytes.
+ * Return the actual number of bytes generated.  The decoded size will
+ * be at most 3/4 the size of the encoded, and may be smaller if there
+ * are padding characters (blanks, newlines).
+ */
+
+static int b64_decode(const char *str, unsigned char *space, int size)
+{
+  const char *cp;
+  int ndx;
+  int phase;
+  int decoded;
+  int prev_decoded = 0;
+  unsigned char packed;
+
+  ndx = 0;
+  phase = 0;
+  for (cp = str; *cp != '\0', ndx < size; cp++)
+    {
+       /* Decode base-64 */
+
+      decoded = b64_charmap(*cp);  /* Decode ASCII representations to 6-bit binary */
+      if (decoded != -1)
+        {
+          switch (phase)
+            {
+            case 0:
+              phase = 1;
+              break;
+
+            case 1:
+              space[ndx++] = ((prev_decoded << 2) | ((decoded & 0x30) >> 4));
+              phase = 2;
+              break;
+
+            case 2:
+              space[ndx++] =(((prev_decoded & 0xf) << 4) | ((decoded & 0x3packed) >> 2));
+              phase = 3;
+              break;
+
+            case 3:
+              space[ndx++] =(((prev_decoded & 0x03) << 6) | decoded);
+              phase = 0;
+              break;
+            }
+          prev_decoded = decoded;
+        }
+    }
+  return ndx;
+}
+
+/* Returns -1 == unauthorized, 0 == no auth file, 1 = authorized. */
+
+static int auth_check(httpd_conn *hc, char *dirname)
+{
+#ifdef CONFIG_THTTPD_GLOBALPASSWD
+  char *topdir;
+
+#ifdef CONFIG_THTTPD_VHOST
+  if (hc->hostdir[0] != '\0')
+    {
+      topdir = hc->hostdir;
+    }
+  else
+#endif
+    {
+      topdir = httpd_root;
+    }
+
+  switch (auth_check2(hc, topdir))
+    {
+    case -1:
+      return -1;
+    case 1:
+      return 1;
+    }
+#endif
+  return auth_check2(hc, dirname);
+}
+
+/* Returns -1 == unauthorized, 0 == no auth file, 1 = authorized. */
+
+static int auth_check2(httpd_conn *hc, char *dirname)
+{
+  static char *authpath;
+  static size_t maxauthpath = 0;
+  struct stat sb;
+  char authinfo[500];
+  char *authpass;
+  char *colon;
+  int l;
+  FILE *fp;
+  char line[500];
+  char *cryp;
+  static char *prevauthpath;
+  static size_t maxprevauthpath = 0;
+  static time_t prevmtime;
+  static char *prevuser;
+  static size_t maxprevuser = 0;
+  static char *prevcryp;
+  static size_t maxprevcryp = 0;
+
+  /* Construct auth filename. */
+
+  httpd_realloc_str(&authpath, &maxauthpath,
+                    strlen(dirname) + 1 + sizeof(CONFIG_THTTPD_AUTH_FILE));
+  (void)snprintf(authpath, maxauthpath, "%s/%s", dirname, CONFIG_THTTPD_AUTH_FILE);
+
+  /* Does this directory have an auth file? */
+
+  if (stat(authpath, &sb) < 0)
+    {
+      /* Nope, let the request go through. */
+
+      return 0;
+    }
+
+  /* Does this request contain basic authorization info? */
+
+  if (hc->authorization[0] == '\0' ||  strncmp(hc->authorization, "Basic ", 6) != 0)
+    {
+      /* Nope, return a 401 Unauthorized. */
+
+      send_authenticate(hc, dirname);
+      return -1;
+    }
+
+  /* Decode it. */
+
+  l = b64_decode(&(hc->authorization[6]), (unsigned char *)authinfo, sizeof(authinfo) - 1);
+  authinfo[l] = '\0';
+
+  /* Split into user and password. */
+
+  authpass = strchr(authinfo, ':');
+  if (!authpass)
+    {
+      /* No colon? Bogus auth info. */
+
+      send_authenticate(hc, dirname);
+      return -1;
+    }
+  *authpass++ = '\0';
+
+  /* If there are more fields, cut them off. */
+
+  colon = strchr(authpass, ':');
+  if (colon)
+    {
+      *colon = '\0';
+    }
+
+  /* See if we have a cached entry and can use it. */
+
+  if (maxprevauthpath != 0 &&
+      strcmp(authpath, prevauthpath) == 0 &&
+      sb.st_mtime == prevmtime && strcmp(authinfo, prevuser) == 0)
+    {
+      /* Yes.  Check against the cached encrypted password. */
+
+      if (strcmp(crypt(authpass, prevcryp), prevcryp) == 0)
+        {
+          /* Ok! */
+
+          httpd_realloc_str(&hc->remoteuser, &hc->maxremoteuser,
+                            strlen(authinfo));
+          (void)strcpy(hc->remoteuser, authinfo);
+          return 1;
+        }
+      else
+        {
+          /* No. */
+
+          send_authenticate(hc, dirname);
+          return -1;
+        }
+    }
+
+  /* Open the password file. */
+
+  fp = fopen(authpath, "r");
+  if (fp == NULL)
+    {
+      /* The file exists but we can't open it? Disallow access. */
+
+      ndbg("%s auth file %s could not be opened: %d\n",
+             httpd_ntoa(&hc->client_addr), authpath, errno);
+
+      httpd_send_err(hc, 403, err403title, "",
+                     ERROR_FORM(err403form,
+                                "The requested URL '%s' is protected by an authentication file, "
+                                "but the authentication file cannot be opened.\n"),
+                     hc->encodedurl);
+      return -1;
+    }
+
+  /* Read it. */
+
+  while (fgets(line, sizeof(line), fp) != NULL)
+    {
+      /* Nuke newline. */
+
+      l = strlen(line);
+      if (line[l - 1] == '\n')
+        {
+          line[l - 1] = '\0';
+        }
+
+      /* Split into user and encrypted password. */
+
+      cryp = strchr(line, ':');
+      if (!cryp)
+        {
+          continue;
+        }
+      *cryp++ = '\0';
+
+      /* Is this the right user? */
+
+      if (strcmp(line, authinfo) == 0)
+        {
+          /* Yes. */
+
+          (void)fclose(fp);
+
+          /* So is the password right? */
+
+          if (strcmp(crypt(authpass, cryp), cryp) == 0)
+            {
+              /* Ok! */
+
+              httpd_realloc_str(&hc->remoteuser, &hc->maxremoteuser, strlen(line));
+              (void)strcpy(hc->remoteuser, line);
+
+              /* And cache this user's info for next time. */
+
+              httpd_realloc_str(&prevauthpath, &maxprevauthpath, strlen(authpath));
+              (void)strcpy(prevauthpath, authpath);
+              prevmtime = sb.st_mtime;
+              httpd_realloc_str(&prevuser, &maxprevuser, strlen(authinfo));
+              (void)strcpy(prevuser, authinfo);
+              httpd_realloc_str(&prevcryp, &maxprevcryp, strlen(cryp));
+              (void)strcpy(prevcryp, cryp);
+              return 1;
+            }
+          else
+            {
+              /* No. */
+
+              send_authenticate(hc, dirname);
+              return -1;
+            }
+        }
+    }
+
+  /* Didn't find that user.  Access denied. */
+
+  (void)fclose(fp);
+  send_authenticate(hc, dirname);
+  return -1;
+}
+#endif /* CONFIG_THTTPD_AUTH_FILE */
+
+static void send_dirredirect(httpd_conn *hc)
+{
+  static char *location;
+  static char *header;
+  static size_t maxlocation = 0;
+  static size_t maxheader = 0;
+  static char headstr[] = "Location: ";
+
+  if (hc->query[0] != '\0')
+    {
+      char *cp = strchr(hc->encodedurl, '?');
+      if (cp)
+        {
+          *cp = '\0';
+        }
+
+      httpd_realloc_str(&location, &maxlocation, strlen(hc->encodedurl) + 2 + strlen(hc->query));
+      (void)snprintf(location, maxlocation, "%s/?%s", hc->encodedurl, hc->query);
+    }
+  else
+    {
+      httpd_realloc_str(&location, &maxlocation, strlen(hc->encodedurl) + 1);
+      (void)snprintf(location, maxlocation, "%s/", hc->encodedurl);
+    }
+
+  httpd_realloc_str(&header, &maxheader, sizeof(headstr) + strlen(location));
+  (void)snprintf(header, maxheader, "%s%s\r\n", headstr, location);
+  send_response(hc, 302, err302title, header, err302form, location);
+}
+
+/* Map a ~username/whatever URL into <prefix>/username. */
+
+#ifdef CONFIG_THTTPD_TILDE_MAP1
+static int httpd_tilde_map1(httpd_conn *hc)
+{
+  static char *temp;
+  static size_t maxtemp = 0;
+  int len;
+  static char *prefix = CONFIG_THTTPD_TILDE_MAP1;
+
+  len = strlen(hc->expnfilename) - 1;
+  httpd_realloc_str(&temp, &maxtemp, len);
+  (void)strcpy(temp, &hc->expnfilename[1]);
+
+  httpd_realloc_str(&hc->expnfilename, &hc->maxexpnfilename, strlen(prefix) + 1 + len);
+  (void)strcpy(hc->expnfilename, prefix);
+
+  if (prefix[0] != '\0')
+    {
+      (void)strcat(hc->expnfilename, "/");
+    }
+
+  (void)strcat(hc->expnfilename, temp);
+  return 1;
+}
+#endif
+
+/* Map a ~username/whatever URL into <user's homedir>/<postfix>. */
+
+#ifdef CONFIG_THTTPD_TILDE_MAP2
+static int httpd_tilde_map2(httpd_conn *hc)
+{
+  static char *temp;
+  static size_t maxtemp = 0;
+  static char *postfix = CONFIG_THTTPD_TILDE_MAP2;
+  char *cp;
+  struct passwd *pw;
+  char *alt;
+  char *rest;
+
+  /* Get the username. */
+
+  httpd_realloc_str(&temp, &maxtemp, strlen(hc->expnfilename) - 1);
+  (void)strcpy(temp, &hc->expnfilename[1]);
+
+  cp = strchr(temp, '/');
+  if (cp)
+    {
+      *cp++ = '\0';
+    }
+  else
+    {
+      cp = "";
+    }
+
+  /* Get the passwd entry. */
+
+  pw = getpwnam(temp);
+  if (!pw)
+    {
+      return 0;
+    }
+
+  /* Set up altdir. */
+
+  httpd_realloc_str(&hc->altdir, &hc->maxaltdir, strlen(pw->pw_dir) + 1 + strlen(postfix));
+  (void)strcpy(hc->altdir, pw->pw_dir);
+  if (postfix[0] != '\0')
+    {
+      (void)strcat(hc->altdir, "/");
+      (void)strcat(hc->altdir, postfix);
+    }
+
+  alt = expand_filename(hc->altdir, &rest, true);
+  if (rest[0] != '\0')
+    {
+     return 0;
+    }
+
+  httpd_realloc_str(&hc->altdir, &hc->maxaltdir, strlen(alt));
+  (void)strcpy(hc->altdir, alt);
+
+  /* And the filename becomes altdir plus the post-~ part of the original. */
+
+  httpd_realloc_str(&hc->expnfilename, &hc->maxexpnfilename, strlen(hc->altdir) + 1 + strlen(cp));
+  (void)snprintf(hc->expnfilename, hc->maxexpnfilename, "%s/%s", hc->altdir, cp);
+
+  /* For this type of tilde mapping, we want to defeat vhost mapping. */
+
+  hc->tildemapped = true;
+  return 1;
+}
+#endif
+
+/* Virtual host mapping. */
+
+#ifdef CONFIG_THTTPD_VHOST
+static int vhost_map(httpd_conn *hc)
+{
+  httpd_sockaddr sa;
+  socklen_t sz;
+  static char *tempfilename;
+  static size_t maxtempfilename = 0;
+  char *cp1;
+  int len;
+#ifdef VHOST_DIRLEVELS
+  int i;
+  char *cp2;
+#endif
+
+  /* Figure out the virtual hostname. */
+
+  if (hc->reqhost[0] != '\0')
+    {
+      hc->vhostname = hc->reqhost;
+    }
+  else if (hc->hdrhost[0] != '\0')
+    {
+      hc->vhostname = hc->hdrhost;
+    }
+  else
+    {
+      sz = sizeof(sa);
+      if (getsockname(hc->conn_fd, &sa.sa, &sz) < 0)
+        {
+          ndbg("getsockname: %d\n", errno);
+          return 0;
+        }
+      hc->vhostname = httpd_ntoa(&sa);
+    }
+
+  /* Pound it to lower case. */
+
+  for (cp1 = hc->vhostname; *cp1 != '\0'; ++cp1)
+    {
+      if (isupper(*cp1))
+        {
+          *cp1 = tolower(*cp1);
+        }
+    }
+
+  if (hc->tildemapped)
+    {
+      return 1;
+    }
+
+  /* Figure out the host directory. */
+
+#ifdef VHOST_DIRLEVELS
+  httpd_realloc_str(&hc->hostdir, &hc->maxhostdir, strlen(hc->vhostname) + 2 * VHOST_DIRLEVELS);
+  if (strncmp(hc->vhostname, "www.", 4) == 0)
+    {
+      cp1 = &hc->vhostname[4];
+    }
+  else
+    {
+      cp1 = hc->vhostname;
+    }
+
+  for (cp2 = hc->hostdir, i = 0; i < VHOST_DIRLEVELS; ++i)
+    {
+      /* Skip dots in the hostname.  If we don't, then we get vhost
+       * directories in higher level of filestructure if dot gets involved
+       * into path construction.  It's `while' used here instead of `if' for 
+       * it's possible to have a hostname formed with two dots at the end of 
+       * it.
+       */
+
+      while (*cp1 == '.')
+        {
+          ++cp1;
+        }
+
+      /* Copy a character from the hostname, or '_' if we ran out. */
+
+      if (*cp1 != '\0')
+        {
+          *cp2++ = *cp1++;
+        }
+      else
+        {
+          *cp2++ = '_';
+        }
+
+      /* Copy a slash. */
+
+      *cp2++ = '/';
+    }
+  (void)strcpy(cp2, hc->vhostname);
+#else /* VHOST_DIRLEVELS */
+  httpd_realloc_str(&hc->hostdir, &hc->maxhostdir, strlen(hc->vhostname));
+  (void)strcpy(hc->hostdir, hc->vhostname);
+#endif                                 /* VHOST_DIRLEVELS */
+
+  /* Prepend hostdir to the filename. */
+
+  len = strlen(hc->expnfilename);
+  httpd_realloc_str(&tempfilename, &maxtempfilename, len);
+  (void)strcpy(tempfilename, hc->expnfilename);
+  httpd_realloc_str(&hc->expnfilename, &hc->maxexpnfilename, strlen(hc->hostdir) + 1 + len);
+  (void)strcpy(hc->expnfilename, hc->hostdir);
+  (void)strcat(hc->expnfilename, "/");
+  (void)strcat(hc->expnfilename, tempfilename);
+  return 1;
+}
+#endif
+
+/* Expands filename, deleting ..'s and leading /'s.
+ * Returns the expanded path (pointer to static string), or NULL on
+ * errors.  Also returns, in the string pointed to by restP, any trailing
+ * parts of the path that don't exist.
+ */
+
+static char *expand_filename(char *path, char **restP, bool tildemapped)
+{
+  static char *checked;
+  static char *rest;
+  static size_t maxchecked = 0, maxrest = 0;
+  size_t checkedlen, restlen, prevcheckedlen, prevrestlen;
+#if 0 // REVISIT
+  struct stat sb;
+#endif
+  int nlinks, i;
+  char *r;
+  char *cp1;
+  char *cp2;
+
+  nvdbg("path: \"%s\"\n", path);
+#if 0 // REVISIT
+  /* We need to do the pathinfo check.  we do a single stat() of the whole
+   * filename - if it exists, then we return it as is with nothing in restP.
+   * If it doesn't exist, we fall through to the existing code.
+   */
+
+  if (stat(path, &sb) != -1)
+    {
+      checkedlen = strlen(path);
+      httpd_realloc_str(&checked, &maxchecked, checkedlen);
+      (void)strcpy(checked, path);
+
+      /* Trim trailing slashes. */
+
+      while (checked[checkedlen - 1] == '/')
+        {
+          checked[checkedlen - 1] = '\0';
+          --checkedlen;
+        }
+
+      httpd_realloc_str(&rest, &maxrest, 0);
+      rest[0] = '\0';
+      *restP = rest;
+      return checked;
+    }
+#endif
+
+  /* Handle leading / or . and relative pathes by copying the default directory into checked */
+
+  if ((path[0] == '/' && strncmp(path, httpd_root, strlen(httpd_root)) != 0) || path[0] != '/')
+    {
+      /* Start out with httpd_root in checked.  Allow space in the reallocation
+       * include NULL terminator and possibly a '/' 
+       */
+ 
+      checkedlen = strlen(httpd_root);
+      httpd_realloc_str(&checked, &maxchecked, checkedlen+2);
+      strcpy(checked, httpd_root);
+
+      /* Skip over leading '.' */
+
+      if (path[0] == '.')
+        {
+          path++;
+        }
+
+      /* Add '/' to separate relative pathes */
+
+      else if (path[0] != '/')
+        {
+          checked[checkedlen]   = '/';
+          checked[checkedlen+1] = '\0';
+        }
+    }
+  else
+    {
+      /* Start out with nothing in checked */
+
+      httpd_realloc_str(&checked, &maxchecked, 1);
+      checked[0] = '\0';
+      checkedlen = 0;
+    }       
+
+  /* Copy the whole filename (minus the leading '.') into rest. */
+
+  restlen = strlen(path);
+  httpd_realloc_str(&rest, &maxrest, restlen+1);
+  (void)strcpy(rest, path);
+
+  /* trim trailing slash */
+
+  if (rest[restlen - 1] == '/')
+    {
+      rest[--restlen] = '\0';
+    }
+
+  r = rest;
+  nlinks = 0;
+
+  /* While there are still components to check... */
+
+  while (restlen > 0)
+    {
+      /* Save current checkedlen.  Save current restlen in case we get a non-existant component. */
+
+      prevcheckedlen = checkedlen;
+      prevrestlen    = restlen;
+
+      /* Grab one component from r and transfer it to checked. */
+
+      cp1 = strchr(r, '/');
+      if (cp1)
+        {
+          i = cp1 - r;
+          if (i == 0)
+            {
+              /* Special case for absolute paths. */
+
+              httpd_realloc_str(&checked, &maxchecked, checkedlen + 1);
+              (void)strncpy(&checked[checkedlen], r, 1);
+              checkedlen += 1;
+            }
+          else if (strncmp(r, "..", MAX(i, 2)) == 0)
+            {
+              /* Ignore ..'s that go above the start of the path. */
+
+              if (checkedlen != 0)
+                {
+                  cp2 = strrchr(checked, '/');
+                  if (!cp2)
+                    {
+                      checkedlen = 0;
+                    }
+                  else if (cp2 == checked)
+                    {
+                      checkedlen = 1;
+                    }
+                  else
+                    {
+                      checkedlen = cp2 - checked;
+                    }
+                }
+            }
+          else
+            {
+              httpd_realloc_str(&checked, &maxchecked, checkedlen + 1 + i);
+              if (checkedlen > 0 && checked[checkedlen - 1] != '/')
+                {
+                  checked[checkedlen++] = '/';
+                }
+
+              (void)strncpy(&checked[checkedlen], r, i);
+              checkedlen += i;
+            }
+
+          checked[checkedlen] = '\0';
+          r += i + 1;
+          restlen -= i + 1;
+        }
+      else
+        {
+          /* No slashes remaining, r is all one component. */
+
+          if (strcmp(r, "..") == 0)
+            {
+              /* Ignore ..'s that go above the start of the path. */
+
+              if (checkedlen != 0)
+                {
+                  cp2 = strrchr(checked, '/');
+                  if (!cp2)
+                    {
+                      checkedlen = 0;
+                    }
+                  else if (cp2 == checked)
+                    {
+                      checkedlen = 1;
+                    }
+                  else
+                    {
+                      checkedlen = cp2 - checked;
+                    }
+
+                  checked[checkedlen] = '\0';
+                }
+            }
+          else
+            {
+              httpd_realloc_str(&checked, &maxchecked, checkedlen + 1 + restlen);
+              if (checkedlen > 0 && checked[checkedlen - 1] != '/')
+                {
+                  checked[checkedlen++] = '/';
+                }
+
+              (void)strcpy(&checked[checkedlen], r);
+              checkedlen += restlen;
+            }
+
+          r += restlen;
+          restlen = 0;
+        }
+    }
+
+  /* Ok. */
+
+  *restP = r;
+  if (checked[0] == '\0')
+    {
+      (void)strcpy(checked, httpd_root);
+    }
+
+  nvdbg("checked: \"%s\"\n", checked);
+  return checked;
+}
+
+static char *bufgets(httpd_conn *hc)
+{
+  int i;
+  char c;
+
+  for (i = hc->checked_idx; hc->checked_idx < hc->read_idx; ++hc->checked_idx)
+    {
+      c = hc->read_buf[hc->checked_idx];
+      if (c == '\012' || c == '\015')
+        {
+          hc->read_buf[hc->checked_idx] = '\0';
+          ++hc->checked_idx;
+          if (c == '\015' && hc->checked_idx < hc->read_idx &&
+              hc->read_buf[hc->checked_idx] == '\012')
+            {
+              hc->read_buf[hc->checked_idx] = '\0';
+              ++hc->checked_idx;
+            }
+          return &(hc->read_buf[i]);
+        }
+    }
+  return NULL;
+}
+
+static void de_dotdot(char *file)
+{
+  char *cp;
+  char *cp2;
+  int l;
+
+  /* Collapse any multiple / sequences. */
+
+  while ((cp = strstr(file, "//")) != NULL)
+    {
+      for (cp2 = cp + 2; *cp2 == '/'; ++cp2)
+        {
+          continue;
+        }
+
+      (void)strcpy(cp + 1, cp2);
+    }
+
+  /* Remove leading ./ and any /./ sequences. */
+
+  while (strncmp(file, "./", 2) == 0)
+    {
+      (void)strcpy(file, file + 2);
+    }
+
+  while ((cp = strstr(file, "/./")) != NULL)
+    {
+    (void)strcpy(cp, cp + 2);
+    }
+
+  /* Alternate between removing leading ../ and removing xxx/../ */
+
+  for (;;)
+    {
+      while (strncmp(file, "../", 3) == 0)
+        {
+          (void)strcpy(file, file + 3);
+        }
+
+      cp = strstr(file, "/../");
+      if (!cp)
+        {
+          break;
+        }
+
+      for (cp2 = cp - 1; cp2 >= file && *cp2 != '/'; --cp2)
+        {
+          continue;
+        }
+
+      (void)strcpy(cp2 + 1, cp + 4);
+    }
+
+  /* Also elide any xxx/.. at the end. */
+
+  while ((l = strlen(file)) > 3 && strcmp((cp = file + l - 3), "/..") == 0)
+    {
+      for (cp2 = cp - 1; cp2 >= file && *cp2 != '/'; --cp2)
+        {
+          continue;
+        }
+
+      if (cp2 < file)
+        {
+          break;
+        }
+
+      *cp2 = '\0';
+    }
+}
+
+static void init_mime(void)
+{
+  int i;
+
+  /* Fill in the lengths. */
+
+  for (i = 0; i < n_enc_tab; ++i)
+    {
+      enc_tab[i].ext_len = strlen(enc_tab[i].ext);
+      enc_tab[i].val_len = strlen(enc_tab[i].val);
+    }
+
+  for (i = 0; i < n_typ_tab; ++i)
+    {
+      typ_tab[i].ext_len = strlen(typ_tab[i].ext);
+      typ_tab[i].val_len = strlen(typ_tab[i].val);
+    }
+}
+
+/* Figure out MIME encodings and type based on the filename.  Multiple
+ * encodings are separated by commas, and are listed in the order in
+ * which they were applied to the file.
+ */
+
+static void figure_mime(httpd_conn *hc)
+{
+  char *prev_dot;
+  char *dot;
+  char *ext;
+  int me_indexes[100], n_me_indexes;
+  size_t ext_len, encodings_len;
+  int i, top, bot, mid;
+  int r;
+  char *default_type = "text/plain; charset=%s";
+
+  /* Peel off encoding extensions until there aren't any more. */
+
+  n_me_indexes = 0;
+  for (prev_dot = &hc->expnfilename[strlen(hc->expnfilename)];; prev_dot = dot)
+    {
+      for (dot = prev_dot - 1; dot >= hc->expnfilename && *dot != '.'; --dot)
+        ;
+
+      if (dot < hc->expnfilename)
+        {
+          /* No dot found.  No more encoding extensions, and no type
+           * extension either.
+           */
+
+          hc->type = default_type;
+          goto done;
+        }
+
+      ext = dot + 1;
+      ext_len = prev_dot - ext;
+
+      /* Search the encodings table.  Linear search is fine here, there are
+       * only a few entries.
+       */
+
+      for (i = 0; i < n_enc_tab; ++i)
+        {
+          if (ext_len == enc_tab[i].ext_len &&
+              strncasecmp(ext, enc_tab[i].ext, ext_len) == 0)
+            {
+              if (n_me_indexes < sizeof(me_indexes) / sizeof(*me_indexes))
+                {
+                  me_indexes[n_me_indexes] = i;
+                  ++n_me_indexes;
+                }
+              goto next;
+            }
+        }
+
+      /* No encoding extension found.  Break and look for a type extension. */
+
+      break;
+
+    next:;
+    }
+
+  /* Binary search for a matching type extension. */
+
+  top = n_typ_tab - 1;
+  bot = 0;
+  while (top >= bot)
+    {
+      mid = (top + bot) / 2;
+      r = strncasecmp(ext, typ_tab[mid].ext, ext_len);
+      if (r < 0)
+        {
+          top = mid - 1;
+        }
+      else if (r > 0)
+        {
+          bot = mid + 1;
+        }
+      else if (ext_len < typ_tab[mid].ext_len)
+        {
+          top = mid - 1;
+        }
+      else if (ext_len > typ_tab[mid].ext_len)
+        {
+          bot = mid + 1;
+        }
+      else
+        {
+          hc->type = typ_tab[mid].val;
+          goto done;
+        }
+    }
+  hc->type = default_type;
+
+done:
+
+  /* The last thing we do is actually generate the mime-encoding header. */
+
+  hc->encodings[0] = '\0';
+  encodings_len = 0;
+  for (i = n_me_indexes - 1; i >= 0; --i)
+    {
+      httpd_realloc_str(&hc->encodings, &hc->maxencodings,
+                        encodings_len + enc_tab[me_indexes[i]].val_len + 1);
+      if (hc->encodings[0] != '\0')
+        {
+          (void)strcpy(&hc->encodings[encodings_len], ",");
+          ++encodings_len;
+        }
+
+      (void)strcpy(&hc->encodings[encodings_len], enc_tab[me_indexes[i]].val);
+      encodings_len += enc_tab[me_indexes[i]].val_len;
+    }
+}
+
+/* qsort comparison routine. */
+
+#ifdef CONFIG_THTTPD_GENERATE_INDICES
+static int name_compare(char **a, char **b)
+{
+  return strcmp(*a, *b);
+}
+
+static void ls_child(int argc, char **argv)
+{
+  FAR httpd_conn *hc = (FAR httpd_conn*)strtoul(argv[1], NULL, 16);
+  DIR *dirp;
+  struct dirent *de;
+  int namlen;
+  static int maxnames = 0;
+  int nnames;
+  static char *names;
+  static char **nameptrs;
+  static char *name;
+  static size_t maxname = 0;
+  static char *rname;
+  static size_t maxrname = 0;
+  static char *encrname;
+  static size_t maxencrname = 0;
+  FILE *fp;
+  int i, r;
+  struct stat sb;
+  struct stat lsb;
+  char modestr[20];
+  char *linkprefix;
+  char link[MAXPATHLEN + 1];
+  char *fileclass;
+  time_t now;
+  char *timestr;
+  ClientData client_data;
+
+  httpd_unlisten(hc->hs);
+  send_mime(hc, 200, ok200title, "", "", "text/html; charset=%s",
+            (off_t) - 1, hc->sb.st_mtime);
+  httpd_write_response(hc);
+
+  /* Open a stdio stream so that we can use fprintf, which is more
+   * efficient than a bunch of separate write()s.  We don't have to
+   * worry about double closes or file descriptor leaks cause we're
+   * in a sub-task.
+   */
+
+  fp = fdopen(hc->conn_fd, "w");
+  if (fp == NULL)
+    {
+      ndbg("fdopen: %d\n", errno);
+      INTERNALERROR("fdopen");
+      httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
+      httpd_write_response(hc);
+      closedir(dirp);
+      exit(1);
+    }
+
+  fputs(html_html, fp);
+  fputs(html_hdtitle, fp);
+  (void)fprintf(fp, "Index of %s", hc->encodedurl, hc->encodedurl);
+  fputs(html_titlehd, fp);
+  fputs(html_body, fp);
+  fputs(html_hdr2, fp);
+  (void)fprintf(fp, "Index of %s", hc->encodedurl, hc->encodedurl);
+  fputs(html_endhdr2, fp);
+  fputs(html_crlf, fp);
+  fputs("<PRE>\r\nmode  links  bytes  last-changed  name\r\n<HR>", fp);
+
+  /* Read in names. */
+
+  nnames = 0;
+  while ((de = readdir(dirp)) != 0)     /* dirent or direct */
+    {
+      if (nnames >= maxnames)
+        {
+          if (maxnames == 0)
+            {
+              maxnames = 100;
+              names    = NEW(char, maxnames * (MAXPATHLEN + 1));
+              nameptrs = NEW(char*, maxnames);
+            }
+          else
+            {
+              oldmax    = maxnames;
+              maxnames *= 2;
+              names     = RENEW(names, char, oldmax*(MAXPATHLEN+1), maxnames*(MAXPATHLEN + 1));
+              nameptrs  = RENEW(nameptrs, char*, oldmax, maxnames);
+            }
+
+          if (!names || !nameptrs)
+            {
+              ndbg("out of memory reallocating directory names\n");
+              exit(1);
+            }
+
+          for (i = 0; i < maxnames; ++i)
+            {
+              nameptrs[i] = &names[i * (MAXPATHLEN + 1)];
+            }
+        }
+
+      namlen = NAMLEN(de);
+      (void)strncpy(nameptrs[nnames], de->d_name, namlen);
+      nameptrs[nnames][namlen] = '\0';
+      ++nnames;
+    }
+  closedir(dirp);
+
+  /* Sort the names. */
+
+  qsort(nameptrs, nnames, sizeof(*nameptrs), name_compare);
+
+  /* Generate output. */
+
+  for (i = 0; i < nnames; ++i)
+    {
+      httpd_realloc_str(&name, &maxname,
+                        strlen(hc->expnfilename) + 1 +
+                        strlen(nameptrs[i]));
+      httpd_realloc_str(&rname, &maxrname,
+                        strlen(hc->origfilename) + 1 +
+                        strlen(nameptrs[i]));
+
+      if (hc->expnfilename[0] == '\0' || strcmp(hc->expnfilename, ".") == 0)
+        {
+          (void)strcpy(name, nameptrs[i]);
+          (void)strcpy(rname, nameptrs[i]);
+        }
+      else
+        {
+          (void)snprintf(name, maxname, "%s/%s", hc->expnfilename, nameptrs[i]);
+          if (strcmp(hc->origfilename, ".") == 0)
+            {
+              (void)snprintf(rname, maxrname, "%s", nameptrs[i]);
+            }
+          else
+            {
+              (void)snprintf(rname, maxrname, "%s%s", hc->origfilename, nameptrs[i]);
+            }
+        }
+
+      httpd_realloc_str(&encrname, &maxencrname, 3 * strlen(rname) + 1);
+      httpd_strencode(encrname, maxencrname, rname);
+
+      if (stat(name, &sb) < 0 || lstat(name, &lsb) < 0)
+        {
+          continue;
+        }
+
+      linkprefix = "";
+      link[0] = '\0';
+
+      /* Break down mode word.  First the file type. */
+
+      switch (lsb.st_mode & S_IFMT)
+        {
+        case S_IFIFO:
+          modestr[0] = 'p';
+          break;
+
+        case S_IFCHR:
+          modestr[0] = 'c';
+          break;
+
+        case S_IFDIR:
+          modestr[0] = 'd';
+          break;
+
+        case S_IFBLK:
+          modestr[0] = 'b';
+          break;
+
+        case S_IFREG:
+          modestr[0] = '-';
+          break;
+
+        case S_IFSOCK:
+          modestr[0] = 's';
+          break;
+
+        case S_IFLNK:
+        default:
+          modestr[0] = '?';
+          break;
+        }
+
+      /* Now the world permissions.  Owner and group permissions are 
+       * not of interest to web clients.
+       */
+
+      modestr[1] = (lsb.st_mode & S_IROTH) ? 'r' : '-';
+      modestr[2] = (lsb.st_mode & S_IWOTH) ? 'w' : '-';
+      modestr[3] = (lsb.st_mode & S_IXOTH) ? 'x' : '-';
+      modestr[4] = '\0';
+
+      /* We also leave out the owner and group name */
+
+      /* Get time string. */
+
+      now = time(NULL);
+      timestr = ctime(&lsb.st_mtime);
+      timestr[0] = timestr[4];
+      timestr[1] = timestr[5];
+      timestr[2] = timestr[6];
+      timestr[3] = ' ';
+      timestr[4] = timestr[8];
+      timestr[5] = timestr[9];
+      timestr[6] = ' ';
+
+      if (now - lsb.st_mtime > 60 * 60 * 24 * 182)      /* 1/2 year */
+        {
+          timestr[7] = ' ';
+          timestr[8] = timestr[20];
+          timestr[9] = timestr[21];
+          timestr[10] = timestr[22];
+          timestr[11] = timestr[23];
+        }
+      else
+        {
+          timestr[7] = timestr[11];
+          timestr[8] = timestr[12];
+          timestr[9] = ':';
+          timestr[10] = timestr[14];
+          timestr[11] = timestr[15];
+        }
+      timestr[12] = '\0';
+
+      /* The ls -F file class. */
+
+      switch (sb.st_mode & S_IFMT)
+        {
+        case S_IFDIR:
+          fileclass = "/";
+          break;
+
+        case S_IFSOCK:
+          fileclass = "=";
+          break;
+
+        case S_IFLNK:
+          fileclass = "@";
+          break;
+
+        default:
+          fileclass = (sb.st_mode & S_IXOTH) ? "*" : "";
+          break;
+        }
+
+      /* And print. */
+
+      (void)fprintf(fp, "%s %3ld  %10lld  %s  <A HREF=\"/%.500s%s\">%s</A>%s%s%s\n",
+                    modestr, (long)lsb.st_nlink, (int16_t) lsb.st_size,
+                    timestr, encrname, S_ISDIR(sb.st_mode) ? "/" : "",
+                    nameptrs[i], linkprefix, link, fileclass);
+    }
+
+  fputs("</PRE>", fp);
+  fputs(html_endbody, fp);
+  fputs(html_endhtml, fp);
+  (void)fclose(fp);
+  exit(0);
+}
+
+static int ls(httpd_conn *hc)
+{
+  DIR *dirp;
+  struct dirent *de;
+  int namlen;
+  static int maxnames = 0;
+  int nnames;
+  static char *names;
+  static char **nameptrs;
+  static char *name;
+  static size_t maxname = 0;
+  static char *rname;
+  static size_t maxrname = 0;
+  static char *encrname;
+  static size_t maxencrname = 0;
+  FILE *fp;
+  int i, child;
+  struct stat sb;
+  struct stat lsb;
+  char modestr[20];
+  char *linkprefix;
+  char link[MAXPATHLEN + 1];
+  char *fileclass;
+  time_t now;
+  char *timestr;
+  char arg[16];
+  char *argv[1];
+#if CONFIG_THTTPD_CGI_TIMELIMIT > 0
+  ClientData client_data;
+#endif
+
+  dirp = opendir(hc->expnfilename);
+  if (dirp == NULL)
+    {
+      ndbg("opendir %s: %d\n", hc->expnfilename, errno);
+      httpd_send_err(hc, 404, err404title, "", err404form, hc->encodedurl);
+      return -1;
+    }
+
+  if (hc->method == METHOD_HEAD)
+    {
+      closedir(dirp);
+      send_mime(hc, 200, ok200title, "", "", "text/html; charset=%s",
+                (off_t) - 1, hc->sb.st_mtime);
+    }
+  else if (hc->method == METHOD_GET)
+    {
+#ifdef CONFIG_THTTPD_CGILIMIT
+      if (hc->hs->cgi_count >= CONFIG_THTTPD_CGILIMIT)
+        {
+          closedir(dirp);
+          httpd_send_err(hc, 503, httpd_err503title, "", httpd_err503form,
+                         hc->encodedurl);
+          return -1;
+        }
+#endif
+      ++hc->hs->cgi_count;
+
+      /* Start the child task. */
+
+      snprintf(arg, 16, "%p", hc); /* task_create doesn't handle binary arguments. */
+      argv[0] = arg;
+
+#ifndef CONFIG_CUSTOM_STACK
+      child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY,
+                          CONFIG_THTTPD_CGI_STACKSIZE,
+                          (main_t)ls_child, (const char **)argv);
+#else
+      child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY,
+                          (main_t)ls_child, (const char **)argv);
+#endif
+      if (child < 0)
+        {
+          ndbg("task_create: %d\n", errno);
+          closedir(dirp);
+          INTERNALERROR("task_create");
+          httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
+          return -1;
+        }
+
+      closedir(dirp);
+      ndbg("spawned indexing task %d for directory '%s'\n", child, hc->expnfilename);
+
+      /* Schedule a kill for the child task, in case it runs too long */
+
+#if CONFIG_THTTPD_CGI_TIMELIMIT > 0
+      client_data.i = child;
+      if (tmr_create(NULL, cgi_kill, client_data, CONFIG_THTTPD_CGI_TIMELIMIT * 1000L, 0) == NULL)
+        {
+          ndbg("tmr_create(cgi_kill ls) failed\n");
+          exit(1);
+        }
+#endif
+
+      hc->bytes_sent = CONFIG_THTTPD_CGI_BYTECOUNT;
+      hc->should_linger = false;
+    }
+  else
+    {
+      closedir(dirp);
+      NOTIMPLEMENTED(httpd_method_str(hc->method));
+      httpd_send_err(hc, 501, err501title, "", err501form, httpd_method_str(hc->method));
+      return -1;
+    }
+
+  return 0;
+}
+#endif /* CONFIG_THTTPD_GENERATE_INDICES */
+
+/* Returns 1 if ok to serve the url, 0 if not. */
+
+static int check_referer(httpd_conn *hc)
+{
+  /* Are we doing referer checking at all? */
+
+#ifdef CONFIG_THTTPD_URLPATTERN
+  int r;
+  char *cp;
+
+  child = really_check_referer(hc);
+
+  if (!r)
+    {
+#ifdef CONFIG_THTTPD_VHOST
+      if (hc->vhostname != NULL)
+        {
+          cp = hc->vhostname;
+        }
+      else
+#endif
+        {
+          cp = hc->hs->hostname;
+        }
+
+      if (cp == NULL)
+        {
+          cp = "";
+        }
+
+      ndbg("%s non-local referer \"%s%s\" \"%s\"\n",
+             httpd_ntoa(&hc->client_addr), cp, hc->encodedurl, hc->referer);
+      httpd_send_err(hc, 403, err403title, "",
+                     ERROR_FORM(err403form,
+                                "You must supply a local referer to get URL '%s' from this server.\n"),
+                     hc->encodedurl);
+    }
+  return r;
+#else
+  return 1;
+#endif
+}
+
+/* Returns 1 if ok to serve the url, 0 if not. */
+
+#ifdef CONFIG_THTTPD_URLPATTERN
+static int really_check_referer(httpd_conn *hc)
+{
+  httpd_server *hs;
+  char *cp1;
+  char *cp2;
+  char *cp3;
+  static char *refhost = NULL;
+  static size_t refhost_size = 0;
+  char *lp;
+
+  hs = hc->hs;
+
+  /* Check for an empty referer. */
+
+  if (hc->referer == NULL || hc->referer[0] == '\0' ||
+      (cp1 = strstr(hc->referer, "//")) == NULL)
+    {
+      /* Disallow if the url matches. */
+
+      if (match(CONFIG_THTTPD_URLPATTERN, hc->origfilename))
+        {
+          return 0;
+        }
+
+      /* Otherwise ok. */
+
+      return 1;
+    }
+
+  /* Extract referer host. */
+
+  cp1 += 2;
+  for (cp2 = cp1; *cp2 != '/' && *cp2 != ':' && *cp2 != '\0'; ++cp2)
+    {
+      continue;
+    }
+
+  httpd_realloc_str(&refhost, &refhost_size, cp2 - cp1);
+  for (cp3 = refhost; cp1 < cp2; ++cp1, ++cp3)
+    if (isupper(*cp1))
+      {
+        *cp3 = tolower(*cp1);
+      }
+    else
+      {
+        *cp3 = *cp1;
+      }
+  *cp3 = '\0';
+
+  /* Local pattern? */
+
+#ifdef CONFIG_THTTPD_LOCALPATTERN
+  lp = CONFIG_THTTPD_LOCALPATTERN;
+#else
+
+  /* No local pattern.  What's our hostname? */
+
+#ifndef CONFIG_THTTPD_VHOST
+  /* Not vhosting, use the server name. */
+
+  lp = hs->hostname;
+  if (!lp)
+    {
+      /* Couldn't figure out local hostname - give up. */
+
+     return 1;
+    }
+
+#else
+  /* We are vhosting, use the hostname on this connection. */
+
+  lp = hc->vhostname;
+  if (!lp)
+    {
+      /* Oops, no hostname.  Maybe it's an old browser that doesn't
+       * send a Host: header.  We could figure out the default
+       * hostname for this IP address, but it's not worth it for the
+       * few requests like this.
+       */
+
+      return 1;
+    }
+#endif
+#endif /* CONFIG_THTTPD_LOCALPATTERN */
+
+  /* If the referer host doesn't match the local host pattern, and the
+   * filename does match the url pattern, it's an illegal reference.
+   */
+
+#ifdef CONFIG_THTTPD_URLPATTERN
+  if (!match(lp, refhost) && match(CONFIG_THTTPD_URLPATTERN, hc->origfilename))
+    {
+      return 0;
+    }
+#endif
+
+  /* Otherwise ok. */
+
+  return 1;
+}
+#endif
+
+#ifdef CONFIG_DEBUG
+static int sockaddr_check(httpd_sockaddr *saP)
+{
+  switch (saP->sin_family)
+    {
+    case AF_INET:
+      return 1;
+
+#ifdef  CONFIG_NET_IPv6
+    case AF_INET6:
+      return 1;
+#endif
+
+    default:
+      return 0;
+    }
+}
+#endif
+
+static size_t sockaddr_len(httpd_sockaddr *saP)
+{
+  switch (saP->sin_family)
+    {
+    case AF_INET:
+      return sizeof(struct sockaddr_in);
+
+#ifdef  CONFIG_NET_IPv6
+    case AF_INET6:
+      return sizeof(struct sockaddr_in6);
+#endif
+
+    default:
+      break;
+    }
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+FAR httpd_server *httpd_initialize(FAR httpd_sockaddr *sa)
+{
+  FAR httpd_server *hs;
+
+  /* Save the PID of the main thread */
+
+  main_thread = getpid();
+
+  /* Allocate the server structure */
+
+  hs = (FAR httpd_server *)zalloc(sizeof(httpd_server));
+  if (!hs)
+    {
+      ndbg("out of memory allocating an httpd_server\n");
+      return NULL;
+    }
+
+#ifdef CONFIG_THTTPD_HOSTNAME
+  hs->hostname = httpd_strdup(CONFIG_THTTPD_HOSTNAME);
+#else
+  hs->hostname = httpd_strdup(httpd_ntoa(sa));
+#endif
+  nvdbg("hostname: %s\n", hs->hostname);
+
+  if (!hs->hostname)
+    {
+      ndbg("out of memory copying hostname\n");
+      return NULL;
+    }
+
+  hs->cgi_count = 0;
+
+  /* Initialize listen sockets */
+
+  hs->listen_fd = initialize_listen_socket(sa);
+  if (hs->listen_fd == -1)
+    {
+      ndbg("Failed to create listen socket\n");
+      free_httpd_server(hs);
+      return NULL;
+    }
+
+  init_mime();
+
+  /* Done initializing. */
+
+  ndbg("%s starting on port %d\n", CONFIG_THTTPD_SERVER_SOFTWARE, (int)CONFIG_THTTPD_PORT);
+  return hs;
+}
+
+void httpd_terminate(httpd_server * hs)
+{
+  httpd_unlisten(hs);
+  free_httpd_server(hs);
+}
+
+void httpd_unlisten(httpd_server * hs)
+{
+  if (hs->listen_fd != -1)
+    {
+      (void)close(hs->listen_fd);
+      hs->listen_fd = -1;
+    }
+}
+
+/* Send the buffered response. */
+
+void httpd_write_response(httpd_conn *hc)
+{
+  /* If we are in a sub-task, turn off no-delay mode. */
+
+  if (main_thread != getpid())
+    {
+       httpd_clear_ndelay(hc->conn_fd);
+    }
+
+  /* Send the response, if necessary. */
+
+  if (hc->buflen > 0)
+    {
+      (void)httpd_write(hc->conn_fd, hc->buffer, hc->buflen);
+      hc->buflen = 0;
+    }
+}
+
+/* Set no-delay / non-blocking mode on a socket. */
+
+void httpd_set_ndelay(int fd)
+{
+  int flags, newflags;
+
+  flags = fcntl(fd, F_GETFL, 0);
+  if (flags != -1)
+    {
+      newflags = flags | (int)O_NDELAY;
+      if (newflags != flags)
+        (void)fcntl(fd, F_SETFL, newflags);
+    }
+}
+
+/* Clear no-delay / non-blocking mode on a socket. */
+
+void httpd_clear_ndelay(int fd)
+{
+  int flags, newflags;
+
+  flags = fcntl(fd, F_GETFL, 0);
+  if (flags != -1)
+    {
+      newflags = flags & ~(int)O_NDELAY;
+      if (newflags != flags)
+        {
+          (void)fcntl(fd, F_SETFL, newflags);
+        }
+    }
+}
+
+void httpd_send_err(httpd_conn *hc, int status, const char *title, const char *extraheads,
+                    const char *form, const char *arg)
+{
+#ifdef CONFIG_THTTPD_ERROR_DIRECTORY
+  char filename[1000];
+
+  /* Try virtual host error page. */
+
+  ndbg("title: \"%s\" form: \"%s\"\n", title, form);
+
+#ifdef CONFIG_THTTPD_VHOST
+  if (hc->hostdir[0] != '\0')
+    {
+      (void)snprintf(filename, sizeof(filename),
+                     "%s/%s/err%d.html", hc->hostdir, CONFIG_THTTPD_ERROR_DIRECTORY, status);
+      if (send_err_file(hc, status, title, extraheads, filename))
+        {
+          nvdbg("Sent VHOST error file\n");
+          return;
+        }
+    }
+#endif
+
+  /* Try server-wide error page. */
+
+  (void)snprintf(filename, sizeof(filename), "%s/err%d.html", CONFIG_THTTPD_ERROR_DIRECTORY, status);
+  if (send_err_file(hc, status, title, extraheads, filename))
+    {
+      nvdbg("Sent server-wide error page\n");
+      return;
+    }
+
+  /* Fall back on built-in error page. */
+
+  send_response(hc, status, title, extraheads, form, arg);
+
+#else
+
+  send_response(hc, status, title, extraheads, form, arg);
+
+#endif
+}
+
+const char *httpd_method_str(int method)
+{
+  switch (method)
+    {
+    case METHOD_GET:
+      return "GET";
+
+    case METHOD_HEAD:
+      return "HEAD";
+
+    case METHOD_POST:
+      return "POST";
+
+    default:
+      return "UNKNOWN";
+    }
+}
+
+int httpd_get_conn(httpd_server *hs, int listen_fd, httpd_conn *hc)
+{
+  httpd_sockaddr sa;
+  socklen_t sz;
+
+  if (!hc->initialized)
+    {
+      hc->read_size = 0;
+      httpd_realloc_str(&hc->read_buf, &hc->read_size, CONFIG_THTTPD_IOBUFFERSIZE);
+      hc->maxdecodedurl =
+        hc->maxorigfilename = hc->maxexpnfilename = hc->maxencodings =
+        hc->maxpathinfo = hc->maxquery = hc->maxaccept =
+        hc->maxaccepte = hc->maxreqhost = hc->maxhostdir =
+        hc->maxremoteuser = 0;
+#ifdef CONFIG_THTTPD_TILDE_MAP2
+      hc->maxaltdir = 0;
+#endif
+      httpd_realloc_str(&hc->decodedurl, &hc->maxdecodedurl, 1);
+      httpd_realloc_str(&hc->origfilename, &hc->maxorigfilename, 1);
+      httpd_realloc_str(&hc->expnfilename, &hc->maxexpnfilename, 0);
+      httpd_realloc_str(&hc->encodings, &hc->maxencodings, 0);
+      httpd_realloc_str(&hc->pathinfo, &hc->maxpathinfo, 0);
+      httpd_realloc_str(&hc->query, &hc->maxquery, 0);
+      httpd_realloc_str(&hc->accept, &hc->maxaccept, 0);
+      httpd_realloc_str(&hc->accepte, &hc->maxaccepte, 0);
+      httpd_realloc_str(&hc->reqhost, &hc->maxreqhost, 0);
+      httpd_realloc_str(&hc->hostdir, &hc->maxhostdir, 0);
+      httpd_realloc_str(&hc->remoteuser, &hc->maxremoteuser, 0);
+#ifdef CONFIG_THTTPD_TILDE_MAP2
+      httpd_realloc_str(&hc->altdir, &hc->maxaltdir, 0);
+#endif
+      hc->initialized = 1;
+    }
+
+  /* Accept the new connection. */
+
+  nvdbg("accept() new connection on listen_fd %d\n", listen_fd);
+  sz = sizeof(sa);
+  hc->conn_fd = accept(listen_fd, (struct sockaddr*)&sa, &sz);
+  if (hc->conn_fd < 0)
+    {
+      if (errno == EWOULDBLOCK)
+        {
+          return GC_NO_MORE;
+        }
+
+      ndbg("accept failed: %d\n", errno);
+      return GC_FAIL;
+    }
+
+#ifdef CONFIG_DEBUG
+  if (!sockaddr_check(&sa))
+    {
+      ndbg("unknown sockaddr family\n");
+      close(hc->conn_fd);
+      hc->conn_fd = -1;
+      return GC_FAIL;
+    }
+#endif
+
+  hc->hs = hs;
+  (void)memset(&hc->client_addr, 0, sizeof(hc->client_addr));
+  (void)memmove(&hc->client_addr, &sa, sockaddr_len(&sa));
+  hc->read_idx          = 0;
+  hc->checked_idx       = 0;
+  hc->checked_state     = CHST_FIRSTWORD;
+  hc->method            = METHOD_UNKNOWN;
+  hc->bytes_to_send     = 0;
+  hc->bytes_sent        = 0;
+  hc->encodedurl        = "";
+  hc->decodedurl[0]     = '\0';
+  hc->protocol          = "UNKNOWN";
+  hc->origfilename[0]   = '\0';
+  hc->expnfilename[0]   = '\0';
+  hc->encodings[0]      = '\0';
+  hc->pathinfo[0]       = '\0';
+  hc->query[0]          = '\0';
+  hc->referer           = "";
+  hc->useragent         = "";
+  hc->accept[0]         = '\0';
+  hc->accepte[0]        = '\0';
+  hc->acceptl           = "";
+  hc->cookie            = "";
+  hc->contenttype       = "";
+  hc->reqhost[0]        = '\0';
+  hc->hdrhost           = "";
+  hc->hostdir[0]        = '\0';
+  hc->authorization     = "";
+  hc->remoteuser[0]     = '\0';
+  hc->buffer[0]         = '\0';
+#ifdef CONFIG_THTTPD_TILDE_MAP2
+  hc->altdir[0]         = '\0';
+#endif
+  hc->buflen = 0;
+  hc->if_modified_since = (time_t) - 1;
+  hc->range_if          = (time_t)-1;
+  hc->contentlength     = -1;
+  hc->type = "";
+#ifdef CONFIG_THTTPD_VHOST
+  hc->vhostname         = NULL;
+#endif
+  hc->mime_flag         = true;
+  hc->one_one           = false;
+  hc->got_range         = false;
+  hc->tildemapped       = false;
+  hc->range_start       = 0;
+  hc->range_end         = -1;
+  hc->keep_alive        = false;
+  hc->should_linger     = false;
+  hc->file_fd           = -1;
+
+  nvdbg("New connection accepted on %d\n", hc->conn_fd);
+  return GC_OK;
+}
+
+/* Checks hc->read_buf to see whether a complete request has been read so far;
+ * either the first line has two words (an HTTP/0.9 request), or the first
+ * line has three words and there's a blank line present.
+ *
+ * hc->read_idx is how much has been read in; hc->checked_idx is how much we
+ * have checked so far; and hc->checked_state is the current state of the
+ * finite state machine.
+ */
+
+int httpd_got_request(httpd_conn *hc)
+{
+  char c;
+
+  for (; hc->checked_idx < hc->read_idx; ++hc->checked_idx)
+    {
+      c = hc->read_buf[hc->checked_idx];
+      switch (hc->checked_state)
+        {
+        case CHST_FIRSTWORD:
+          switch (c)
+            {
+            case ' ':
+            case '\t':
+              hc->checked_state = CHST_FIRSTWS;
+              break;
+
+            case '\012':
+            case '\015':
+              hc->checked_state = CHST_BOGUS;
+              return GR_BAD_REQUEST;
+            }
+          break;
+
+        case CHST_FIRSTWS:
+          switch (c)
+            {
+            case ' ':
+            case '\t':
+              break;
+
+            case '\012':
+            case '\015':
+              hc->checked_state = CHST_BOGUS;
+              return GR_BAD_REQUEST;
+
+            default:
+              hc->checked_state = CHST_SECONDWORD;
+              break;
+            }
+          break;
+
+        case CHST_SECONDWORD:
+          switch (c)
+            {
+            case ' ':
+            case '\t':
+              hc->checked_state = CHST_SECONDWS;
+              break;
+
+            case '\012':
+            case '\015':
+              /* The first line has only two words - an HTTP/0.9 request. */
+              return GR_GOT_REQUEST;
+            }
+          break;
+
+        case CHST_SECONDWS:
+          switch (c)
+            {
+            case ' ':
+            case '\t':
+              break;
+
+            case '\012':
+            case '\015':
+              hc->checked_state = CHST_BOGUS;
+              return GR_BAD_REQUEST;
+
+            default:
+              hc->checked_state = CHST_THIRDWORD;
+              break;
+            }
+          break;
+
+        case CHST_THIRDWORD:
+          switch (c)
+            {
+            case ' ':
+            case '\t':
+              hc->checked_state = CHST_THIRDWS;
+              break;
+
+            case '\012':
+              hc->checked_state = CHST_LF;
+              break;
+
+            case '\015':
+              hc->checked_state = CHST_CR;
+              break;
+            }
+          break;
+
+        case CHST_THIRDWS:
+          switch (c)
+            {
+            case ' ':
+            case '\t':
+              break;
+
+            case '\012':
+              hc->checked_state = CHST_LF;
+              break;
+
+            case '\015':
+              hc->checked_state = CHST_CR;
+              break;
+
+            default:
+              hc->checked_state = CHST_BOGUS;
+              return GR_BAD_REQUEST;
+            }
+          break;
+
+        case CHST_LINE:
+          switch (c)
+            {
+            case '\012':
+              hc->checked_state = CHST_LF;
+              break;
+
+            case '\015':
+              hc->checked_state = CHST_CR;
+              break;
+            }
+          break;
+ 
+       case CHST_LF:
+          switch (c)
+            {
+            case '\012':
+              /* Two newlines in a row - a blank line - end of request. */
+
+              return GR_GOT_REQUEST;
+
+            case '\015':
+              hc->checked_state = CHST_CR;
+              break;
+
+            default:
+              hc->checked_state = CHST_LINE;
+              break;
+            }
+          break;
+
+        case CHST_CR:
+          switch (c)
+            {
+            case '\012':
+              hc->checked_state = CHST_CRLF;
+              break;
+
+            case '\015':
+              /* Two returns in a row - end of request. */
+
+              return GR_GOT_REQUEST;
+
+            default:
+              hc->checked_state = CHST_LINE;
+              break;
+            }
+          break;
+
+        case CHST_CRLF:
+          switch (c)
+            {
+            case '\012':
+              /* Two newlines in a row - end of request. */
+
+              return GR_GOT_REQUEST;
+
+            case '\015':
+              hc->checked_state = CHST_CRLFCR;
+              break;
+
+            default:
+              hc->checked_state = CHST_LINE;
+              break;
+            }
+          break;
+
+        case CHST_CRLFCR:
+          switch (c)
+            {
+            case '\012':
+            case '\015':
+              /* Two CRLFs or two CRs in a row - end of request. */
+
+              return GR_GOT_REQUEST;
+
+            default:
+              hc->checked_state = CHST_LINE;
+              break;
+            }
+          break;
+
+        case CHST_BOGUS:
+          return GR_BAD_REQUEST;
+        }
+    }
+  return GR_NO_REQUEST;
+}
+
+int httpd_parse_request(httpd_conn *hc)
+{
+  char *buf;
+  char *method_str;
+  char *url;
+  char *protocol;
+  char *reqhost;
+  char *eol;
+  char *cp;
+  char *pi;
+
+  hc->checked_idx = 0;          /* reset */
+  method_str      = bufgets(hc);
+  nvdbg("method_str: \"%s\"\n", method_str);
+
+  url = strpbrk(method_str, " \t\012\015");
+  if (!url)
+    {
+      BADREQUEST("url-1");
+      httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
+      return -1;
+    }
+
+  *url++ = '\0';
+  url   += strspn(url, " \t\012\015");
+  nvdbg("url: \"%s\"\n", url);
+
+  protocol = strpbrk(url, " \t\012\015");
+  nvdbg("protocol: \"%s\"\n", protocol ? protocol : "<null>");
+
+  if (!protocol)
+    {
+      protocol      = "HTTP/0.9";
+      hc->mime_flag = false;
+    }
+  else
+    {
+      *protocol++ = '\0';
+      protocol += strspn(protocol, " \t\012\015");
+      if (*protocol != '\0')
+        {
+          eol = strpbrk(protocol, " \t\012\015");
+          if (eol)
+            {
+              *eol = '\0';
+            }
+
+          if (strcasecmp(protocol, "HTTP/1.0") != 0)
+            {
+              hc->one_one = true;
+            }
+        }
+    }
+  hc->protocol = protocol;
+
+  /* Check for HTTP/1.1 absolute URL. */
+
+  if (strncasecmp(url, "http://", 7) == 0)
+    {
+      if (!hc->one_one)
+        {
+          BADREQUEST("one_one");
+          httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
+          return -1;
+        }
+
+      reqhost = url + 7;
+      url     = strchr(reqhost, '/');
+      if (!url)
+        {
+          BADREQUEST("reqhost-1");
+          httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
+          return -1;
+        }
+      *url = '\0';
+
+      if (strchr(reqhost, '/') != NULL || reqhost[0] == '.')
+        {
+          BADREQUEST("reqhost-2");
+          httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
+          return -1;
+        }
+
+      httpd_realloc_str(&hc->reqhost, &hc->maxreqhost, strlen(reqhost));
+      (void)strcpy(hc->reqhost, reqhost);
+      *url = '/';
+    }
+
+  if (*url != '/')
+    {
+      BADREQUEST("url-2");
+      httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
+      return -1;
+    }
+
+  if (strcasecmp(method_str, httpd_method_str(METHOD_GET)) == 0)
+    {
+      hc->method = METHOD_GET;
+    }
+  else if (strcasecmp(method_str, httpd_method_str(METHOD_HEAD)) == 0)
+    {
+      hc->method = METHOD_HEAD;
+    }
+  else if (strcasecmp(method_str, httpd_method_str(METHOD_POST)) == 0)
+    {
+      hc->method = METHOD_POST;
+    }
+  else
+    {
+      NOTIMPLEMENTED(method_str);
+      httpd_send_err(hc, 501, err501title, "", err501form, method_str);
+      return -1;
+    }
+
+  hc->encodedurl = url;
+  httpd_realloc_str(&hc->decodedurl, &hc->maxdecodedurl, strlen(hc->encodedurl));
+  httpd_strdecode(hc->decodedurl, hc->encodedurl);
+
+  httpd_realloc_str(&hc->origfilename, &hc->maxorigfilename, strlen(hc->decodedurl));
+  (void)strcpy(hc->origfilename, &hc->decodedurl[1]);
+
+  /* Special case for top-level URL. */
+
+  if (hc->origfilename[0] == '\0')
+    {
+      (void)strcpy(hc->origfilename, ".");
+    }
+
+  /* Extract query string from encoded URL. */
+
+  cp = strchr(hc->encodedurl, '?');
+  if (cp)
+    {
+      ++cp;
+      httpd_realloc_str(&hc->query, &hc->maxquery, strlen(cp));
+      (void)strcpy(hc->query, cp);
+
+      /* Remove query from (decoded) origfilename. */
+
+      cp = strchr(hc->origfilename, '?');
+      if (cp)
+        {
+          *cp = '\0';
+        }
+    }
+
+  de_dotdot(hc->origfilename);
+  if (hc->origfilename[0] == '/' ||
+      (hc->origfilename[0] == '.' && hc->origfilename[1] == '.' &&
+       (hc->origfilename[2] == '\0' || hc->origfilename[2] == '/')))
+    {
+      BADREQUEST("origfilename");
+      httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
+      return -1;
+    }
+
+  if (hc->mime_flag)
+    {
+      /* Read the MIME headers. */
+      while ((buf = bufgets(hc)) != NULL)
+        {
+          if (buf[0] == '\0')
+            {
+              break;
+            }
+
+          if (strncasecmp(buf, "Referer:", 8) == 0)
+            {
+              cp = &buf[8];
+              cp += strspn(cp, " \t");
+              hc->referer = cp;
+            }
+          else if (strncasecmp(buf, "User-Agent:", 11) == 0)
+            {
+              cp = &buf[11];
+              cp += strspn(cp, " \t");
+              hc->useragent = cp;
+            }
+          else if (strncasecmp(buf, "Host:", 5) == 0)
+            {
+              cp = &buf[5];
+              cp += strspn(cp, " \t");
+              hc->hdrhost = cp;
+              cp = strchr(hc->hdrhost, ':');
+              if (cp)
+                {
+                  *cp = '\0';
+                }
+
+              if (strchr(hc->hdrhost, '/') != NULL || hc->hdrhost[0] == '.')
+                {
+                  BADREQUEST("hdrhost");
+                  httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
+                  return -1;
+                }
+            }
+          else if (strncasecmp(buf, "Accept:", 7) == 0)
+            {
+              cp = &buf[7];
+              cp += strspn(cp, " \t");
+              if (hc->accept[0] != '\0')
+                {
+                  if (strlen(hc->accept) > CONFIG_THTTPD_MAXREALLOC)
+                    {
+                      ndbg("%s way too much Accept: data\n",
+                             httpd_ntoa(&hc->client_addr));
+                      continue;
+                    }
+                  httpd_realloc_str(&hc->accept, &hc->maxaccept, strlen(hc->accept) + 2 + strlen(cp));
+                  (void)strcat(hc->accept, ", ");
+                }
+              else
+                {
+                  httpd_realloc_str(&hc->accept, &hc->maxaccept, strlen(cp));
+                }
+              (void)strcat(hc->accept, cp);
+            }
+          else if (strncasecmp(buf, "Accept-Encoding:", 16) == 0)
+            {
+              cp = &buf[16];
+              cp += strspn(cp, " \t");
+              if (hc->accepte[0] != '\0')
+                {
+                  if (strlen(hc->accepte) > CONFIG_THTTPD_MAXREALLOC)
+                    {
+                      ndbg("%s way too much Accept-Encoding: data\n",
+                             httpd_ntoa(&hc->client_addr));
+                      continue;
+                    }
+                  httpd_realloc_str(&hc->accepte, &hc->maxaccepte, strlen(hc->accepte) + 2 + strlen(cp));
+                  (void)strcat(hc->accepte, ", ");
+                }
+              else
+                {
+                  httpd_realloc_str(&hc->accepte, &hc->maxaccepte, strlen(cp));
+                }
+             (void)strcpy(hc->accepte, cp);
+            }
+          else if (strncasecmp(buf, "Accept-Language:", 16) == 0)
+            {
+              cp = &buf[16];
+              cp += strspn(cp, " \t");
+              hc->acceptl = cp;
+            }
+          else if (strncasecmp(buf, "If-Modified-Since:", 18) == 0)
+            {
+              cp = &buf[18];
+              hc->if_modified_since = tdate_parse(cp);
+              if (hc->if_modified_since == (time_t) - 1)
+                ndbg("unparsable time: %s\n", cp);
+            }
+          else if (strncasecmp(buf, "Cookie:", 7) == 0)
+            {
+              cp = &buf[7];
+              cp += strspn(cp, " \t");
+              hc->cookie = cp;
+            }
+          else if (strncasecmp(buf, "Range:", 6) == 0)
+            {
+              /* Only support %d- and %d-%d, not %d-%d,%d-%d or -%d. */
+              if (strchr(buf, ',') == NULL)
+                {
+                  char *cp_dash;
+                  cp = strpbrk(buf, "=");
+                  if (cp)
+                    {
+                      cp_dash = strchr(cp + 1, '-');
+                      if (cp_dash != NULL && cp_dash != cp + 1)
+                        {
+                          *cp_dash = '\0';
+                          hc->got_range = true;
+                          hc->range_start = atoll(cp + 1);
+                          if (hc->range_start < 0)
+                            {
+                              hc->range_start = 0;
+                            }
+
+                          if (isdigit((int)cp_dash[1]))
+                            {
+                              hc->range_end = atoll(cp_dash + 1);
+                              if (hc->range_end < 0)
+                                hc->range_end = -1;
+                            }
+                        }
+                    }
+                }
+            }
+          else if (strncasecmp(buf, "Range-If:", 9) == 0 ||
+                   strncasecmp(buf, "If-Range:", 9) == 0)
+            {
+              cp = &buf[9];
+              hc->range_if = tdate_parse(cp);
+              if (hc->range_if == (time_t) - 1)
+                {
+                  ndbg("unparsable time: %s\n", cp);
+                }
+            }
+          else if (strncasecmp(buf, "Content-Type:", 13) == 0)
+            {
+              cp = &buf[13];
+              cp += strspn(cp, " \t");
+              hc->contenttype = cp;
+            }
+          else if (strncasecmp(buf, "Content-Length:", 15) == 0)
+            {
+              cp = &buf[15];
+              hc->contentlength = atol(cp);
+            }
+          else if (strncasecmp(buf, "Authorization:", 14) == 0)
+            {
+              cp = &buf[14];
+              cp += strspn(cp, " \t");
+              hc->authorization = cp;
+            }
+          else if (strncasecmp(buf, "Connection:", 11) == 0)
+            {
+              cp = &buf[11];
+              cp += strspn(cp, " \t");
+              if (strcasecmp(cp, "keep-alive") == 0)
+               {
+                 hc->keep_alive = true;
+               }
+           }
+#ifdef LOG_UNKNOWN_HEADERS
+          else if (strncasecmp(buf, "Accept-Charset:", 15) == 0 ||
+                   strncasecmp(buf, "Accept-Language:", 16) == 0 ||
+                   strncasecmp(buf, "Agent:", 6) == 0 ||
+                   strncasecmp(buf, "Cache-Control:", 14) == 0 ||
+                   strncasecmp(buf, "Cache-Info:", 11) == 0 ||
+                   strncasecmp(buf, "Charge-To:", 10) == 0 ||
+                   strncasecmp(buf, "Client-IP:", 10) == 0 ||
+                   strncasecmp(buf, "Date:", 5) == 0 ||
+                   strncasecmp(buf, "Extension:", 10) == 0 ||
+                   strncasecmp(buf, "Forwarded:", 10) == 0 ||
+                   strncasecmp(buf, "From:", 5) == 0 ||
+                   strncasecmp(buf, "HTTP-Version:", 13) == 0 ||
+                   strncasecmp(buf, "Max-Forwards:", 13) == 0 ||
+                   strncasecmp(buf, "Message-Id:", 11) == 0 ||
+                   strncasecmp(buf, "MIME-Version:", 13) == 0 ||
+                   strncasecmp(buf, "Negotiate:", 10) == 0 ||
+                   strncasecmp(buf, "Pragma:", 7) == 0 ||
+                   strncasecmp(buf, "Proxy-Agent:", 12) == 0 ||
+                   strncasecmp(buf, "Proxy-Connection:", 17) == 0 ||
+                   strncasecmp(buf, "Security-Scheme:", 16) == 0 ||
+                   strncasecmp(buf, "Session-Id:", 11) == 0 ||
+                   strncasecmp(buf, "UA-Color:", 9) == 0 ||
+                   strncasecmp(buf, "UA-CPU:", 7) == 0 ||
+                   strncasecmp(buf, "UA-Disp:", 8) == 0 ||
+                   strncasecmp(buf, "UA-OS:", 6) == 0 ||
+                   strncasecmp(buf, "UA-Pixels:", 10) == 0 ||
+                   strncasecmp(buf, "User:", 5) == 0 ||
+                   strncasecmp(buf, "Via:", 4) == 0 ||
+                   strncasecmp(buf, "X-", 2) == 0)
+            ;                   /* ignore */
+          else
+            {
+              ndbg("unknown request header: %s\n", buf);
+            }
+#endif
+        }
+    }
+
+  if (hc->one_one)
+    {
+      /* Check that HTTP/1.1 requests specify a host, as required. */
+
+      if (hc->reqhost[0] == '\0' && hc->hdrhost[0] == '\0')
+        {
+          BADREQUEST("reqhost-3");
+          httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
+          return -1;
+        }
+
+      /* If the client wants to do keep-alives, it might also be doing
+       * pipelining.  There's no way for us to tell.  Since we don't
+       * implement keep-alives yet, if we close such a connection there
+       * might be unread pipelined requests waiting.  So, we have to do a
+       * lingering close.
+       */
+
+      if (hc->keep_alive)
+        {
+          hc->should_linger = true;
+        }
+    }
+
+  /* Ok, the request has been parsed.  Now we resolve stuff that may require 
+   * the entire request.
+   */
+
+  /* Copy original filename to expanded filename. */
+
+  httpd_realloc_str(&hc->expnfilename, &hc->maxexpnfilename,
+                    strlen(hc->origfilename));
+  (void)strcpy(hc->expnfilename, hc->origfilename);
+
+  /* Tilde mapping. */
+
+  if (hc->expnfilename[0] == '~')
+    {
+#ifdef CONFIG_THTTPD_TILDE_MAP1
+      if (!httpd_tilde_map1(hc))
+        {
+          httpd_send_err(hc, 404, err404title, "", err404form, hc->encodedurl);
+          return -1;
+        }
+#endif
+#ifdef CONFIG_THTTPD_TILDE_MAP2
+      if (!httpd_tilde_map2(hc))
+        {
+          httpd_send_err(hc, 404, err404title, "", err404form, hc->encodedurl);
+          return -1;
+        }
+#endif
+    }
+
+  /* Virtual host mapping. */
+
+#ifdef CONFIG_THTTPD_VHOST
+    if (!vhost_map(hc))
+      {
+        INTERNALERROR("VHOST");
+        httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
+        return -1;
+      }
+#endif
+
+  /* Expand the filename */
+
+  cp = expand_filename(hc->expnfilename, &pi, hc->tildemapped);
+  if (!cp)
+    {
+      INTERNALERROR(hc->expnfilename);
+      httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
+      return -1;
+    }
+
+  httpd_realloc_str(&hc->expnfilename, &hc->maxexpnfilename, strlen(cp));
+  (void)strcpy(hc->expnfilename, cp);
+  httpd_realloc_str(&hc->pathinfo, &hc->maxpathinfo, strlen(pi));
+  (void)strcpy(hc->pathinfo, pi);
+  nvdbg("expnfilename: \"%s\" pathinfo: \"%s\"\n", hc->expnfilename, hc->pathinfo);
+
+  /* Remove pathinfo stuff from the original filename too. */
+
+  if (hc->pathinfo[0] != '\0')
+    {
+      int i;
+      i = strlen(hc->origfilename) - strlen(hc->pathinfo);
+      if (i > 0 && strcmp(&hc->origfilename[i], hc->pathinfo) == 0)
+        {
+          hc->origfilename[i - 1] = '\0';
+        }
+    }
+
+  /* If the expanded filename is an absolute path, check that it's still
+   * within the current directory or the alternate directory.
+   */
+
+  if (hc->expnfilename[0] == '/')
+    {
+      if (strncmp(hc->expnfilename, httpd_root, strlen(httpd_root)) == 0)
+        {
+        }
+#ifdef CONFIG_THTTPD_TILDE_MAP2
+      else if (hc->altdir[0] != '\0' &&
+               (strncmp(hc->expnfilename, hc->altdir, strlen(hc->altdir)) == 0 &&
+                (hc->expnfilename[strlen(hc->altdir)] == '\0' ||
+                 hc->expnfilename[strlen(hc->altdir)] == '/')))
+        {
+        }
+#endif
+      else
+        {
+          ndbg("%s URL \"%s\" goes outside the web tree\n",
+                 httpd_ntoa(&hc->client_addr), hc->encodedurl);
+          httpd_send_err(hc, 403, err403title, "",
+                         ERROR_FORM(err403form,
+                                    "The requested URL '%s' resolves to a file outside the permitted web server directory tree.\n"),
+                         hc->encodedurl);
+          return -1;
+        }
+    }
+
+  return 0;
+}
+
+void httpd_close_conn(httpd_conn *hc)
+{
+  if (hc->file_fd >= 0)
+    {
+      (void)close(hc->file_fd);
+      hc->file_fd = -1;
+    }
+
+  if (hc->conn_fd >= 0)
+    {
+      (void)close(hc->conn_fd);
+      hc->conn_fd = -1;
+    }
+}
+
+void httpd_destroy_conn(httpd_conn *hc)
+{
+  if (hc->initialized)
+    {
+      httpd_free((void *)hc->read_buf);
+      httpd_free((void *)hc->decodedurl);
+      httpd_free((void *)hc->origfilename);
+      httpd_free((void *)hc->expnfilename);
+      httpd_free((void *)hc->encodings);
+      httpd_free((void *)hc->pathinfo);
+      httpd_free((void *)hc->query);
+      httpd_free((void *)hc->accept);
+      httpd_free((void *)hc->accepte);
+      httpd_free((void *)hc->reqhost);
+      httpd_free((void *)hc->hostdir);
+      httpd_free((void *)hc->remoteuser);
+      httpd_free((void *)hc->buffer);
+#ifdef CONFIG_THTTPD_TILDE_MAP2
+      httpd_free((void *)hc->altdir);
+#endif                                 /*CONFIG_THTTPD_TILDE_MAP2 */
+      hc->initialized = 0;
+    }
+}
+
+int httpd_start_request(httpd_conn *hc, struct timeval *nowP)
+{
+  static char *indexname;
+  static size_t maxindexname = 0;
+#ifdef CONFIG_THTTPD_AUTH_FILE
+  static char *dirname;
+  static size_t maxdirname = 0;
+#endif                                 /* CONFIG_THTTPD_AUTH_FILE */
+  size_t expnlen, indxlen;
+  char *cp;
+  char *pi;
+  int i;
+
+  nvdbg("File: \"%s\"\n", hc->expnfilename);
+  expnlen = strlen(hc->expnfilename);
+
+  if (hc->method != METHOD_GET && hc->method != METHOD_HEAD &&
+      hc->method != METHOD_POST)
+    {
+      NOTIMPLEMENTED("start");
+      httpd_send_err(hc, 501, err501title, "", err501form,
+                     httpd_method_str(hc->method));
+      return -1;
+    }
+
+  /* Stat the file. */
+
+  if (stat(hc->expnfilename, &hc->sb) < 0)
+    {
+      INTERNALERROR(hc->expnfilename);
+      httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
+      return -1;
+    }
+
+  /* Is it world-readable or world-executable? We check explicitly instead
+   * of just trying to open it, so that no one ever gets surprised by a file 
+   * that's not set world-readable and yet somehow is readable by the HTTP
+   * server and therefore the *whole* world.
+   */
+
+  if (!(hc->sb.st_mode & (S_IROTH | S_IXOTH)))
+    {
+      ndbg("%s URL \"%s\" resolves to a non world-readable file\n",
+           httpd_ntoa(&hc->client_addr), hc->encodedurl);
+      httpd_send_err(hc, 403, err403title, "",
+                     ERROR_FORM(err403form,
+                                "The requested URL '%s' resolves to a file that is not world-readable.\n"),
+                     hc->encodedurl);
+      return -1;
+    }
+
+  /* Is it a directory? */
+
+  if (S_ISDIR(hc->sb.st_mode))
+    {
+      /* If there's pathinfo, it's just a non-existent file. */
+
+      if (hc->pathinfo[0] != '\0')
+        {
+          httpd_send_err(hc, 404, err404title, "", err404form, hc->encodedurl);
+          return -1;
+        }
+
+      /* Special handling for directory URLs that don't end in a slash. We
+       * send back an explicit redirect with the slash, because otherwise
+       * many clients can't build relative URLs properly.
+       */
+
+      if (strcmp(hc->origfilename, "") != 0 &&
+          strcmp(hc->origfilename, ".") != 0 &&
+          hc->origfilename[strlen(hc->origfilename) - 1] != '/')
+        {
+          send_dirredirect(hc);
+          return -1;
+        }
+
+      /* Check for an index file. */
+
+      for (i = 0; i < sizeof(index_names) / sizeof(char *); ++i)
+        {
+          httpd_realloc_str(&indexname, &maxindexname,
+                            expnlen + 1 + strlen(index_names[i]));
+          (void)strcpy(indexname, hc->expnfilename);
+          indxlen = strlen(indexname);
+          if (indxlen == 0 || indexname[indxlen - 1] != '/')
+            {
+              (void)strcat(indexname, "/");
+            }
+
+          if (strcmp(indexname, "./") == 0)
+            {
+              indexname[0] = '\0';
+            }
+
+          (void)strcat(indexname, index_names[i]);
+          if (stat(indexname, &hc->sb) >= 0)
+            {
+              goto got_one;
+            }
+        }
+
+      /* Nope, no index file, so it's an actual directory request. */
+#ifdef CONFIG_THTTPD_GENERATE_INDICES
+      /* Directories must be readable for indexing. */
+      if (!(hc->sb.st_mode & S_IROTH))
+        {
+          ndbg("%s URL \"%s\" tried to index a directory with indexing disabled\n",
+                 httpd_ntoa(&hc->client_addr), hc->encodedurl);
+          httpd_send_err(hc, 403, err403title, "",
+                         ERROR_FORM(err403form,
+                                    "The requested URL '%s' resolves to a directory that has indexing disabled.\n"),
+                         hc->encodedurl);
+          return -1;
+        }
+#  ifdef CONFIG_THTTPD_AUTH_FILE
+      /* Check authorization for this directory. */
+
+      if (auth_check(hc, hc->expnfilename) == -1)
+        {
+          return -1;
+        }
+#  endif /* CONFIG_THTTPD_AUTH_FILE */
+
+      /* Referer check. */
+
+      if (!check_referer(hc))
+        {
+          return -1;
+        }
+
+      /* Ok, generate an index. */
+      return ls(hc);
+#else
+      ndbg("%s URL \"%s\" tried to index a directory\n",
+             httpd_ntoa(&hc->client_addr), hc->encodedurl);
+      httpd_send_err(hc, 403, err403title, "",
+                     ERROR_FORM(err403form,
+                                "The requested URL '%s' is a directory, and directory indexing is disabled on this server.\n"),
+                     hc->encodedurl);
+      return -1;
+#endif
+
+    got_one:
+
+      /* Got an index file.  Expand again.  More pathinfo means
+       * something went wrong.
+       */
+
+      cp = expand_filename(indexname, &pi, hc->tildemapped);
+      if (cp == NULL || pi[0] != '\0')
+        {
+          INTERNALERROR(indexname);
+          httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
+          return -1;
+        }
+
+      expnlen = strlen(cp);
+      httpd_realloc_str(&hc->expnfilename, &hc->maxexpnfilename, expnlen);
+      (void)strcpy(hc->expnfilename, cp);
+
+      /* Now, is the index version world-readable or world-executable? */
+
+      if (!(hc->sb.st_mode & (S_IROTH | S_IXOTH)))
+        {
+          ndbg("%s URL \"%s\" resolves to a non-world-readable index file\n",
+                 httpd_ntoa(&hc->client_addr), hc->encodedurl);
+          httpd_send_err(hc, 403, err403title, "",
+                         ERROR_FORM(err403form,
+                                    "The requested URL '%s' resolves to an index file that is not world-readable.\n"),
+                         hc->encodedurl);
+          return -1;
+        }
+    }
+
+  /* Check authorization for this directory. */
+
+#ifdef CONFIG_THTTPD_AUTH_FILE
+  httpd_realloc_str(&dirname, &maxdirname, expnlen);
+  (void)strcpy(dirname, hc->expnfilename);
+  cp = strrchr(dirname, '/');
+  if (!cp)
+    {
+      (void)strcpy(dirname, httpd_root);
+    }
+  else
+    {
+      *cp = '\0';
+    }
+
+  if (auth_check(hc, dirname) == -1)
+    {
+      return -1;
+    }
+
+  /* Check if the filename is the CONFIG_THTTPD_AUTH_FILE itself - that's verboten. */
+
+  if (expnlen == sizeof(CONFIG_THTTPD_AUTH_FILE) - 1)
+    {
+      if (strcmp(hc->expnfilename, CONFIG_THTTPD_AUTH_FILE) == 0)
+        {
+          ndbg("%s URL \"%s\" tried to retrieve an auth file\n",
+                 httpd_ntoa(&hc->client_addr), hc->encodedurl);
+          httpd_send_err(hc, 403, err403title, "",
+                         ERROR_FORM(err403form,
+                                    "The requested URL '%s' is an authorization file, retrieving it is not permitted.\n"),
+                         hc->encodedurl);
+          return -1;
+        }
+    }
+  else if (expnlen >= sizeof(CONFIG_THTTPD_AUTH_FILE) &&
+           strcmp(&(hc->expnfilename[expnlen - sizeof(CONFIG_THTTPD_AUTH_FILE) + 1]),
+                  CONFIG_THTTPD_AUTH_FILE) == 0 &&
+           hc->expnfilename[expnlen - sizeof(CONFIG_THTTPD_AUTH_FILE)] == '/')
+    {
+      ndbg("%s URL \"%s\" tried to retrieve an auth file\n",
+             httpd_ntoa(&hc->client_addr), hc->encodedurl);
+      httpd_send_err(hc, 403, err403title, "",
+                     ERROR_FORM(err403form,
+                                "The requested URL '%s' is an authorization file, retrieving it is not permitted.\n"),
+                     hc->encodedurl);
+      return -1;
+    }
+#endif
+
+  /* Referer check. */
+
+  if (!check_referer(hc))
+    return -1;
+
+  /* Is it in the CGI area? */
+
+#ifdef CONFIG_THTTPD_CGI_PATTERN
+  if (match(CONFIG_THTTPD_CGI_PATTERN, hc->expnfilename))
+    {
+      return cgi(hc);
+    }
+#endif
+
+  /* It's not CGI.  If it's executable or there's pathinfo, someone's trying 
+   * to either serve or run a non-CGI file as CGI.  Either case is
+   * prohibited.
+   */
+
+  if (hc->sb.st_mode & S_IXOTH)
+    {
+      ndbg("%s URL \"%s\" is executable but isn't CGI\n",
+             httpd_ntoa(&hc->client_addr), hc->encodedurl);
+      httpd_send_err(hc, 403, err403title, "",
+                     ERROR_FORM(err403form,
+                                "The requested URL '%s' resolves to a file which is marked executable but is not a CGI file; retrieving it is forbidden.\n"),
+                     hc->encodedurl);
+      return -1;
+    }
+
+  if (hc->pathinfo[0] != '\0')
+    {
+      ndbg("%s URL \"%s\" has pathinfo but isn't CGI\n",
+             httpd_ntoa(&hc->client_addr), hc->encodedurl);
+      httpd_send_err(hc, 403, err403title, "",
+                     ERROR_FORM(err403form,
+                                "The requested URL '%s' resolves to a file plus CGI-style pathinfo, but the file is not a valid CGI file.\n"),
+                     hc->encodedurl);
+      return -1;
+    }
+
+  /* Fill in range_end, if necessary. */
+
+  if (hc->got_range &&
+      (hc->range_end == -1 || hc->range_end >= hc->sb.st_size))
+    {
+      hc->range_end = hc->sb.st_size - 1;
+    }
+
+  figure_mime(hc);
+
+  if (hc->method == METHOD_HEAD)
+    {
+      send_mime(hc, 200, ok200title, hc->encodings, "", hc->type,
+                hc->sb.st_size, hc->sb.st_mtime);
+    }
+  else if (hc->if_modified_since != (time_t) - 1 &&
+           hc->if_modified_since >= hc->sb.st_mtime)
+    {
+      send_mime(hc, 304, err304title, hc->encodings, "", hc->type, (off_t) - 1,
+                hc->sb.st_mtime);
+    }
+  else
+    {
+      hc->file_fd = open(hc->expnfilename, O_RDONLY);
+      if (!hc->file_fd < 0)
+        {
+          INTERNALERROR(hc->expnfilename);
+          httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
+          return -1;
+        }
+      send_mime(hc, 200, ok200title, hc->encodings, "", hc->type,
+                hc->sb.st_size, hc->sb.st_mtime);
+    }
+
+  return 0;
+}
+
+char *httpd_ntoa(httpd_sockaddr *saP)
+{
+#ifdef  CONFIG_NET_IPv6
+  static char str[200];
+
+  if (getnameinfo
+      (&saP->sa, sockaddr_len(saP), str, sizeof(str), 0, 0,
+       NI_NUMERICHOST) != 0)
+    {
+      str[0] = '?';
+      str[1] = '\0';
+    }
+  else if (IN6_IS_ADDR_V4MAPPED(&saP->sa_in6.sin6_addr) &&
+           strncmp(str, "::ffff:", 7) == 0)
+    {
+      /* Elide IPv6ish prefix for IPv4 addresses. */
+
+      (void)strcpy(str, &str[7]);
+    }
+
+  return str;
+
+#else /* CONFIG_NET_IPv6 */
+
+  return inet_ntoa(saP->sin_addr);
+
+#endif
+}
+
+/* Read to requested buffer, accounting for interruptions and EOF */
+
+int httpd_read(int fd, const void *buf, size_t nbytes)
+{
+  ssize_t nread;
+  int ntotal;
+
+  ntotal = 0;
+  do
+    {
+      nread = read(fd, (char*)buf + ntotal, nbytes - ntotal);
+      if (nread < 0)
+        {
+          if (errno == EAGAIN)
+            {
+              usleep(100000); /* 100MS */
+            }
+          else if (errno != EINTR)
+            {
+              ndbg("Error sending: %d\n", errno);
+              return nread;
+            }
+        }
+      else
+        {
+          ntotal += nread;
+        }
+    }
+  while (ntotal < nbytes && nread != 0);
+  return ntotal;
+}
+
+/* Write the requested buffer completely, accounting for interruptions */
+
+int httpd_write(int fd, const void *buf, size_t nbytes)
+{
+  ssize_t nwritten;
+  int ntotal;
+
+  ntotal = 0;
+  do
+    {
+      nwritten = write(fd, (char*)buf + ntotal, nbytes - ntotal);
+      if (nwritten < 0)
+        {
+          if (errno == EAGAIN)
+            {
+              usleep(100000); /* 100MS */
+            }
+          else if (errno != EINTR)
+            {
+              ndbg("Error sending: %d\n", errno);
+              return nwritten;
+            }
+        }
+      else
+        {
+          ntotal += nwritten;
+        }
+    }
+  while (ntotal < nbytes);
+  return ntotal;
+}
+
+#endif /* CONFIG_THTTPD */
+
diff --git a/apps/netutils/thttpd/libhttpd.h b/apps/netutils/thttpd/libhttpd.h
new file mode 100644
index 000000000..f2e39e04d
--- /dev/null
+++ b/apps/netutils/thttpd/libhttpd.h
@@ -0,0 +1,342 @@
+/****************************************************************************
+ * netutils/thttpd/libhttpd.h
+ * HTTP Protocol Library Definitions
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in the original THTTPD package:
+ *
+ *   Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __NETUTILS_THTTPD_LIBHTTPD_H
+#define __NETUTILS_THTTPD_LIBHTTPD_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <time.h>
+
+#include "config.h"
+#ifdef CONFIG_THTTPD
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* A few convenient defines. */
+
+#ifndef MAX
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+/* Enable special instrumentation to track down "400 Bad Request" problems */
+
+#undef CONFIG_THTTPD_BADREQUEST /* Define to enable "Bad Request" instrumentation */
+
+#ifdef CONFIG_THTTPD_BADREQUEST
+#  if !defined(CONFIG_DEBUG_VERBOSE) || !defined(CONFIG_DEBUG_NET)
+#    undef CONFIG_THTTPD_BADREQUEST
+#  else
+#    define BADREQUEST(s) nvdbg("Bad Request: \"%s\"\n", s)
+#  endif
+#endif
+
+#ifndef CONFIG_THTTPD_BADREQUEST
+#  undef  BADREQUEST
+#  define BADREQUEST(s)
+#endif
+
+/* Enable special instrumentation to track down "501 Not Implemented" problems */
+
+#undef CONFIG_THTTPD_NOTIMPLEMENTED /* Define to enable "Not Implemented" instrumentation */
+
+#ifdef CONFIG_THTTPD_NOTIMPLEMENTED
+#  if !defined(CONFIG_DEBUG_VERBOSE) || !defined(CONFIG_DEBUG_NET)
+#    undef CONFIG_THTTPD_NOTIMPLEMENTED
+#  else
+#    define NOTIMPLEMENTED(s) nvdbg("Not Implemented: \"%s\"\n", s)
+#  endif
+#endif
+
+#ifndef CONFIG_THTTPD_NOTIMPLEMENTED
+#  undef  NOTIMPLEMENTED
+#  define NOTIMPLEMENTED(s)
+#endif
+
+/* Enable special instrumentation to track down "500 Internal Error" problems */
+
+#undef CONFIG_THTTPD_INTERNALERROR /* Define to enable "Internal Error" instrumentation */
+
+#ifdef CONFIG_THTTPD_INTERNALERROR
+#  if !defined(CONFIG_DEBUG_VERBOSE) || !defined(CONFIG_DEBUG_NET)
+#    undef CONFIG_THTTPD_INTERNALERROR
+#  else
+#    define INTERNALERROR(s) nvdbg("Internal Error: \"%s\"\n", s)
+#  endif
+#endif
+
+#ifndef CONFIG_THTTPD_INTERNALERROR
+#  undef  INTERNALERROR
+#  define INTERNALERROR(s)
+#endif
+
+/* Methods */
+
+#define METHOD_UNKNOWN 0
+#define METHOD_GET 1
+#define METHOD_HEAD 2
+#define METHOD_POST 3
+
+/* States for checked_state. */
+
+#define CHST_FIRSTWORD  0
+#define CHST_FIRSTWS    1
+#define CHST_SECONDWORD 2
+#define CHST_SECONDWS   3
+#define CHST_THIRDWORD  4
+#define CHST_THIRDWS    5
+#define CHST_LINE       6
+#define CHST_LF         7
+#define CHST_CR         8
+#define CHST_CRLF       9
+#define CHST_CRLFCR     10
+#define CHST_BOGUS      11
+
+#define GC_FAIL 0
+#define GC_OK 1
+#define GC_NO_MORE 2
+
+#define GR_NO_REQUEST 0
+#define GR_GOT_REQUEST 1
+#define GR_BAD_REQUEST 2
+
+/****************************************************************************
+ * Public Type Definitions
+ ****************************************************************************/
+
+/* A multi-family sockaddr. */
+
+#ifdef  CONFIG_NET_IPv6
+typedef struct sockaddr_in6 httpd_sockaddr;
+#else
+typedef struct sockaddr_in httpd_sockaddr;
+#endif
+
+/* A server. */
+
+typedef struct
+{
+  char *hostname;
+  int   cgi_count;
+  int   listen_fd;
+} httpd_server;
+
+/* A connection. */
+
+typedef struct
+{
+  int initialized;
+  httpd_server *hs;
+  httpd_sockaddr client_addr;
+  char *read_buf;
+  size_t read_size, read_idx, checked_idx;
+  int checked_state;
+  int method;
+  off_t bytes_to_send;
+  off_t bytes_sent;
+  char *encodedurl;
+  char *decodedurl;
+  char *protocol;
+  char *origfilename;
+  char *expnfilename;
+  char *encodings;
+  char *pathinfo;
+  char *query;
+  char *referer;
+  char *useragent;
+  char *accept;
+  char *accepte;
+  char *acceptl;
+  char *cookie;
+  char *contenttype;
+  char *reqhost;
+  char *hdrhost;
+  char *hostdir;
+  char *authorization;
+  char *remoteuser;
+  size_t maxdecodedurl, maxorigfilename, maxexpnfilename, maxencodings,
+    maxpathinfo, maxquery, maxaccept, maxaccepte, maxreqhost, maxhostdir,
+    maxremoteuser, maxresponse;
+#ifdef CONFIG_THTTPD_TILDE_MAP2
+  char *altdir;
+  size_t maxaltdir;
+#endif
+  time_t if_modified_since, range_if;
+  size_t contentlength;
+  char *type;                  /* not malloc()ed */
+#ifdef CONFIG_THTTPD_VHOST
+  char *vhostname;             /* not malloc()ed */
+#endif
+  bool mime_flag;
+  bool one_one;                /* HTTP/1.1 or better */
+  bool got_range;
+  bool tildemapped;            /* this connection got tilde-mapped */
+  bool keep_alive;
+  bool should_linger;
+  int conn_fd;                 /* Connection to the client */
+  int file_fd;                 /* Descriptor for open, outgoing file */
+  off_t range_start;           /* File range start from Range= */
+  off_t range_end;             /* File range end from Range= */
+  struct stat sb;
+
+  /* This is the I/O buffer that is used to buffer portions of outgoing files */
+
+  uint16_t buflen;             /* Index to first valid data in buffer */
+  uint8_t buffer[CONFIG_THTTPD_IOBUFFERSIZE];
+} httpd_conn;
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Initializes.  Does the socket(), bind(), and listen().   Returns an
+ * httpd_server* which includes a socket fd that you can select() on.
+ * Return (httpd_server*) 0 on error.
+ */
+
+extern FAR httpd_server *httpd_initialize(FAR httpd_sockaddr *sa);
+
+/* Call to unlisten/close socket(s) listening for new connections. */
+
+extern void httpd_unlisten(httpd_server *hs);
+
+/* Call to shut down. */
+
+extern void httpd_terminate(httpd_server *hs);
+
+/* When a listen fd is ready to read, call this.  It does the accept() and
+ * returns an httpd_conn* which includes the fd to read the request from and
+ * write the response to.  Returns an indication of whether the accept()
+ * failed, succeeded, or if there were no more connections to accept.
+ *
+ * In order to minimize malloc()s, the caller passes in the httpd_conn.
+ * The caller is also responsible for setting initialized to zero before the
+ * first call using each different httpd_conn.
+ */
+
+extern int httpd_get_conn(httpd_server *hs, int listen_fd, httpd_conn *hc);
+
+/* Checks whether the data in hc->read_buf constitutes a complete request
+ * yet.  The caller reads data into hc->read_buf[hc->read_idx] and advances
+ * hc->read_idx.  This routine checks what has been read so far, using
+ * hc->checked_idx and hc->checked_state to keep track, and returns an
+ * indication of whether there is no complete request yet, there is a
+ * complete request, or there won't be a valid request due to a syntax error.
+ */
+
+extern int httpd_got_request(httpd_conn *hc);
+
+/* Parses the request in hc->read_buf.  Fills in lots of fields in hc,
+ * like the URL and the various headers.
+ *
+ * Returns -1 on error.
+ */
+
+extern int httpd_parse_request(httpd_conn *hc);
+
+/* Starts sending data back to the client.  In some cases (directories,
+ * CGI programs), finishes sending by itself - in those cases, hc->file_fd
+ * is negative.  If there is more data to be sent, then hc->file_fd is a file
+ * stream for the file to send.  If you don't have a current timeval
+ * handy just pass in 0.
+ *
+ * Returns -1 on error.
+ */
+
+extern int httpd_start_request(httpd_conn *hc, struct timeval *nowP);
+
+/* Actually sends any buffered response text. */
+
+extern void httpd_write_response(httpd_conn *hc);
+
+/* Call this to close down a connection and free the data. */
+
+extern void httpd_close_conn(httpd_conn *hc);
+
+/* Call this to de-initialize a connection struct and *really* free the
+ * mallocced strings.
+ */
+
+extern void httpd_destroy_conn(httpd_conn *hc);
+
+/* Send an error message back to the client. */
+
+extern void httpd_send_err(httpd_conn *hc, int status, const char *title,
+                           const char *extraheads, const char *form, const char *arg);
+
+/* Generate a string representation of a method number. */
+
+extern const char *httpd_method_str(int method);
+
+/* Format a network socket to a string representation. */
+
+extern char *httpd_ntoa(httpd_sockaddr * saP);
+
+/* Set NDELAY mode on a socket. */
+
+extern void httpd_set_ndelay(int fd);
+
+/* Clear NDELAY mode on a socket. */
+
+extern void httpd_clear_ndelay(int fd);
+
+/* Read to requested buffer, accounting for interruptions and EOF */
+
+extern int httpd_read(int fd, const void *buf, size_t nbytes);
+
+/* Write the buffer completely, accounting for interruptions */
+
+extern int httpd_write(int fd, const void *buf, size_t nbytes);
+
+#endif /* CONFIG_THTTPD */
+#endif /* __NETUTILS_THTTPD_LIBHTTPD_H */
+
diff --git a/apps/netutils/thttpd/mime_types.h b/apps/netutils/thttpd/mime_types.h
new file mode 100644
index 000000000..cd0c514a8
--- /dev/null
+++ b/apps/netutils/thttpd/mime_types.h
@@ -0,0 +1,279 @@
+/****************************************************************************
+ * netutils/thttpd/mime_types.h
+ * Provides mappings between filename extensions and MIME types and encodings.
+ *
+ * Based on mime_encodings.txt and mime_types.txt by Jef Poskanser which
+ * contained no copyright information.
+ *
+ *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __NETUTILS_THTTPD_MIME_TYPES_H
+#define __NETUTILS_THTTPD_MIME_TYPES_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <sys/types.h>
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct mime_entry
+{
+  char   *ext;
+  size_t  ext_len;
+  char   *val;
+  size_t  val_len;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* A list of file extensions followed by the corresponding MIME encoding.
+ * Extensions not found in the table proceed to the mime_types table.
+ * Must be ordered by extension so to support binary searches.
+ */
+
+static struct mime_entry enc_tab[] =
+{
+  { "Z",       0, "compress",   0 },
+  { "gz",      0, "gzip",       0 },
+  { "uu",      0, "x-uuencode", 0 },
+};
+static const int n_enc_tab = sizeof(enc_tab) / sizeof(*enc_tab);
+
+/* A list of file extensions followed by the corresponding MIME type.
+ * Extensions not found in the table are returned as text/plain.
+ * Must be ordered by extension so to support binary searches.
+ */
+
+static struct mime_entry typ_tab[] =
+{
+  { "a",       0, "application/octet-stream", 0 },
+  { "aab",     0, "application/x-authorware-bin", 0 },
+  { "aam",     0, "application/x-authorware-map", 0 },
+  { "aas",     0, "application/x-authorware-seg", 0 },
+  { "ai",      0, "application/postscript", 0 },
+  { "aif",     0, "audio/x-aiff", 0 },
+  { "aifc",    0, "audio/x-aiff", 0 },
+  { "aiff",    0, "audio/x-aiff", 0 },
+  { "asc",     0, "text/plain", 0 },
+  { "asf",     0, "video/x-ms-asf", 0 },
+  { "asx",     0, "video/x-ms-asf", 0 },
+  { "au",      0, "audio/basic", 0 },
+  { "avi",     0, "video/x-msvideo", 0 },
+  { "bcpio",   0, "application/x-bcpio", 0 },
+  { "bin",     0, "application/octet-stream", 0 },
+  { "bmp",     0, "image/bmp", 0 },
+  { "cdf",     0, "application/x-netcdf", 0 },
+  { "class",   0, "application/x-java-vm", 0 },
+  { "cpio",    0, "application/x-cpio", 0 },
+  { "cpt",     0, "application/mac-compactpro", 0 },
+  { "crl",     0, "application/x-pkcs7-crl", 0 },
+  { "crt",     0, "application/x-x509-ca-cert", 0 },
+  { "csh",     0, "application/x-csh", 0 },
+  { "css",     0, "text/css", 0 },
+  { "dcr",     0, "application/x-director", 0 },
+  { "dir",     0, "application/x-director", 0 },
+  { "djv",     0, "image/vnd.djvu", 0 },
+  { "djvu",    0, "image/vnd.djvu", 0 },
+  { "dll",     0, "application/octet-stream", 0 },
+  { "dms",     0, "application/octet-stream", 0 },
+  { "doc",     0, "application/msword", 0 },
+  { "dtd",     0, "text/xml", 0 },
+  { "dump",    0, "application/octet-stream", 0 },
+  { "dvi",     0, "application/x-dvi", 0 },
+  { "dxr",     0, "application/x-director", 0 },
+  { "eps",     0, "application/postscript", 0 },
+  { "etx",     0, "text/x-setext", 0 },
+  { "exe",     0, "application/octet-stream", 0 },
+  { "ez",      0, "application/andrew-inset", 0 },
+  { "fgd",     0, "application/x-director", 0 },
+  { "fh",      0, "image/x-freehand", 0 },
+  { "fh4",     0, "image/x-freehand", 0 },
+  { "fh5",     0, "image/x-freehand", 0 },
+  { "fh7",     0, "image/x-freehand", 0 },
+  { "fhc",     0, "image/x-freehand", 0 },
+  { "gif",     0, "image/gif", 0 },
+  { "gtar",    0, "application/x-gtar", 0 },
+  { "hdf",     0, "application/x-hdf", 0 },
+  { "hqx",     0, "application/mac-binhex40", 0 },
+  { "htm",     0, "text/html; charset=%s", 0 },
+  { "html",    0, "text/html; charset=%s", 0 },
+  { "ice",     0, "x-conference/x-cooltalk", 0 },
+  { "ief",     0, "image/ief", 0 },
+  { "iges",    0, "model/iges", 0 },
+  { "igs",     0, "model/iges", 0 },
+  { "iv",      0, "application/x-inventor", 0 },
+  { "jar",     0, "application/x-java-archive", 0 },
+  { "jfif",    0, "image/jpeg", 0 },
+  { "jpe",     0, "image/jpeg", 0 },
+  { "jpeg",    0, "image/jpeg", 0 },
+  { "jpg",     0, "image/jpeg", 0 },
+  { "js",      0, "application/x-javascript", 0 },
+  { "kar",     0, "audio/midi", 0 },
+  { "latex",   0, "application/x-latex", 0 },
+  { "lha",     0, "application/octet-stream", 0 },
+  { "lzh",     0, "application/octet-stream", 0 },
+  { "m3u",     0, "audio/x-mpegurl", 0 },
+  { "man",     0, "application/x-troff-man", 0 },
+  { "mathml",  0, "application/mathml+xml", 0 },
+  { "me",      0, "application/x-troff-me", 0 },
+  { "mesh",    0, "model/mesh", 0 },
+  { "mid",     0, "audio/midi", 0 },
+  { "midi",    0, "audio/midi", 0 },
+  { "mif",     0, "application/vnd.mif", 0 },
+  { "mime",    0, "message/rfc822", 0 },
+  { "mml",     0, "application/mathml+xml", 0 },
+  { "mov",     0, "video/quicktime", 0 },
+  { "movie",   0, "video/x-sgi-movie", 0 },
+  { "mp2",     0, "audio/mpeg", 0 },
+  { "mp3",     0, "audio/mpeg", 0 },
+  { "mp4",     0, "video/mp4", 0 },
+  { "mpe",     0, "video/mpeg", 0 },
+  { "mpeg",    0, "video/mpeg", 0 },
+  { "mpg",     0, "video/mpeg", 0 },
+  { "mpga",    0, "audio/mpeg", 0 },
+  { "ms",      0, "application/x-troff-ms", 0 },
+  { "msh",     0, "model/mesh", 0 },
+  { "mv",      0, "video/x-sgi-movie", 0 },
+  { "mxu",     0, "video/vnd.mpegurl", 0 },
+  { "nc",      0, "application/x-netcdf", 0 },
+  { "o",       0, "application/octet-stream", 0 },
+  { "oda",     0, "application/oda", 0 },
+  { "ogg",     0, "application/x-ogg", 0 },
+  { "pac",     0, "application/x-ns-proxy-autoconfig", 0 },
+  { "pbm",     0, "image/x-portable-bitmap", 0 },
+  { "pdb",     0, "chemical/x-pdb", 0 },
+  { "pdf",     0, "application/pdf", 0 },
+  { "pgm",     0, "image/x-portable-graymap", 0 },
+  { "pgn",     0, "application/x-chess-pgn", 0 },
+  { "png",     0, "image/png", 0 },
+  { "pnm",     0, "image/x-portable-anymap", 0 },
+  { "ppm",     0, "image/x-portable-pixmap", 0 },
+  { "ppt",     0, "application/vnd.ms-powerpoint", 0 },
+  { "ps",      0, "application/postscript", 0 },
+  { "qt",      0, "video/quicktime", 0 },
+  { "ra",      0, "audio/x-realaudio", 0 },
+  { "ram",     0, "audio/x-pn-realaudio", 0 },
+  { "ras",     0, "image/x-cmu-raster", 0 },
+  { "rdf",     0, "application/rdf+xml", 0 },
+  { "rgb",     0, "image/x-rgb", 0 },
+  { "rm",      0, "audio/x-pn-realaudio", 0 },
+  { "roff",    0, "application/x-troff", 0 },
+  { "rpm",     0, "audio/x-pn-realaudio-plugin", 0 },
+  { "rss",     0, "application/rss+xml", 0 },
+  { "rtf",     0, "text/rtf", 0 },
+  { "rtx",     0, "text/richtext", 0 },
+  { "sgm",     0, "text/sgml", 0 },
+  { "sgml",    0, "text/sgml", 0 },
+  { "sh",      0, "application/x-sh", 0 },
+  { "shar",    0, "application/x-shar", 0 },
+  { "silo",    0, "model/mesh", 0 },
+  { "sit",     0, "application/x-stuffit", 0 },
+  { "skd",     0, "application/x-koan", 0 },
+  { "skm",     0, "application/x-koan", 0 },
+  { "skp",     0, "application/x-koan", 0 },
+  { "skt",     0, "application/x-koan", 0 },
+  { "smi",     0, "application/smil", 0 },
+  { "smil",    0, "application/smil", 0 },
+  { "snd",     0, "audio/basic", 0 },
+  { "so",      0, "application/octet-stream", 0 },
+  { "spl",     0, "application/x-futuresplash", 0 },
+  { "src",     0, "application/x-wais-source", 0 },
+  { "stc",     0, "application/vnd.sun.xml.calc.template", 0 },
+  { "std",     0, "application/vnd.sun.xml.draw.template", 0 },
+  { "sti",     0, "application/vnd.sun.xml.impress.template", 0 },
+  { "stw",     0, "application/vnd.sun.xml.writer.template", 0 },
+  { "sv4cpio", 0, "application/x-sv4cpio", 0 },
+  { "sv4crc",  0, "application/x-sv4crc", 0 },
+  { "svg",     0, "image/svg+xml", 0 },
+  { "svgz",    0, "image/svg+xml", 0 },
+  { "swf",     0, "application/x-shockwave-flash", 0 },
+  { "sxc",     0, "application/vnd.sun.xml.calc", 0 },
+  { "sxd",     0, "application/vnd.sun.xml.draw", 0 },
+  { "sxg",     0, "application/vnd.sun.xml.writer.global", 0 },
+  { "sxi",     0, "application/vnd.sun.xml.impress", 0 },
+  { "sxm",     0, "application/vnd.sun.xml.math", 0 },
+  { "sxw",     0, "application/vnd.sun.xml.writer", 0 },
+  { "t",       0, "application/x-troff", 0 },
+  { "tar",     0, "application/x-tar", 0 },
+  { "tcl",     0, "application/x-tcl", 0 },
+  { "tex",     0, "application/x-tex", 0 },
+  { "texi",    0, "application/x-texinfo", 0 },
+  { "texinfo", 0, "application/x-texinfo", 0 },
+  { "tif",     0, "image/tiff", 0 },
+  { "tiff",    0, "image/tiff", 0 },
+  { "tr",      0, "application/x-troff", 0 },
+  { "tsp",     0, "application/dsptype", 0 },
+  { "tsv",     0, "text/tab-separated-values", 0 },
+  { "txt",     0, "text/plain; charset=%s", 0 },
+  { "ustar",   0, "application/x-ustar", 0 },
+  { "vcd",     0, "application/x-cdlink", 0 },
+  { "vrml",    0, "model/vrml", 0 },
+  { "vx",      0, "video/x-rad-screenplay", 0 },
+  { "wav",     0, "audio/x-wav", 0 },
+  { "wax",     0, "audio/x-ms-wax", 0 },
+  { "wbmp",    0, "image/vnd.wap.wbmp", 0 },
+  { "wbxml",   0, "application/vnd.wap.wbxml", 0 },
+  { "wm",      0, "video/x-ms-wm", 0 },
+  { "wma",     0, "audio/x-ms-wma", 0 },
+  { "wmd",     0, "application/x-ms-wmd", 0 },
+  { "wml",     0, "text/vnd.wap.wml", 0 },
+  { "wmlc",    0, "application/vnd.wap.wmlc", 0 },
+  { "wmls",    0, "text/vnd.wap.wmlscript", 0 },
+  { "wmlsc",   0, "application/vnd.wap.wmlscriptc", 0 },
+  { "wmv",     0, "video/x-ms-wmv", 0 },
+  { "wmx",     0, "video/x-ms-wmx", 0 },
+  { "wmz",     0, "application/x-ms-wmz", 0 },
+  { "wrl",     0, "model/vrml", 0 },
+  { "wsrc",    0, "application/x-wais-source", 0 },
+  { "wvx",     0, "video/x-ms-wvx", 0 },
+  { "xbm",     0, "image/x-xbitmap", 0 },
+  { "xht",     0, "application/xhtml+xml", 0 },
+  { "xhtml",   0, "application/xhtml+xml", 0 },
+  { "xls",     0, "application/vnd.ms-excel", 0 },
+  { "xml",     0, "text/xml", 0 },
+  { "xpm",     0, "image/x-xpixmap", 0 },
+  { "xsl",     0, "text/xml", 0 },
+  { "xwd",     0, "image/x-xwindowdump", 0 },
+  { "xyz",     0, "chemical/x-xyz", 0 },
+  { "zip",     0, "application/zip", 0 },
+};
+static const int n_typ_tab = sizeof(typ_tab) / sizeof(*typ_tab);
+
+#endif /* __NETUTILS_THTTPD_MIME_TYPES_H */
+
diff --git a/apps/netutils/thttpd/tdate_parse.c b/apps/netutils/thttpd/tdate_parse.c
new file mode 100644
index 000000000..d9ace1b41
--- /dev/null
+++ b/apps/netutils/thttpd/tdate_parse.c
@@ -0,0 +1,341 @@
+/****************************************************************************
+ * netutils/thttpd/timers.c
+ * Parse string dates into internal form, stripped-down version
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in the original THTTPD package:
+ *
+ *   Copyright © 1995 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <time.h>
+#include <debug.h>
+
+#include "tdate_parse.h"
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+#undef TDATE_PARSE_WORKS /* tdate_parse() doesn't work */
+#undef HAVE_DAY_OF_WEEK  /* Day of week not yet supported by NuttX */
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct strlong
+{
+  char *s;
+  long l;
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+#ifdef HAVE_DAY_OF_WEEK /* Day of week not yet supported by NuttX */
+static void pound_case(char *str)
+{
+  for (; *str != '\0'; ++str)
+    {
+      if (isupper((int)*str))
+        {
+          *str = tolower((int)*str);
+        }
+    }
+}
+#endif
+
+#ifdef HAVE_DAY_OF_WEEK /* Day of week not yet supported by NuttX */
+static int strlong_compare(const void *v1, const void *v2)
+{
+  return strcmp(((struct strlong *)v1)->s, ((struct strlong *)v2)->s);
+}
+#endif
+
+#ifdef HAVE_DAY_OF_WEEK /* Day of week not yet supported by NuttX */
+static int strlong_search(char *str, struct strlong *tab, int n, long *lP)
+{
+  int i, h, l, r;
+
+  l = 0;
+  h = n - 1;
+  for (;;)
+    {
+      i = (h + l) / 2;
+      r = strcmp(str, tab[i].s);
+      if (r < 0)
+        {
+          h = i - 1;
+        }
+      else if (r > 0)
+        {
+          l = i + 1;
+        }
+      else
+        {
+          *lP = tab[i].l;
+          return 1;
+        }
+
+      if (h < l)
+        {
+          return 0;
+        }
+    }
+}
+#endif
+
+#ifdef HAVE_DAY_OF_WEEK /* Day of week not yet supported by NuttX */
+static int scan_wday(char *str_wday, long *tm_wdayP)
+{
+  static struct strlong wday_tab[] = {
+    {"sun", 0}, {"sunday", 0},
+    {"mon", 1}, {"monday", 1},
+    {"tue", 2}, {"tuesday", 2},
+    {"wed", 3}, {"wednesday", 3},
+    {"thu", 4}, {"thursday", 4},
+    {"fri", 5}, {"friday", 5},
+    {"sat", 6}, {"saturday", 6},
+  };
+  static int sorted = 0;
+
+  if (!sorted)
+    {
+      (void)qsort(wday_tab, sizeof(wday_tab) / sizeof(struct strlong),
+                  sizeof(struct strlong), strlong_compare);
+      sorted = 1;
+    }
+  pound_case(str_wday);
+  return strlong_search(str_wday, wday_tab,
+                        sizeof(wday_tab) / sizeof(struct strlong), tm_wdayP);
+}
+#endif /* Day of week not yet supported by NuttX */
+
+#ifdef TDATE_PARSE_WORKS
+static int scan_mon(char *str_mon, long *tm_monP)
+{
+  static struct strlong mon_tab[] = {
+    {"jan", 0}, {"january", 0},
+    {"feb", 1}, {"february", 1},
+    {"mar", 2}, {"march", 2},
+    {"apr", 3}, {"april", 3},
+    {"may", 4},
+    {"jun", 5}, {"june", 5},
+    {"jul", 6}, {"july", 6},
+    {"aug", 7}, {"august", 7},
+    {"sep", 8}, {"september", 8},
+    {"oct", 9}, {"october", 9},
+    {"nov", 10}, {"november", 10},
+    {"dec", 11}, {"december", 11},
+  };
+  static int sorted = 0;
+
+  if (!sorted)
+    {
+      (void)qsort(mon_tab, sizeof(mon_tab) / sizeof(struct strlong),
+                  sizeof(struct strlong), strlong_compare);
+      sorted = 1;
+    }
+  pound_case(str_mon);
+  return strlong_search(str_mon, mon_tab,
+                        sizeof(mon_tab) / sizeof(struct strlong), tm_monP);
+}
+#endif
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+time_t tdate_parse(char *str)
+{
+#ifdef TDATE_PARSE_WORKS /* REVISIT -- doesn't work */
+  struct tm tm;
+  char *cp;
+  char str_mon[32];
+  int tm_year;
+  int tm_mday;
+  int tm_hour;
+  int tm_min;
+  int tm_sec;
+  long tm_mon;
+#ifdef HAVE_DAY_OF_WEEK /* Day of week not yet supported by NuttX */
+  char str_wday[32];
+  long tm_wday;
+#endif
+
+  nvdbg("str: \"%s\"\n", str);
+
+  /* Initialize. */
+
+  (void)memset((char *)&tm, 0, sizeof(struct tm));
+
+  /* Skip initial whitespace ourselves - sscanf is clumsy at this. */
+
+  for (cp = str; *cp == ' ' || *cp == '\t'; ++cp)
+    {
+      continue;
+    }
+
+  /* And do the sscanfs.  WARNING: you can add more formats here, but be
+   * careful! You can easily screw up the parsing of existing formats when
+   * you add new ones.  The order is important. */
+
+  /* DD-mth-YY HH:MM:SS GMT */
+  if (sscanf(cp, "%d-%400[a-zA-Z]-%d %d:%d:%d GMT",
+             &tm_mday, str_mon, &tm_year, &tm_hour, &tm_min,
+             &tm_sec) == 6 && scan_mon(str_mon, &tm_mon))
+    {
+      tm.tm_mday = tm_mday;
+      tm.tm_mon  = tm_mon;
+      tm.tm_year = tm_year;
+      tm.tm_hour = tm_hour;
+      tm.tm_min  = tm_min;
+      tm.tm_sec  = tm_sec;
+    }
+
+  /* DD mth YY HH:MM:SS GMT */
+  else if (sscanf(cp, "%d %400[a-zA-Z] %d %d:%d:%d GMT",
+                  &tm_mday, str_mon, &tm_year, &tm_hour, &tm_min,
+                  &tm_sec) == 6 && scan_mon(str_mon, &tm_mon))
+    {
+      tm.tm_mday = tm_mday;
+      tm.tm_mon  = tm_mon;
+      tm.tm_year = tm_year;
+      tm.tm_hour = tm_hour;
+      tm.tm_min  = tm_min;
+      tm.tm_sec  = tm_sec;
+    }
+
+  /* HH:MM:SS GMT DD-mth-YY */
+  else if (sscanf(cp, "%d:%d:%d GMT %d-%400[a-zA-Z]-%d",
+                  &tm_hour, &tm_min, &tm_sec, &tm_mday, str_mon,
+                  &tm_year) == 6 && scan_mon(str_mon, &tm_mon))
+    {
+      tm.tm_hour = tm_hour;
+      tm.tm_min  = tm_min;
+      tm.tm_sec  = tm_sec;
+      tm.tm_mday = tm_mday;
+      tm.tm_mon  = tm_mon;
+      tm.tm_year = tm_year;
+    }
+
+  /* HH:MM:SS GMT DD mth YY */
+  else if (sscanf(cp, "%d:%d:%d GMT %d %400[a-zA-Z] %d",
+                  &tm_hour, &tm_min, &tm_sec, &tm_mday, str_mon,
+                  &tm_year) == 6 && scan_mon(str_mon, &tm_mon))
+    {
+      tm.tm_hour = tm_hour;
+      tm.tm_min  = tm_min;
+      tm.tm_sec  = tm_sec;
+      tm.tm_mday = tm_mday;
+      tm.tm_mon  = tm_mon;
+      tm.tm_year = tm_year;
+    }
+
+#ifdef HAVE_DAY_OF_WEEK /* Day of week not yet supported by NuttX */
+  /* wdy, DD-mth-YY HH:MM:SS GMT */
+  else if (sscanf(cp, "%400[a-zA-Z], %d-%400[a-zA-Z]-%d %d:%d:%d GMT",
+                  str_wday, &tm_mday, str_mon, &tm_year, &tm_hour, &tm_min,
+                  &tm_sec) == 7 &&
+           scan_wday(str_wday, &tm_wday) && scan_mon(str_mon, &tm_mon))
+    {
+      tm.tm_wday = tm_wday;
+      tm.tm_mday = tm_mday;
+      tm.tm_mon  = tm_mon;
+      tm.tm_year = tm_year;
+      tm.tm_hour = tm_hour;
+      tm.tm_min  = tm_min;
+      tm.tm_sec  = tm_sec;
+    }
+#endif /* Day of week not yet supported by NuttX */
+
+#ifdef HAVE_DAY_OF_WEEK /* Day of week not yet supported by NuttX */
+  /* wdy, DD mth YY HH:MM:SS GMT */
+  else if (sscanf(cp, "%400[a-zA-Z], %d %400[a-zA-Z] %d %d:%d:%d GMT",
+                  str_wday, &tm_mday, str_mon, &tm_year, &tm_hour, &tm_min,
+                  &tm_sec) == 7 &&
+           scan_wday(str_wday, &tm_wday) && scan_mon(str_mon, &tm_mon))
+    {
+      tm.tm_wday = tm_wday;
+      tm.tm_mday = tm_mday;
+      tm.tm_mon  = tm_mon;
+      tm.tm_year = tm_year;
+      tm.tm_hour = tm_hour;
+      tm.tm_min  = tm_min;
+      tm.tm_sec  = tm_sec;
+    }
+#endif /* Day of week not yet supported by NuttX */
+
+#ifdef HAVE_DAY_OF_WEEK /* Day of week not yet supported by NuttX */
+  /* wdy mth DD HH:MM:SS GMT YY */
+  else if (sscanf(cp, "%400[a-zA-Z] %400[a-zA-Z] %d %d:%d:%d GMT %d",
+                  str_wday, str_mon, &tm_mday, &tm_hour, &tm_min, &tm_sec,
+                  &tm_year) == 7 &&
+           scan_wday(str_wday, &tm_wday) && scan_mon(str_mon, &tm_mon))
+    {
+      tm.tm_wday = tm_wday;
+      tm.tm_mon  = tm_mon;
+      tm.tm_mday = tm_mday;
+      tm.tm_hour = tm_hour;
+      tm.tm_min  = tm_min;
+      tm.tm_sec  = tm_sec;
+      tm.tm_year = tm_year;
+    }
+#endif /* Day of week not yet supported by NuttX */
+  else
+    {
+      return (time_t) - 1;
+    }
+
+  if (tm.tm_year > 1900)
+    {
+      tm.tm_year -= 1900;
+    }
+  else if (tm.tm_year < 70)
+    {
+      tm.tm_year += 100;
+    }
+
+  return mktime(&tm);
+#else
+  return 0; // for now
+#endif
+}
+
diff --git a/apps/netutils/thttpd/tdate_parse.h b/apps/netutils/thttpd/tdate_parse.h
new file mode 100644
index 000000000..301d5467a
--- /dev/null
+++ b/apps/netutils/thttpd/tdate_parse.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+ * netutils/thttpd/fdwatch.h
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in THTTPD:
+ *
+ *   Copyright © 1995 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __NETUTILS_TDATE_PARSE_H
+#define __NETUTILS_TDATE_PARSE_H
+
+extern time_t tdate_parse(char *str);
+
+#endif  /* __NETUTILS_TDATE_PARSE_H */
diff --git a/apps/netutils/thttpd/thttpd.c b/apps/netutils/thttpd/thttpd.c
new file mode 100644
index 000000000..3b49c0141
--- /dev/null
+++ b/apps/netutils/thttpd/thttpd.c
@@ -0,0 +1,861 @@
+/****************************************************************************
+ * netutils/thttpd/thttpd.c
+ * Tiny HTTP Server
+ *
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in the original THTTPD package:
+ *
+ *   Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/compiler.h>
+#include <nuttx/symtab.h>
+#include <apps/netutils/thttpd.h>
+
+#include "config.h"
+#include "fdwatch.h"
+#include "libhttpd.h"
+#include "thttpd_alloc.h"
+#include "thttpd_strings.h"
+#include "timers.h"
+
+#ifdef CONFIG_THTTPD
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef MAXPATHLEN
+#  define MAXPATHLEN 64
+#endif
+
+/* The connection states */
+
+#define CNST_FREE      0
+#define CNST_READING   1
+#define CNST_SENDING   2
+#define CNST_LINGERING 3
+
+#define SPARE_FDS      2
+#define AVAILABLE_FDS  (CONFIG_NSOCKET_DESCRIPTORS - SPARE_FDS)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct connect_s
+{
+  struct connect_s *next;
+  int conn_state;
+  httpd_conn *hc;
+  time_t active_at;
+  Timer *wakeup_timer;
+  Timer *linger_timer;
+  off_t end_offset;            /* The final offset+1 of the file to send */
+  off_t offset;                /* The current offset into the file to send */
+  bool eof;                    /* Set true when length==0 read from file */
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static httpd_server *hs;
+static struct connect_s *free_connections;
+static struct connect_s *connects;
+static struct fdwatch_s *fw;
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void shut_down(void);
+static int  handle_newconnect(struct timeval *tv, int listen_fd);
+static void handle_read(struct connect_s *conn, struct timeval *tv);
+static void handle_send(struct connect_s *conn, struct timeval *tv);
+static void handle_linger(struct connect_s *conn, struct timeval *tv);
+static void finish_connection(struct connect_s *conn, struct timeval *tv);
+static void clear_connection(struct connect_s *conn, struct timeval *tv);
+static void really_clear_connection(struct connect_s *conn);
+static void idle(ClientData client_data, struct timeval *nowP);
+static void linger_clear_connection(ClientData client_data, struct timeval *nowP);
+static void occasional(ClientData client_data, struct timeval *nowP);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void shut_down(void)
+{
+  int cnum;
+
+  for (cnum = 0; cnum < AVAILABLE_FDS; ++cnum)
+    {
+      if (connects[cnum].conn_state != CNST_FREE)
+        {
+          httpd_close_conn(connects[cnum].hc);
+        }
+
+      if (connects[cnum].hc != NULL)
+        {
+          httpd_destroy_conn(connects[cnum].hc);
+          httpd_free((void *)connects[cnum].hc);
+          connects[cnum].hc = NULL;
+        }
+    }
+
+  if (hs)
+    {
+      httpd_server *ths = hs;
+      hs = NULL;
+      if (ths->listen_fd != -1)
+        {
+          fdwatch_del_fd(fw, ths->listen_fd);
+        }
+      httpd_terminate(ths);
+    }
+
+  tmr_destroy();
+  httpd_free((void *)connects);
+}
+
+static int handle_newconnect(struct timeval *tv, int listen_fd)
+{
+  struct connect_s *conn;
+  ClientData client_data;
+
+  /* This loops until the accept() fails, trying to start new connections as 
+   * fast as possible so we don't overrun the listen queue.
+   */
+
+  nvdbg("New connection(s) on listen_fd %d\n", listen_fd);
+  for (;;)
+    {
+      /* Get the next free connection from the free list */
+
+      conn = free_connections;
+      
+      /* Are there any free connections? */
+
+      if (!conn)
+        {
+          /* Out of connection slots.  Run the timers, then the  existing
+           * connections, and maybe we'll free up a slot  by the time we get
+           * back here.
+           */
+
+          ndbg("No free connections\n");
+          tmr_run(tv);
+          return -1;
+        }
+
+      /* Make the httpd_conn if necessary */
+
+      if (!conn->hc)
+        {
+          conn->hc = NEW(httpd_conn, 1);
+          if (conn->hc == NULL)
+            {
+              ndbg("out of memory allocating an httpd_conn\n");
+              exit(1);
+            }
+
+          conn->hc->initialized = 0;
+        }
+
+      /* Get the connection */
+
+      switch (httpd_get_conn(hs, listen_fd, conn->hc))
+        {
+          /* Some error happened.  Run the timers, then the  existing
+           * connections.  Maybe the error will clear.
+           */
+
+        case GC_FAIL:
+          tmr_run(tv);
+          return -1;
+
+          /* No more connections to accept for now */
+
+        case GC_NO_MORE:
+          return 0;
+
+        default:
+          break;
+        }
+
+      nvdbg("New connection fd %d\n", conn->hc->conn_fd);
+ 
+      /* Remove the connection entry from the free list */
+
+      conn->conn_state        = CNST_READING;
+      free_connections        = conn->next;
+      conn->next              = NULL;
+
+      client_data.p           = conn;
+      conn->active_at         = tv->tv_sec;
+      conn->wakeup_timer      = NULL;
+      conn->linger_timer      = NULL;
+      conn->offset            = 0;
+ 
+      /* Set the connection file descriptor to no-delay mode */
+
+      httpd_set_ndelay(conn->hc->conn_fd);
+      fdwatch_add_fd(fw, conn->hc->conn_fd, conn);
+    }
+}
+
+static void handle_read(struct connect_s *conn, struct timeval *tv)
+{
+  ClientData client_data;
+  httpd_conn *hc = conn->hc;
+  off_t actual;
+  int sz;
+
+  /* Is there room in our buffer to read more bytes? */
+
+  if (hc->read_idx >= hc->read_size)
+    {
+      if (hc->read_size > CONFIG_THTTPD_MAXREALLOC)
+        {
+          BADREQUEST("MAXREALLOC");
+          goto errout_with_400;
+        }
+      httpd_realloc_str(&hc->read_buf, &hc->read_size, hc->read_size + CONFIG_THTTPD_REALLOCINCR);
+    }
+
+  /* Read some more bytes */
+
+  sz = read(hc->conn_fd, &(hc->read_buf[hc->read_idx]), hc->read_size - hc->read_idx);
+  if (sz == 0)
+    {
+      BADREQUEST("EOF");
+      goto errout_with_400;
+    }
+
+  if (sz < 0)
+    {
+      /* Ignore EINTR and EAGAIN.  Also ignore EWOULDBLOCK.  At first glance
+       * you would think that connections returned by fdwatch as readable
+       * should never give an EWOULDBLOCK; however, this apparently can
+       * happen if a packet gets garbled.
+       */
+
+      if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
+        {
+          return;
+        }
+ 
+      ndbg("read(fd=%d) failed: %d\n", hc->conn_fd, errno);
+      BADREQUEST("read");
+      goto errout_with_400;
+    }
+
+  hc->read_idx += sz;
+  conn->active_at = tv->tv_sec;
+
+  /* Do we have a complete request yet? */
+
+  switch (httpd_got_request(hc))
+    {
+    case GR_NO_REQUEST:
+      return;
+    case GR_BAD_REQUEST:
+     BADREQUEST("httpd_got_request");
+     goto errout_with_400;
+    }
+
+  /* Yes.  Try parsing and resolving it */
+
+  if (httpd_parse_request(hc) < 0)
+    {
+      goto errout_with_connection;
+    }
+
+  /* Start the connection going */
+
+  if (httpd_start_request(hc, tv) < 0)
+    {
+      /* Something went wrong.  Close down the connection */
+
+      goto errout_with_connection;
+    }
+
+  /* Set up the file offsets to read */
+
+  conn->eof            = false;
+  if (hc->got_range)
+    {
+      conn->offset     = hc->range_start;
+      conn->end_offset = hc->range_end + 1;
+    }
+  else
+    {
+      conn->offset     = 0;
+      if (hc->bytes_to_send < 0)
+        {
+          conn->end_offset = 0;
+        }
+      else
+        {
+          conn->end_offset = hc->bytes_to_send;
+        }
+    }
+
+  /* Check if it's already handled */
+
+  if (hc->file_fd < 0)
+    {
+      /* No file descriptor means someone else is handling it */
+
+      conn->offset = hc->bytes_sent;
+      goto errout_with_connection;
+    }
+
+  if (conn->offset >= conn->end_offset)
+    {
+      /* There's nothing to send */
+
+      goto errout_with_connection;
+    }
+
+  /* Seek to the offset of the next byte to send */
+
+  actual = lseek(hc->file_fd, conn->offset, SEEK_SET);
+  if (actual != conn->offset)
+    {
+       ndbg("fseek to %d failed: offset=%d errno=%d\n", conn->offset, actual, errno);
+       BADREQUEST("lseek");
+       goto errout_with_400;
+    }
+
+  /* We have a valid connection and a file to send to it */
+
+  conn->conn_state = CNST_SENDING;
+  client_data.p    = conn;
+  fdwatch_del_fd(fw, hc->conn_fd);
+  return;
+
+errout_with_400:
+  BADREQUEST("errout");
+  httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
+
+errout_with_connection:
+  finish_connection(conn, tv);
+  return;
+}
+
+static inline int read_buffer(struct connect_s *conn)
+{
+  httpd_conn *hc = conn->hc;
+  ssize_t nread = 0;
+
+  if (hc->buflen < CONFIG_THTTPD_IOBUFFERSIZE && !conn->eof)
+    {
+      nread = read(hc->file_fd, &hc->buffer[hc->buflen],
+                   CONFIG_THTTPD_IOBUFFERSIZE - hc->buflen);
+      if (nread == 0)
+        {
+          /* Reading zero bytes means we are at the end of file */
+
+          conn->end_offset = conn->offset;
+          conn->eof        = true;
+        }
+      else if (nread > 0)
+        {
+          hc->buflen      += nread;
+        }
+    }
+  return nread;
+}
+
+static void handle_send(struct connect_s *conn, struct timeval *tv)
+{
+  httpd_conn *hc = conn->hc;
+  int nwritten;
+  int nread;
+
+  /* Read until the entire file is sent -- this could take awhile!! */
+
+  while (conn->offset < conn->end_offset)
+    {
+      nvdbg("offset: %d end_offset: %d bytes_sent: %d\n",
+            conn->offset, conn->end_offset, conn->hc->bytes_sent);
+
+      /* Fill the rest of the response buffer with file data */
+
+      nread = read_buffer(conn);
+      if (nread < 0)
+        {
+          ndbg("File read error: %d\n", errno);
+          goto errout_clear_connection;
+        }
+      nvdbg("Read %d bytes, buflen %d\n", nread, hc->buflen);
+
+      /* Send the buffer */
+
+      if (hc->buflen > 0)
+        {
+          /* httpd_write does not return until all bytes have been sent
+           * (or an error occurs).
+           */
+ 
+          nwritten = httpd_write(hc->conn_fd, hc->buffer, hc->buflen);
+          if (nwritten < 0)
+            {
+              ndbg("Error sending %s: %d\n", hc->encodedurl, errno);
+              goto errout_clear_connection;
+            }
+
+          /* We wrote one full buffer of data (httpd_write does not
+           * return until the full buffer is written (or an error occurs).
+           */
+
+          conn->active_at       = tv->tv_sec;
+          hc->buflen            = 0;
+
+          /* And update how much of the file we wrote */
+
+          conn->offset         += nwritten;
+          conn->hc->bytes_sent += nwritten;
+          nvdbg("Wrote %d bytes\n", nwritten);
+        }
+    }
+
+  /* The file transfer is complete -- finish the connection */
+
+  nvdbg("Finish connection\n");
+  finish_connection(conn, tv);
+  return;
+
+errout_clear_connection:
+  ndbg("Clear connection\n");
+  clear_connection(conn, tv);
+  return;
+}
+
+static void handle_linger(struct connect_s *conn, struct timeval *tv)
+{
+  httpd_conn *hc = conn->hc;
+  int ret;
+
+    /* In lingering-close mode we just read and ignore bytes.  An error or EOF 
+   * ends things, otherwise we go until a timeout 
+   */
+
+  ret = read(conn->hc->conn_fd, hc->buffer, CONFIG_THTTPD_IOBUFFERSIZE);
+  if (ret < 0 && (errno == EINTR || errno == EAGAIN))
+    {
+      return;
+    }
+
+  if (ret <= 0)
+    {
+      really_clear_connection(conn);
+    }
+}
+
+static void finish_connection(struct connect_s *conn, struct timeval *tv)
+{
+  /* If we haven't actually sent the buffered response yet, do so now */
+
+  httpd_write_response(conn->hc);
+
+  /* And clear */
+
+  clear_connection(conn, tv);
+}
+
+static void clear_connection(struct connect_s *conn, struct timeval *tv)
+{
+  ClientData client_data;
+
+  if (conn->wakeup_timer != NULL)
+    {
+      tmr_cancel(conn->wakeup_timer);
+      conn->wakeup_timer = 0;
+    }
+
+  /* This is our version of Apache's lingering_close() routine, which is
+   * their version of the often-broken SO_LINGER socket option.  For why
+   * this is necessary, see http://www.apache.org/docs/misc/fin_wait_2.html
+   * What we do is delay the actual closing for a few seconds, while reading
+   * any bytes that come over the connection.  However, we don't want to do
+   * this unless it's necessary, because it ties up a connection slot and
+   * file descriptor which means our maximum connection-handling rateis
+   * lower.  So, elsewhere we set a flag when we detect the few
+   * circumstances that make a lingering close necessary.  If the flag isn't 
+   * set we do the real close now.
+   */
+
+  if (conn->conn_state == CNST_LINGERING)
+    {
+      /* If we were already lingering, shut down for real */
+
+      tmr_cancel(conn->linger_timer);
+      conn->linger_timer      = NULL;
+      conn->hc->should_linger = false;
+    }
+  else if (conn->hc->should_linger)
+    {
+      fdwatch_del_fd(fw, conn->hc->conn_fd);
+      conn->conn_state = CNST_LINGERING;
+      fdwatch_add_fd(fw, conn->hc->conn_fd, conn);
+      client_data.p = conn;
+
+      conn->linger_timer = tmr_create(tv, linger_clear_connection, client_data,
+                                      CONFIG_THTTPD_LINGER_MSEC, 0);
+      if (conn->linger_timer != NULL)
+        {
+          return;
+        }
+      ndbg("tmr_create(linger_clear_connection) failed\n");
+    }
+
+  /* Either we are done lingering, we shouldn't linger, or we failed to setup the linger */
+
+  really_clear_connection(conn);
+}
+
+static void really_clear_connection(struct connect_s *conn)
+{
+  fdwatch_del_fd(fw, conn->hc->conn_fd);
+  httpd_close_conn(conn->hc);
+  if (conn->linger_timer != NULL)
+    {
+      tmr_cancel(conn->linger_timer);
+      conn->linger_timer = 0;
+    }
+
+  /* Put the connection structure back on the free list */
+
+  conn->conn_state  = CNST_FREE;
+  conn->next        = free_connections;
+  free_connections  = conn;
+}
+
+static void idle(ClientData client_data, struct timeval *nowP)
+{
+  int cnum;
+  struct connect_s *conn;
+
+  for (cnum = 0; cnum < AVAILABLE_FDS; ++cnum)
+    {
+      conn = &connects[cnum];
+      switch (conn->conn_state)
+        {
+        case CNST_READING:
+          if (nowP->tv_sec - conn->active_at >= CONFIG_THTTPD_IDLE_READ_LIMIT_SEC)
+            {
+              ndbg("%s connection timed out reading\n", httpd_ntoa(&conn->hc->client_addr));
+              httpd_send_err(conn->hc, 408, httpd_err408title, "",
+                             httpd_err408form, "");
+              finish_connection(conn, nowP);
+            }
+          break;
+
+        case CNST_SENDING:
+          if (nowP->tv_sec - conn->active_at >= CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC)
+            {
+              ndbg("%s connection timed out sending\n", httpd_ntoa(&conn->hc->client_addr));
+              clear_connection(conn, nowP);
+            }
+          break;
+        }
+    }
+}
+
+static void linger_clear_connection(ClientData client_data, struct timeval *nowP)
+{
+  struct connect_s *conn;
+
+  nvdbg("Clear connection\n");
+  conn = (struct connect_s *) client_data.p;
+  conn->linger_timer = NULL;
+  really_clear_connection(conn);
+}
+
+static void occasional(ClientData client_data, struct timeval *nowP)
+{
+  tmr_cleanup();
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Function: thttpd_main
+ *
+ * Description:
+ *   This function is the entrypoint into the THTTPD server.  It does not
+ *   return.  It may be called, the normal mechanism for starting the server
+ *   is:
+ *
+ *   1) Set is g_thttpdsymtab and g_thttpdnsymbols.  The user is required
+ *      to provide a symbol table to use for binding CGI programs (if CGI
+ *      is enabled.  See examples/nxflat and examples/thttpd for examples of
+ *      how such a symbol table may be created.
+ *   2) Call task_create() to start thttpd_main()
+ *
+ ****************************************************************************/
+
+int thttpd_main(int argc, char **argv)
+{
+  int num_ready;
+  int cnum;
+  FAR struct connect_s *conn;
+  FAR httpd_conn *hc;
+  httpd_sockaddr sa;
+  struct timeval tv;
+#ifdef CONFIG_THTTPD_DIR
+  int ret;
+#endif
+
+  nvdbg("THTTPD started\n");
+
+  /* Setup host address */
+
+#ifdef  CONFIG_NET_IPv6
+#  error "IPv6 support not yet implemented"
+#else
+  sa.sin_family      = AF_INET;
+  sa.sin_port        = HTONS(CONFIG_THTTPD_PORT);
+  sa.sin_addr.s_addr = HTONL(CONFIG_THTTPD_IPADDR);
+#endif
+
+  /* Initialize the fdwatch package to handle all of the configured
+   * socket descriptors
+   */
+
+  fw = fdwatch_initialize(CONFIG_NSOCKET_DESCRIPTORS);
+  if (!fw)
+    {
+      ndbg("fdwatch initialization failure\n");
+      exit(1);
+    }
+
+  /* Switch directories again if requested */
+
+#ifdef CONFIG_THTTPD_DATADIR
+  if (chdir(CONFIG_THTTPD_DATADIR) < 0)
+    {
+      ndbg("chdir to %s: %d\n", CONFIG_THTTPD_DATADIR, errno);
+      exit(1);
+    }
+#endif
+
+  /* Initialize the timer package */
+
+  tmr_init();
+
+  /* Initialize the HTTP layer */
+
+  nvdbg("Calling httpd_initialize()\n");
+  hs = httpd_initialize(&sa);
+  if (!hs)
+    {
+      ndbg("httpd_initialize() failed\n");
+      exit(1);
+    }
+
+  /* Set up the occasional timer */
+
+  if (tmr_create(NULL, occasional, JunkClientData, CONFIG_THTTPD_OCCASIONAL_MSEC * 1000L, 1) == NULL)
+    {
+      ndbg("tmr_create(occasional) failed\n");
+      exit(1);
+    }
+
+  /* Set up the idle timer */
+
+  if (tmr_create(NULL, idle, JunkClientData, 5 * 1000L, 1) == NULL)
+    {
+      ndbg("tmr_create(idle) failed\n");
+      exit(1);
+
+    }
+
+  /* Initialize our connections table */
+
+  connects = NEW(struct connect_s, AVAILABLE_FDS);
+  if (connects == NULL)
+    {
+      ndbg("Out of memory allocating a struct connect_s\n");
+      exit(1);
+    }
+
+  for (cnum = 0; cnum < AVAILABLE_FDS; ++cnum)
+    {
+      connects[cnum].conn_state  = CNST_FREE;
+      connects[cnum].next        = &connects[cnum + 1];
+      connects[cnum].hc          = NULL;
+    }
+
+  connects[AVAILABLE_FDS-1].next = NULL;      /* End of link list */
+  free_connections               = connects;  /* Beginning of the link list */
+
+  if (hs != NULL)
+    {
+      if (hs->listen_fd != -1)
+        {
+          fdwatch_add_fd(fw, hs->listen_fd, NULL);
+        }
+    }
+
+  /* Main loop */
+
+  nvdbg("Entering the main loop\n");
+  (void)gettimeofday(&tv, NULL);
+  for(;;)
+    {
+      /* Do the fd watch */
+
+      num_ready = fdwatch(fw, tmr_mstimeout(&tv));
+      if (num_ready < 0)
+        {
+          if (errno == EINTR || errno == EAGAIN)
+            {
+              /* Not errors... try again */
+
+              continue;
+            }
+
+          ndbg("fdwatch failed: %d\n", errno);
+          exit(1);
+        }
+
+      (void)gettimeofday(&tv, NULL);
+
+      if (num_ready == 0)
+        {
+          /* No fd's are ready - run the timers */
+
+          tmr_run(&tv);
+          continue;
+        }
+
+      /* Is it a new connection? */
+
+      if (fdwatch_check_fd(fw, hs->listen_fd))
+        {
+          if (!handle_newconnect(&tv, hs->listen_fd))
+            {
+              /* Go around the loop and do another fdwatch, rather than 
+               * dropping through and processing existing connections.  New
+               * connections always get priority.
+               */
+
+              continue;
+            }
+        }
+
+      /* Find the connections that need servicing */
+
+      while ((conn = (struct connect_s*)fdwatch_get_next_client_data(fw)) != (struct connect_s*)-1)
+        {
+          if (conn)
+            {
+              hc = conn->hc;
+              if (fdwatch_check_fd(fw, hc->conn_fd))
+                {
+                  nvdbg("Handle conn_state %d\n", conn->conn_state);
+                  switch (conn->conn_state)
+                    {
+                      case CNST_READING:
+                        {
+                          handle_read(conn, &tv);
+
+                          /* If a GET request was received and a file is ready to
+                           * be sent, then fall through to send the file.
+                           */
+
+                          if (conn->conn_state != CNST_SENDING)
+                            { 
+                              break;
+                            }
+                        }
+
+                      case CNST_SENDING:
+                        {
+                          /* Send a file -- this really should be performed on a
+                           * separate thread to keep the serve from locking up during
+                           * the write.
+                           */
+
+                          handle_send(conn, &tv);
+                        }
+                        break;
+
+                      case CNST_LINGERING:
+                        {
+                          /* Linger close the connection */
+
+                          handle_linger(conn, &tv);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+      tmr_run(&tv);
+    }
+
+  /* The main loop terminated */
+
+  shut_down();
+  ndbg("Exiting\n");
+  exit(0);
+}
+
+#endif /* CONFIG_THTTPD */
+
diff --git a/apps/netutils/thttpd/thttpd_alloc.c b/apps/netutils/thttpd/thttpd_alloc.c
new file mode 100755
index 000000000..71c71397b
--- /dev/null
+++ b/apps/netutils/thttpd/thttpd_alloc.c
@@ -0,0 +1,199 @@
+/****************************************************************************
+ * netutils/thttpd/thttpd_alloc.c
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <debug.h>
+#include <errno.h>
+
+#include "config.h"
+#include "thttpd_alloc.h"
+
+#ifdef CONFIG_THTTPD
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef MAX
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef MIN
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef CONFIG_THTTPD_MEMDEBUG
+static int    g_nallocations = 0;
+static int    g_nfreed       = 0;
+static size_t g_allocated    = 0;
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Generate debugging statistics */
+
+#ifdef CONFIG_THTTPD_MEMDEBUG
+void httpd_memstats(void)
+{
+  static struct mallinfo mm;
+
+  ndbg("%d allocations (%lu bytes), %d freed\n", g_nallocations, (unsigned long)g_allocated, g_nfreed);
+
+  /* Get the current memory usage */
+
+#ifdef CONFIG_CAN_PASS_STRUCTS
+  mm = mallinfo();
+#else
+  (void)mallinfo(&mm);
+#endif
+  ndbg("arena: %08x ordblks: %08x mxordblk: %08x uordblks: %08x fordblks: %08x\n",
+       mm.arena, mm.ordblks, mm.mxordblk, mm.uordblks, mm.fordblks);
+}
+#endif
+
+/****************************************************************************
+ * Global Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_THTTPD_MEMDEBUG
+FAR void *httpd_malloc(size_t nbytes)
+{
+  void *ptr = malloc(nbytes);
+  if (!ptr)
+    {
+      ndbg("Allocation of %d bytes failed\n", nbytes);
+    }
+  else
+    {
+      nvdbg("Allocated %d bytes at %p\n", nbytes, ptr);
+      g_nallocations++;
+      g_allocated += nbytes;
+    }
+  httpd_memstats();
+  return ptr;
+}
+#endif
+
+#ifdef CONFIG_THTTPD_MEMDEBUG
+FAR void *httpd_realloc(FAR void *oldptr, size_t oldsize, size_t newsize)
+{
+  void *ptr = realloc(oldptr, newsize);
+  if (!ptr)
+    {
+      ndbg("Re-allocation from %d to %d bytes failed\n",
+           oldsize, newsize);
+    }
+  else
+    {
+      nvdbg("Re-allocated form %d to %d bytes (from %p to %p)\n",
+            oldsize, newsize, oldptr, ptr);
+      g_allocated += (newsize - oldsize);
+    }
+  httpd_memstats();
+  return ptr;
+}
+#endif
+
+#ifdef CONFIG_THTTPD_MEMDEBUG
+void httpd_free(FAR void *ptr)
+{
+  free(ptr);
+  g_nfreed++;
+  nvdbg("Freed memory at %p\n", ptr);
+  httpd_memstats();
+}
+#endif
+
+#ifdef CONFIG_THTTPD_MEMDEBUG
+FAR char *httpd_strdup(const char *str)
+{
+  FAR char *newstr = strdup(str);
+  if (!newstr)
+    {
+      ndbg("strdup of %s failed\n", str);
+    }
+  else
+    {
+      nvdbg("strdup'ed %s\n", str);
+      g_nallocations++;
+      g_allocated += (strlen(str)+1);
+    }
+  httpd_memstats();
+  return newstr;
+}
+#endif
+
+/* Helpers to implement dynamically allocated strings */
+
+void httpd_realloc_str(char **pstr, size_t *maxsize, size_t size)
+{
+  size_t oldsize;
+  if (*maxsize == 0)
+    {
+      *maxsize = MAX(CONFIG_THTTPD_MINSTRSIZE, size + CONFIG_THTTPD_REALLOCINCR);
+      *pstr    = NEW(char, *maxsize + 1);
+    }
+  else if (size > *maxsize)
+    {
+      oldsize  = *maxsize;
+      *maxsize = MAX(oldsize * 2, size * 5 / 4);
+      *pstr    = httpd_realloc(*pstr, oldsize + 1, *maxsize + 1);
+    }
+  else
+    {
+      return;
+    }
+
+  if (!*pstr)
+    {
+      ndbg("out of memory reallocating a string to %d bytes\n", *maxsize);
+      exit(1);
+    }
+}
+
+#endif /* CONFIG_THTTPD */
diff --git a/apps/netutils/thttpd/thttpd_alloc.h b/apps/netutils/thttpd/thttpd_alloc.h
new file mode 100755
index 000000000..1f24bc2e9
--- /dev/null
+++ b/apps/netutils/thttpd/thttpd_alloc.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+ * netutils/thttpd/thttpd_alloc.h
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __NETUTILS_THTTPD_HTTDP_ALLOC_H
+#define __NETUTILS_THTTPD_HTTDP_ALLOC_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <stdlib.h>
+#include <string.h>
+#include "config.h"
+
+#ifdef CONFIG_THTTPD
+
+/****************************************************************************
+ * Global Functions
+ ****************************************************************************/
+
+/* Allows all memory management calls to be intercepted */
+
+#ifdef CONFIG_THTTPD_MEMDEBUG
+extern FAR void *httpd_malloc(size_t nbytes);
+extern FAR void *httpd_realloc(FAR void *oldptr, size_t oldsize, size_t newsize);
+extern void      httpd_free(FAR void *ptr);
+extern FAR char *httpd_strdup(const char *str);
+#else
+#  define httpd_malloc(n)      malloc(n)
+#  define httpd_realloc(p,o,n) realloc(p,n)
+#  define httpd_free(p)        free(p)
+#  define httpd_strdup(s)      strdup(s)
+#endif
+
+/* Helpers to support allocations in multiples of a type size */
+
+#define NEW(t,n)               ((t*)httpd_malloc(sizeof(t)*(n)))
+#define RENEW(p,t,o,n)         ((t*)httpd_realloc((void*)p, sizeof(t)*(o), sizeof(t)*(n)))
+
+/* Helpers to implement dynamically allocated strings */
+
+extern void httpd_realloc_str(char **pstr, size_t *maxsizeP, size_t size);
+
+#endif /* CONFIG_THTTPD */
+#endif /* __NETUTILS_THTTPD_HTTDP_ALLOC_H */
diff --git a/apps/netutils/thttpd/thttpd_cgi.c b/apps/netutils/thttpd/thttpd_cgi.c
new file mode 100755
index 000000000..ee126795a
--- /dev/null
+++ b/apps/netutils/thttpd/thttpd_cgi.c
@@ -0,0 +1,1080 @@
+/****************************************************************************
+ * netutils/thttpd/thttpd_cgi.c
+ * CGI support
+ *
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file libhttpd.c in the original THTTPD package:
+ *
+ *   Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <libgen.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/symtab.h>
+#include <nuttx/binfmt.h>
+#include <apps/netutils/thttpd.h>
+
+#include "config.h"
+#include "libhttpd.h"
+#include "thttpd_alloc.h"
+#include "thttpd_strings.h"
+#include "timers.h"
+#include "fdwatch.h"
+
+#if defined(CONFIG_THTTPD) && defined(CONFIG_THTTPD_CGI_PATTERN)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* CONFIG_THTTPD_CGIDUMP will dump the contents of each transfer to and from the CGI task. */
+
+#ifdef CONFIG_THTTPD_CGIDUMP
+#  define cgi_dumpbuffer(m,a,n) lib_dumpbuffer(m,(FAR const uint8_t*)a,n)
+#else
+#  define cgi_dumpbuffer(m,a,n)
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+enum cgi_outbuffer_e
+{
+  CGI_OUTBUFFER_READHEADER = 0,  /* Reading header from HTTP client */
+  CGI_OUTBUFFER_HEADERREAD,      /* Header has been read */
+  CGI_OUTBUFFER_HEADERSENT,      /* Header has been sent to the CGI program */
+  CGI_OUTBUFFER_READDATA,        /* Transferring data from CGI to client */
+  CGI_OUTBUFFER_DONE,            /* Finished */
+};
+
+struct cgi_outbuffer_s
+{
+  enum cgi_outbuffer_e state;    /* State of the transfer */
+  char  *buffer;                 /* Allocated I/O buffer */
+  size_t size;                   /* Size of the allocation */
+  size_t len;                    /* Amount of valid data in the allocated buffer */
+};
+
+struct cgi_inbuffer_s
+{
+  int    contentlength;			/* Size of content to send to CGI task */
+  int    nbytes;				/* Number of bytes sent */
+  char   buffer[CONFIG_THTTPD_CGIINBUFFERSIZE]; /* Fixed size input buffer */
+};
+
+struct cgi_conn_s
+{
+  /* Descriptors */
+
+  int    connfd;                 /* Socket connect to CGI client */
+  int    rdfd;                   /* Pipe read fd */
+  int    wrfd;                   /* Pipe write fd */
+
+  /* Buffering */
+
+  struct cgi_outbuffer_s outbuf; /* Dynamically sized output buffer */
+  struct cgi_inbuffer_s inbuf;   /* Fixed size input buffer */
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void create_environment(httpd_conn *hc);
+static char **make_argp(httpd_conn *hc);
+static inline int cgi_interpose_input(struct cgi_conn_s *cc);
+static inline int cgi_interpose_output(struct cgi_conn_s *cc);
+static int  cgi_child(int argc, char **argv);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Used to hold off the main task until the CGI tasks have been configured */
+
+static sem_t g_cgisem;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* semaphore helpers */
+
+static inline void cgi_semtake(void)
+{
+  while (sem_wait(&g_cgisem) != 0)
+    {
+      /* The only case that an error should occr here is if the wait was\
+       * awakened by a signal.
+       */
+
+      ASSERT(*get_errno_ptr() == EINTR);
+    }
+}
+
+static inline void cgi_semgive(void)
+{
+  sem_post(&g_cgisem);
+}
+
+/* Set up environment variables. Be real careful here to avoid
+ * letting malicious clients overrun a buffer.  We don't have
+ * to worry about freeing stuff since we're a sub-task.
+ */
+
+static void create_environment(httpd_conn *hc)
+{
+  char *cp;
+  char buf[256];
+
+  setenv("PATH", CONFIG_THTTPD_CGI_PATH, TRUE);
+#ifdef CGI_LD_LIBRARY_PATH
+  setenv("LD_LIBRARY_PATH", CGI_LD_LIBRARY_PATH, TRUE);
+#endif /* CGI_LD_LIBRARY_PATH */
+
+  setenv("SERVER_SOFTWARE",  CONFIG_THTTPD_SERVER_SOFTWARE, TRUE);
+
+  /* If vhosting, use that server-name here. */
+#ifdef CONFIG_THTTPD_VHOST
+  if (hc->vhostname)
+    {
+      cp = hc->vhostname;
+    }
+  else
+#endif
+    {
+      cp = hc->hs->hostname;
+    }
+
+  if (cp)
+    {
+      setenv("SERVER_NAME", cp, TRUE);
+    }
+
+  setenv("GATEWAY_INTERFACE", "CGI/1.1", TRUE);
+  setenv("SERVER_PROTOCOL", hc->protocol, TRUE);
+
+  (void)snprintf(buf, sizeof(buf), "%d", (int)CONFIG_THTTPD_PORT);
+  setenv("SERVER_PORT", buf, TRUE);
+
+  setenv("REQUEST_METHOD", httpd_method_str(hc->method), TRUE);
+
+  if (hc->pathinfo[0] != '\0')
+    {
+      char *cp2;
+      size_t l;
+
+      (void)snprintf(buf, sizeof(buf), "/%s", hc->pathinfo);
+      setenv("PATH_INFO", buf, TRUE);
+
+      l = strlen(httpd_root) + strlen(hc->pathinfo) + 1;
+      cp2 = NEW(char, l);
+      if (cp2)
+        {
+          (void)snprintf(cp2, l, "%s%s", httpd_root, hc->pathinfo);
+          setenv("PATH_TRANSLATED", cp2, TRUE);
+        }
+    }
+
+  (void)snprintf(buf, sizeof(buf), "/%s",strcmp(hc->origfilename, ".") == 0 ? "" : hc->origfilename);
+  setenv("SCRIPT_NAME", buf, TRUE);
+
+  if (hc->query[0] != '\0')
+    {
+      setenv("QUERY_STRING", hc->query, TRUE);
+    }
+
+  setenv("REMOTE_ADDR", httpd_ntoa(&hc->client_addr), TRUE);
+  if (hc->referer[0] != '\0')
+    {
+      setenv("HTTP_REFERER", hc->referer, TRUE);
+    }
+
+  if (hc->useragent[0] != '\0')
+    {
+      setenv("HTTP_USER_AGENT", hc->useragent, TRUE);
+    }
+
+  if (hc->accept[0] != '\0')
+    {
+      setenv("HTTP_ACCEPT", hc->accept, TRUE);
+    }
+
+  if (hc->accepte[0] != '\0')
+    {
+      setenv("HTTP_ACCEPT_ENCODING", hc->accepte, TRUE);
+    }
+
+  if (hc->acceptl[0] != '\0')
+    {
+      setenv("HTTP_ACCEPT_LANGUAGE", hc->acceptl, TRUE);
+    }
+
+  if (hc->cookie[0] != '\0')
+    {
+      setenv("HTTP_COOKIE", hc->cookie, TRUE);
+    }
+
+  if (hc->contenttype[0] != '\0')
+    {
+      setenv("CONTENT_TYPE", hc->contenttype, TRUE);
+    }
+
+  if (hc->hdrhost[0] != '\0')
+    {
+      setenv("HTTP_HOST", hc->hdrhost, TRUE);
+    }
+
+  if (hc->contentlength != -1)
+    {
+      (void)snprintf(buf, sizeof(buf), "%lu", (unsigned long)hc->contentlength);
+      setenv("CONTENT_LENGTH", buf, TRUE);
+    }
+
+  if (hc->remoteuser[0] != '\0')
+    {
+      setenv("REMOTE_USER", hc->remoteuser, TRUE);
+    }
+
+  if (hc->authorization[0] != '\0')
+    {
+      setenv("AUTH_TYPE", "Basic", TRUE);
+    }
+
+  /* We only support Basic auth at the moment. */
+
+  if (getenv("TZ") != NULL)
+    {
+      setenv("TZ", getenv("TZ"), TRUE);
+    }
+
+  setenv("CGI_PATTERN", CONFIG_THTTPD_CGI_PATTERN, TRUE);
+}
+
+/* Set up argument vector */
+
+static FAR char **make_argp(httpd_conn *hc)
+{
+  FAR char **argp;
+  int argn;
+  char *cp1;
+  char *cp2;
+
+  /* By allocating an arg slot for every character in the query, plus one
+   * for the filename and one for the NULL, we are guaranteed to have
+   * enough.  We could actually use strlen/2.
+   */
+
+  argp = NEW(char *, strlen(hc->query) + 2);
+  if (!argp)
+    {
+      return NULL;
+    }
+
+  argp[0] = strrchr(hc->expnfilename, '/');
+  if (argp[0])
+    {
+      ++argp[0];
+    }
+  else
+    {
+      argp[0] = hc->expnfilename;
+    }
+  argn = 1;
+
+  /* According to the CGI spec at http://hoohoo.ncsa.uiuc.edu/cgi/cl.html,
+   * "The server should search the query information for a non-encoded =
+   * character to determine if the command line is to be used, if it finds
+   * one, the command line is not to be used."
+   */
+
+  if (strchr(hc->query, '=') == NULL)
+    {
+      for (cp1 = cp2 = hc->query; *cp2 != '\0'; ++cp2)
+        {
+          if (*cp2 == '+')
+            {
+              *cp2 = '\0';
+              httpd_strdecode(cp1, cp1);
+              argp[argn++] = cp1;
+              cp1 = cp2 + 1;
+            }
+        }
+
+      if (cp2 != cp1)
+        {
+          httpd_strdecode(cp1, cp1);
+          argp[argn++] = cp1;
+        }
+    }
+
+  argp[argn] = NULL;
+  return argp;
+}
+
+/* Data is available from the client socket. This routine is used only for POST
+ * requests.  It reads the data from the client and sends it to the child thread.
+ */
+
+static inline int cgi_interpose_input(struct cgi_conn_s *cc)
+{
+  ssize_t nbytes_read;
+  ssize_t nbytes_written;
+
+  nllvdbg("nbytes: %d contentlength: %d\n", cc->inbuf.nbytes, cc->inbuf.contentlength);
+  if (cc->inbuf.nbytes < cc->inbuf.contentlength)
+    {
+      do
+        {
+          nbytes_read = read(cc->connfd, cc->inbuf.buffer,
+            MIN(CONFIG_THTTPD_CGIINBUFFERSIZE, cc->inbuf.contentlength - cc->inbuf.nbytes));
+          nllvdbg("nbytes_read: %d\n", nbytes_read);
+          if (nbytes_read < 0)
+            {
+              if (errno != EINTR)
+                {
+                  nlldbg("read failed: %d\n", errno);
+                  return 1;
+                }
+            }
+        }
+      while (nbytes_read < 0);
+
+      if (nbytes_read > 0)
+        {
+          nbytes_written = httpd_write(cc->wrfd, cc->inbuf.buffer, nbytes_read);
+          nllvdbg("nbytes_written: %d\n", nbytes_written);
+          if (nbytes_written != nbytes_read)
+            {
+              nlldbg("httpd_write failed\n");
+              return 1;
+            }
+          cgi_dumpbuffer("Sent to CGI:", cc->inbuf.buffer, nbytes_written);
+        }
+
+      cc->inbuf.nbytes += nbytes_read;
+    }
+
+  if (cc->inbuf.nbytes >= cc->inbuf.contentlength)
+    {
+      /* Special hack to deal with broken browsers that send a LF or CRLF
+       * after POST data, causing TCP resets - we just read and discard up
+       * to 2 bytes.  Unfortunately this doesn't fix the problem for CGIs
+       * which avoid the interposer task due to their POST data being
+       * short.  Creating an interposer task for all POST CGIs is
+       * unacceptably expensive.  The eventual fix will come when interposing
+       * gets integrated into the main loop as a tasklet instead of a task.
+       */
+
+      /* Turn on no-delay mode in case we previously cleared it. */
+
+      httpd_set_ndelay(cc->connfd);
+
+      /* And read up to 2 bytes. */
+
+      (void)read(cc->connfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE);
+      return 1;
+    }
+  return 0;
+}
+
+/* This routine is used for parsed-header CGIs.  The idea here is that the
+ * CGI can return special headers such as "Status:" and "Location:" which
+ * change the return status of the response.  Since the return status has to
+ * be the very first line written out, we have to accumulate all the headers
+ * and check for the special ones before writing the status.  Then we write
+ * out the saved headers and proceed to echo the rest of the response.
+ */
+
+static inline int cgi_interpose_output(struct cgi_conn_s *cc)
+{
+  ssize_t nbytes_read;
+  char *br = NULL;
+  int status;
+  const char *title;
+  char *cp;
+
+  /* Make sure the connection is in blocking mode.  It should already be
+   * blocking, but we might as well be sure.
+   */
+
+  httpd_clear_ndelay(cc->connfd);
+
+  /* Loop while there are things we can do without waiting for more input */
+
+  nllvdbg("state: %d\n", cc->outbuf.state);
+  switch (cc->outbuf.state)
+    {
+      case CGI_OUTBUFFER_READHEADER:
+        {
+          /* Slurp in all headers as they become available from the client. */
+
+          do
+            {
+              /* Read until we successfully read data or until an error occurs.
+               * EAGAIN is not an error, but it is still cause to return.
+               */
+
+              nbytes_read = read(cc->rdfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE);
+              nllvdbg("Read %d bytes from fd %d\n", nbytes_read, cc->rdfd);
+
+              if (nbytes_read < 0)
+                {
+                  if (errno != EINTR)
+                    {
+                      if (errno != EAGAIN)
+                        {
+                          nlldbg("read: %d\n", errno);
+                        }
+                      return 1;
+                    }
+                }
+              else
+                {
+                  cgi_dumpbuffer("Received from CGI:", cc->inbuf.buffer, nbytes_read);
+                }
+            }
+          while (nbytes_read < 0);
+
+          /* Check for end-of-file */
+
+          if (nbytes_read <= 0)
+            {
+              nllvdbg("End-of-file\n");
+              br               = &(cc->outbuf.buffer[cc->outbuf.len]);
+              cc->outbuf.state = CGI_OUTBUFFER_HEADERREAD;
+            }
+          else
+            {
+              /* Accumulate more header data */
+
+              httpd_realloc_str(&cc->outbuf.buffer, &cc->outbuf.size, cc->outbuf.len + nbytes_read);
+              (void)memcpy(&(cc->outbuf.buffer[cc->outbuf.len]), cc->inbuf.buffer, nbytes_read);
+              cc->outbuf.len                   += nbytes_read;
+              cc->outbuf.buffer[cc->outbuf.len] = '\0';
+              nllvdbg("Header bytes accumulated: %d\n", cc->outbuf.len);
+
+              /* Check for end of header */
+
+              if ((br = strstr(cc->outbuf.buffer, "\r\n\r\n")) != NULL ||
+                  (br = strstr(cc->outbuf.buffer, "\012\012")) != NULL)
+                {
+                  nllvdbg("End-of-header\n");
+                  cc->outbuf.state = CGI_OUTBUFFER_HEADERREAD;
+                }
+              else
+                {
+                  /* All of the headers have not yet been read ... Return.  We
+                   * will be called again when more data is available in the pipe
+                   * connected to the CGI task.
+                   */
+
+                  return 0;
+                }
+            }
+        }
+
+        /* Otherwise, fall through and parse status in the HTTP headers */
+
+      case CGI_OUTBUFFER_HEADERREAD:
+        {
+          /* If there were no headers, bail. */
+
+          if (cc->outbuf.buffer[0] == '\0')
+            {
+              cc->outbuf.state = CGI_OUTBUFFER_DONE;
+              return 1;
+            }
+
+          /* Figure out the status.  Look for a Status: or Location: header; else if 
+           * there's an HTTP header line, get it from there; else default to 200.
+           */
+
+          status = 200;
+          if (strncmp(cc->outbuf.buffer, "HTTP/", 5) == 0)
+            {
+              cp     = cc->outbuf.buffer;
+              cp    += strcspn(cp, " \t");
+              status = atoi(cp);
+            }
+
+          if ((cp = strstr(cc->outbuf.buffer, "Status:")) != NULL &&
+              cp < br && (cp == cc->outbuf.buffer || *(cp - 1) == '\012'))
+            {
+              cp    += 7;
+              cp    += strspn(cp, " \t");
+              status = atoi(cp);
+            }
+
+          if ((cp = strstr(cc->outbuf.buffer, "Location:")) != NULL &&
+              cp < br && (cp == cc->outbuf.buffer || *(cp - 1) == '\012'))
+            {
+              status = 302;
+            }
+
+          /* Write the status line. */
+
+          nllvdbg("Status: %d\n", status);
+          switch (status)
+            {
+            case 200:
+              title = ok200title;
+              break;
+
+            case 302:
+              title = err302title;
+              break;
+
+            case 304:
+              title = err304title;
+              break;
+
+            case 400:
+              BADREQUEST("status");
+              title = httpd_err400title;
+              break;
+
+#ifdef CONFIG_THTTPD_AUTH_FILE
+            case 401:
+              title = err401title;
+              break;
+#endif
+
+            case 403:
+              title = err403title;
+              break;
+
+            case 404:
+              title = err404title;
+             break;
+
+            case 408:
+              title = httpd_err408title;
+              break;
+
+            case 500:
+              INTERNALERROR("status");
+              title = err500title;
+              break;
+
+            case 501:
+              NOTIMPLEMENTED("status");
+              title = err501title;
+              break;
+
+            case 503:
+              title = httpd_err503title;
+              break;
+
+            default:
+              title = "Something";
+              break;
+            }
+
+          (void)snprintf(cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE, "HTTP/1.0 %d %s\r\n", status, title);
+          (void)httpd_write(cc->connfd, cc->inbuf.buffer, strlen(cc->inbuf.buffer));
+
+          /* Write the saved cc->outbuf.buffer to the client. */
+
+          (void)httpd_write(cc->connfd, cc->outbuf.buffer, cc->outbuf.len);
+        }
+
+        /* Then set up to read the data following the header from the CGI program and
+         * pass it back to the client. We return now; we will be called again when
+         * data is available on the pipe.
+         */
+
+        cc->outbuf.state = CGI_OUTBUFFER_READDATA;
+        return 0;
+
+      case CGI_OUTBUFFER_READDATA:
+        {
+          /* Read data from the pipe. */
+
+          do
+            {
+              /* Read until we successfully read data or until an error occurs.
+               * EAGAIN is not an error, but it is still cause to return.
+               */
+
+              nbytes_read = read(cc->rdfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE);
+              nllvdbg("Read %d bytes from fd %d\n", nbytes_read, cc->rdfd);
+
+              if (nbytes_read < 0)
+                {
+                  if (errno != EINTR)
+                    {
+                      if (errno != EAGAIN)
+                        {
+                          nlldbg("read: %d\n", errno);
+                        }
+                      return 1;
+                    }
+                }
+              else
+                {
+                  cgi_dumpbuffer("Received from CGI:", cc->inbuf.buffer, nbytes_read);
+                }
+            }
+          while (nbytes_read < 0);
+
+          /* Check for end of file */
+
+          if (nbytes_read == 0)
+            {
+              nllvdbg("End-of-file\n");
+              cc->outbuf.state = CGI_OUTBUFFER_DONE;
+              return 1;
+            }
+          else
+            {
+               /* Forward the data from the CGI program to the client */
+
+             (void)httpd_write(cc->connfd, cc->inbuf.buffer, nbytes_read);
+            }
+        }
+        break;
+
+      case CGI_OUTBUFFER_DONE:
+      default:
+        return 1;
+    }
+  return 0;
+}
+
+/* CGI child task. */
+
+static int cgi_child(int argc, char **argv)
+{
+  FAR httpd_conn *hc = (FAR httpd_conn*)strtoul(argv[1], NULL, 16);
+#if CONFIG_THTTPD_CGI_TIMELIMIT > 0
+  ClientData client_data;
+#endif
+  FAR char **argp;
+  FAR struct cgi_conn_s *cc;
+  FAR struct fdwatch_s *fw;
+  FAR char  *directory;
+  FAR char  *dupname;
+  bool       indone;
+  bool       outdone;
+  int        child;
+  int        pipefd[2];
+  int        nbytes;
+  int        fd;
+  int        ret;
+  int        err = 1;
+
+  /* Use low-level debug out (because the low-level output may survive closing
+   * all file descriptors
+   */
+
+  nllvdbg("Started: %s\n", argv[1]);
+
+  /* Allocate memory and initialize memory for interposing */
+
+  cc = (FAR struct cgi_conn_s*)httpd_malloc(sizeof(struct cgi_conn_s));
+  if (!cc)
+    {
+      nlldbg("cgi_conn allocation failed\n");
+      close(hc->conn_fd);
+      goto errout;
+    }
+
+  cc->connfd = hc->conn_fd;
+  cc->wrfd   = -1;
+  cc->rdfd   = -1;
+  memset(&cc->outbuf, 0, sizeof(struct cgi_outbuffer_s));
+
+  /* Update all of the environment variable settings, these will be inherited
+   * by the CGI task.
+   */
+
+  create_environment(hc);
+
+  /* Make the argument vector. */
+
+  argp = make_argp(hc);
+
+  /* Close all file descriptors EXCEPT for stdin, stdout, stderr and
+   * hc->conn_fd.  We'll keep stderr open for error reporting; stdin and
+   * stdout will be closed later by dup2().  Keeping stdin and stdout open
+   * now prevents re-use of fd=0 and 1 by pipe().
+   */
+
+  nllvdbg("Closing descriptors\n");
+  for (fd = 3; fd < (CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS); fd++)
+    {
+       /* Keep hc->conn_fd open for obvious reasons */
+
+       if (fd != hc->conn_fd)
+         {
+           close(fd);
+         }
+    }
+
+  /* Create pipes that will be interposed between the CGI task's stdin or
+   * stdout and the socket.
+   *
+   * Setup up the STDIN pipe - a pipe to transfer data received on the
+   * socket to the CGI program.
+   */
+
+  nllvdbg("Create STDIN pipe\n");
+  ret = pipe(pipefd);
+  if (ret < 0)
+    {
+      nlldbg("STDIN pipe: %d\n", errno);
+      goto errout_with_cgiconn;
+    }
+  else
+    {
+      /* Then map the receiving end the pipe to stdin, save the sending end, and
+       * closing the original receiving end
+       */
+
+      ret = dup2(pipefd[0], 0);
+
+      cc->wrfd = pipefd[1];
+      close(pipefd[0]);
+
+      if (ret < 0)
+        {
+          nlldbg("STDIN dup2: %d\n", errno);
+          goto errout_with_descriptors;
+        }
+    }
+
+  /* Set up the STDOUT pipe - a pipe to transfer data received from the CGI program
+   * to the client.
+   */
+
+  if (ret == 0)
+    {
+      nllvdbg("Create STDOUT pipe\n");
+      ret = pipe(pipefd);
+      if (ret < 0)
+        {
+          nlldbg("STDOUT pipe: %d\n", errno);
+          goto errout_with_descriptors;
+        }
+      else
+        {
+          /* Then map the sending end the pipe to stdout, save the receiving end, and
+           * closing the original sending end
+           */
+
+          ret = dup2(pipefd[1], 1);
+
+          cc->rdfd = pipefd[0];
+          close(pipefd[1]);
+ 
+          if (ret < 0)
+            {
+              nlldbg("STDOUT dup2: %d\n", errno);
+              goto errout_with_descriptors;
+            }
+        }
+    }
+
+  /* chdir to the directory containing the binary. This isn't in the CGI 1.1
+   * spec, but it's what  other HTTP servers do.
+   */
+
+  dupname = httpd_strdup(hc->expnfilename);
+  if (dupname)
+    {
+      directory = dirname(dupname);
+      if (directory)
+        {
+          (void)chdir(directory); /* ignore errors */
+        }
+      httpd_free(dupname);
+    }
+
+  /* Allocate memory for output buffering */
+
+  httpd_realloc_str(&cc->outbuf.buffer, &cc->outbuf.size, CONFIG_THTTPD_CGIOUTBUFFERSIZE);
+  if (!cc->outbuf.buffer)
+    {
+      nlldbg("hdr allocation failed\n");
+      goto errout_with_descriptors;
+    }
+
+  /* Create fdwatch structures */
+
+  fw = fdwatch_initialize(2);
+  if (!fw)
+    {
+      nlldbg("fdwatch allocation failed\n");
+      goto errout_with_outbuffer;
+    }
+
+  /* Run the CGI program. */
+
+  nllvdbg("Starting CGI: %s\n", hc->expnfilename);
+  child = exec(hc->expnfilename, (FAR const char **)argp, g_thttpdsymtab, g_thttpdnsymbols);
+  if (child < 0)
+    {
+      /* Something went wrong. */
+
+      nlldbg("execve %s: %d\n", hc->expnfilename, errno);
+      goto errout_with_watch;
+   }
+
+  /* Schedule a kill for the child task in case it runs too long. */
+
+#if CONFIG_THTTPD_CGI_TIMELIMIT > 0
+  client_data.i = child;
+  if (tmr_create(NULL, cgi_kill, client_data, CONFIG_THTTPD_CGI_TIMELIMIT * 1000L, 0) == NULL)
+    {
+      nlldbg("tmr_create(cgi_kill child) failed\n");
+      goto errout_with_watch;
+    }
+#endif
+
+  /* Add the read descriptors to the watch */
+
+  fdwatch_add_fd(fw, cc->connfd, NULL);
+  fdwatch_add_fd(fw, cc->rdfd, NULL);
+
+  /* Send any data that is already buffer to the CGI task */
+
+  nbytes = hc->read_idx - hc->checked_idx;
+  nllvdbg("nbytes: %d contentlength: %d\n", nbytes, hc->contentlength);
+  if (nbytes > 0)
+    {
+      if (httpd_write(cc->wrfd, &(hc->read_buf[hc->checked_idx]), nbytes) != nbytes)
+        {
+          nlldbg("httpd_write failed\n");
+          return 1;
+        }
+    }
+
+  cc->inbuf.contentlength = hc->contentlength;
+  cc->inbuf.nbytes        = nbytes;
+
+  /* Then perform the interposition */
+
+  indone  = false;
+  outdone = false;
+
+  nllvdbg("Interposing\n");
+  cgi_semgive();  /* Not safe to reference hc after this point */
+  do
+    {
+      (void)fdwatch(fw, 1000);
+
+      /* Check for incoming data from the remote client to the CGI task */
+
+      if (!indone && fdwatch_check_fd(fw, cc->connfd))
+        {
+          /* Transfer data from the client to the CGI program (POST) */
+
+          nllvdbg("Interpose input\n");
+          indone = cgi_interpose_input(cc);
+          if (indone)
+            {
+              fdwatch_del_fd(fw, cc->connfd);
+            }
+        }
+
+      /* Check for outgoing data from the CGI task to the remote client */
+
+      if (fdwatch_check_fd(fw, cc->rdfd))
+        {
+          /* Handle receipt of headers and CGI program response (GET) */
+
+          nllvdbg("Interpose output\n");
+          outdone = cgi_interpose_output(cc);
+        }
+
+      /* No outgoing data... is the child task still running?   Use kill()
+       * kill() with signal number == 0 does not actually send a signal, but
+       * can be used to check if the target task exists.  If the task exists
+       * but is hung, then you might enable CONFIG_THTTPD_CGI_TIMELIMIT to
+       * kill the task.  However, killing the task could cause other problems
+       * (consider resetting the microprocessor instead).
+       */
+
+      else if (kill(child, 0) != 0)
+        {
+          nllvdbg("CGI no longer running: %d\n", errno);
+          outdone = true;
+        }
+  }
+  while (!outdone);
+  err = 0;
+
+  /* Get rid of watch structures */
+
+errout_with_watch:
+  fdwatch_uninitialize(fw);
+
+  /* Free output buffer memory */
+
+errout_with_outbuffer:
+  httpd_free(cc->outbuf.buffer);
+
+  /* Close all descriptors */
+
+errout_with_descriptors:
+  close(cc->wrfd);
+  close(cc->rdfd);
+
+errout_with_cgiconn:
+  close(cc->connfd);
+  httpd_free(cc);
+
+errout:
+  nllvdbg("Return %d\n", err);
+  if (err != 0)
+    {
+      INTERNALERROR("errout");
+      httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
+      httpd_write_response(hc);
+      cgi_semgive();
+    }
+  return err;
+}
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+int cgi(httpd_conn *hc)
+{
+  char arg[16];
+  char *argv[1];
+  pid_t child;
+  int   retval = ERROR;
+
+  /* Set up a semaphore to hold off the make THTTPD thread until the CGI
+   * threads are configured (basically until the file descriptors are all
+   * dup'ed and can be closed by the main thread).
+   */
+
+  sem_init(&g_cgisem, 0, 0);
+
+  if (hc->method == METHOD_GET || hc->method == METHOD_POST)
+    {
+#ifdef CONFIG_THTTPD_CGILIMIT
+      if (hc->hs->cgi_count >= CONFIG_THTTPD_CGILIMIT)
+        {
+          httpd_send_err(hc, 503, httpd_err503title, "", httpd_err503form,
+                         hc->encodedurl);
+          goto errout_with_sem;
+        }
+#endif
+      ++hc->hs->cgi_count;
+      httpd_clear_ndelay(hc->conn_fd);
+
+      /* Start the child task.  We use a trampoline task here so that we can
+       * safely muck with the file descriptors before actually started the CGI
+       * task.
+       */
+
+      snprintf(arg, 16, "%p", hc); /* task_create doesn't handle binary arguments. */
+      argv[0] = arg;
+
+#ifndef CONFIG_CUSTOM_STACK
+      child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY,
+                          CONFIG_THTTPD_CGI_STACKSIZE,
+                          (main_t)cgi_child, (const char **)argv);
+#else
+      child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY,
+                          (main_t)cgi_child, (const char **)argv);
+#endif
+      if (child < 0)
+        {
+          ndbg("task_create: %d\n", errno);
+          INTERNALERROR("task_create");
+          httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
+          goto errout_with_sem;
+        }
+
+      ndbg("Started CGI task %d for file '%s'\n", child, hc->expnfilename);
+
+      /* Wait for the CGI threads to become initialized */
+
+      cgi_semtake();
+
+      hc->bytes_sent    = CONFIG_THTTPD_CGI_BYTECOUNT;
+      hc->should_linger = false;
+    }
+  else
+    {
+      NOTIMPLEMENTED("CGI");
+      httpd_send_err(hc, 501, err501title, "", err501form, httpd_method_str(hc->method));
+      goto errout_with_sem;
+    }
+
+  /* Successfully started */
+
+  retval = OK;
+
+errout_with_sem:
+  sem_destroy(&g_cgisem);
+  return retval;
+}
+
+#if CONFIG_THTTPD_CGI_TIMELIMIT > 0
+static void cgi_kill(ClientData client_data, struct timeval *nowP)
+{
+  pid_t pid = (pid_t)client_data.i;
+
+  /* task_delete() is a very evil API.  It can leave memory stranded! */
+
+  nlldbg("Killing CGI child: %d\n", pid);
+  if (task_delete(pid) != 0)
+    {
+      nlldbg("task_delete() failed: %d\n", errno);
+    }
+}
+#endif
+
+#endif /* CONFIG_THTTPD && CONFIG_THTTPD_CGI_PATTERN */
+
diff --git a/apps/netutils/thttpd/thttpd_cgi.h b/apps/netutils/thttpd/thttpd_cgi.h
new file mode 100755
index 000000000..2d98e25ec
--- /dev/null
+++ b/apps/netutils/thttpd/thttpd_cgi.h
@@ -0,0 +1,61 @@
+/****************************************************************************

+ * netutils/thttpd/thttpd_cgi.h

+ * CGI support

+ *

+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.

+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>

+ *

+ * Derived from the file libhttpd.c in the original THTTPD package:

+ *

+ *   Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer <jef@mail.acme.com>.

+ *   All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+ * SUCH DAMAGE.

+ *

+ ****************************************************************************/

+

+#ifndef __HTTPD_CGI_H

+#define __HTTPD_CGI_H

+

+/****************************************************************************

+ * Included Files

+ ****************************************************************************/

+

+#include <nuttx/config.h>

+

+#include "config.h"

+#include "libhttpd.h"

+

+#if defined(CONFIG_THTTPD) && defined(CONFIG_THTTPD_CGI_PATTERN)

+

+/****************************************************************************

+ * Public Function Prototypes

+ ****************************************************************************/

+

+extern int cgi(httpd_conn *hc);

+#if CONFIG_THTTPD_CGI_TIMELIMIT > 0

+static void cgi_kill(ClientData client_data, struct timeval *now);

+#endif

+

+#endif /* CONFIG_THTTPD && CONFIG_THTTPD_CGI_PATTERN */

+#endif /* __HTTPD_CGI_H */

diff --git a/apps/netutils/thttpd/thttpd_strings.c b/apps/netutils/thttpd/thttpd_strings.c
new file mode 100755
index 000000000..82836ee99
--- /dev/null
+++ b/apps/netutils/thttpd/thttpd_strings.c
@@ -0,0 +1,179 @@
+/****************************************************************************

+ * netutils/thttpd/thttpd_strings.c

+ * HTTP strings

+ *

+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.

+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>

+ *

+ * Derived from the file of the same name in the original THTTPD package:

+ *

+ *   Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer <jef@mail.acme.com>.

+ *   All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+ * SUCH DAMAGE.

+ *

+ ****************************************************************************/

+

+/****************************************************************************

+ * Included Files

+ ****************************************************************************/

+

+#include <nuttx/config.h>

+

+#include <stdio.h>

+#include <string.h>

+#include <ctype.h>

+

+#include "config.h"

+#include "thttpd_strings.h"

+

+#ifdef CONFIG_THTTPD

+

+/****************************************************************************

+ * Public Data

+ ****************************************************************************/

+

+/* This is the 'root' of the Filesystem as seen by the HTTP client */

+

+const char httpd_root[] = CONFIG_THTTPD_PATH;

+

+/* HTPP status */

+

+const char ok200title[]  = "OK";

+const char ok206title[]  = "Partial Content";

+

+const char err302title[] = "Found";

+const char err302form[]  = "The actual URL is '%s'.\n";

+

+const char err304title[] = "Not Modified";

+

+const char httpd_err400title[]  = "Bad Request";

+const char httpd_err400form[]   = "Your request has bad syntax or is inherently impossible to satisfy.\n";

+

+#ifdef CONFIG_THTTPD_AUTH_FILE

+const char err401title[] = "Unauthorized";

+const char err401form[]  = "Authorization required for the URL '%s'.\n";

+#endif

+

+const char err403title[] = "Forbidden";

+#ifndef EXPLICIT_ERROR_PAGES

+const char err403form[]  = "You do not have permission to get URL '%s' from this server.\n";

+#endif

+

+const char err404title[] = "Not Found";

+const char err404form[]  = "The requested URL '%s' was not found on this server.\n";

+

+const char httpd_err408title[]  = "Request Timeout";

+const char httpd_err408form[]   = "No request appeared within a reasonable time period.\n";

+

+const char err500title[] = "Internal Error";

+const char err500form[]  = "There was an unusual problem serving the requested URL '%s'.\n";

+

+const char err501title[] = "Not Implemented";

+const char err501form[]  = "The requested method '%s' is not implemented by this server.\n";

+

+const char httpd_err503title[] = "Service Temporarily Overloaded";

+const char httpd_err503form[]  = "The requested URL '%s' is temporarily overloaded.  Please try again later.\n";

+

+/* HTML strings */

+

+const char html_crlf[]      = "\r\n";

+const char html_html[]      = "<HTML>\r\n";

+const char html_endhtml[]   = "</HTML>\r\n";

+const char html_hdtitle[]   = "<HEAD><TITLE>";

+const char html_titlehd[]   = "</TITLE></HEAD>\r\n";

+const char html_body[]      = "<BODY BGCOLOR=\"#99cc99\" TEXT=\"#000000\" LINK=\"#2020ff\" VLINK=\"#4040cc\">\r\n";

+const char html_endbody[]   = "</BODY>\r\n";

+const char html_hdr2[]      = "<H2>";

+const char html_endhdr2[]   = "</H2>";

+

+/****************************************************************************

+ * Private Functions

+ ****************************************************************************/

+

+static int hexit(char nibble)

+{

+  if (nibble >= '0' && nibble <= '9')

+    {

+      return nibble - '0';

+    }

+  else if (nibble >= 'a' && nibble <= 'f')

+    {

+      return nibble - 'a' + 10;

+    }

+  else if (nibble >= 'A' && nibble <= 'F')

+    {

+      return nibble - 'A' + 10;

+    }

+  return 0;

+}

+

+/****************************************************************************

+ * Public Functions

+ ****************************************************************************/

+

+/* Copies and decodes a string.  It's ok for from and to to be the same string. */

+

+void httpd_strdecode(char *to, char *from)

+{

+  for (; *from != '\0'; ++to, ++from)

+    {

+      if (from[0] == '%' && isxdigit(from[1]) && isxdigit(from[2]))

+        {

+          *to = hexit(from[1]) * 16 + hexit(from[2]);

+          from += 2;

+        }

+      else

+        {

+          *to = *from;

+        }

+    }

+  *to = '\0';

+}

+

+/* Copies and encodes a string. */

+

+#ifdef CONFIG_THTTPD_GENERATE_INDICES

+static void httpd_strencode(char *to, int tosize, char *from)

+{

+  int tolen;

+

+  for (tolen = 0; *from != '\0' && tolen + 4 < tosize; ++from)

+    {

+      if (isalnum(*from) || strchr("/_.-~", *from) != NULL)

+        {

+          *to = *from;

+          ++to;

+          ++tolen;

+        }

+      else

+        {

+          (void)sprintf(to, "%%%02x", (int)*from & 0xff);

+          to += 3;

+          tolen += 3;

+        }

+    }

+  *to = '\0';

+}

+#endif /* CONFIG_THTTPD_GENERATE_INDICES */

+#endif /* CONFIG_THTTPD */

diff --git a/apps/netutils/thttpd/thttpd_strings.h b/apps/netutils/thttpd/thttpd_strings.h
new file mode 100755
index 000000000..5bbaf7948
--- /dev/null
+++ b/apps/netutils/thttpd/thttpd_strings.h
@@ -0,0 +1,123 @@
+/****************************************************************************

+ * netutils/thttpd/thttpd_strings.h

+ * HTTP strings

+ *

+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.

+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>

+ *

+ * Derived from the file of the same name in the original THTTPD package:

+ *

+ *   Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer <jef@mail.acme.com>.

+ *   All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+ * SUCH DAMAGE.

+ *

+ ****************************************************************************/

+

+#ifndef __NETUTILS_THTTPD_THTTPD_STRINGS_H

+#define __NETUTILS_THTTPD_THTTPD_STRINGS_H

+

+/****************************************************************************

+ * Included Files

+ ****************************************************************************/

+

+#include <nuttx/config.h>

+

+#include "config.h"

+

+#ifdef CONFIG_THTTPD

+

+/****************************************************************************

+ * Public Data

+ ****************************************************************************/

+

+/* This is the 'root' of the Filesystem as seen by the HTTP client */

+

+extern const char httpd_root[];

+

+/* HTPP status */

+

+extern const char ok200title[];

+extern const char ok206title[];

+

+extern const char err302title[];

+extern const char err302form[];

+

+extern const char err304title[];

+

+extern const char httpd_err400title[];

+extern const char httpd_err400form[];

+

+#ifdef CONFIG_THTTPD_AUTH_FILE

+extern const char err401title[];

+extern const char err401form[];

+#endif

+

+extern const char err403title[];

+#ifndef EXPLICIT_ERROR_PAGES

+extern const char err403form[];

+#endif

+

+extern const char err404title[];

+extern const char err404form[];

+

+extern const char httpd_err408title[];

+extern const char httpd_err408form[];

+

+extern const char err500title[];

+extern const char err500form[];

+

+extern const char err501title[];

+extern const char err501form[];

+

+extern const char httpd_err503title[];

+extern const char httpd_err503form[];

+

+/* HTML strings */

+

+extern const char html_crlf[];

+extern const char html_html[];

+extern const char html_endhtml[];

+extern const char html_hdtitle[];

+extern const char html_titlehd[];

+extern const char html_body[];

+extern const char html_endbody[];

+extern const char html_hdr2[];

+extern const char html_endhdr2[];

+

+/****************************************************************************

+ * Public Functions

+ ****************************************************************************/

+

+/* Copies and decodes a string.  It's ok for from and to to be the same string. */

+

+extern void httpd_strdecode(char *to, char *from);

+

+/* Copies and encodes a string. */

+

+#ifdef CONFIG_THTTPD_GENERATE_INDICES

+extern void httpd_strencode(char *to, int tosize, char *from);

+#endif

+

+#endif /* CONFIG_THTTPD */

+#endif /* __NETUTILS_THTTPD_THTTPD_STRINGS_H */

diff --git a/apps/netutils/thttpd/timers.c b/apps/netutils/thttpd/timers.c
new file mode 100644
index 000000000..8edd7b21b
--- /dev/null
+++ b/apps/netutils/thttpd/timers.c
@@ -0,0 +1,365 @@
+/****************************************************************************
+ * netutils/thttpd/timers.c
+ * Simple Timer Routines
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in the original THTTPD package:
+ *
+ *   Copyright © 1995,1998,2000 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <sys/time.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <debug.h>
+
+#include "thttpd_alloc.h"
+#include "timers.h"
+
+/****************************************************************************
+ * Pre-Processor Definitons
+ ****************************************************************************/
+
+#define HASH_SIZE 67
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static Timer *timers[HASH_SIZE];
+static Timer *free_timers;
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+ClientData JunkClientData;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static unsigned int hash(Timer *tmr)
+{
+  /* We can hash on the trigger time, even though it can change over the
+   * life of a timer via the periodic bit.
+   * This is because both of those guys call l_resort(), which  * recomputes
+   * the hash and moves the timer to the appropriate list.
+   */
+
+  return ((unsigned int)tmr->time.tv_sec ^
+          (unsigned int)tmr->time.tv_usec) % HASH_SIZE;
+}
+
+static void l_add(Timer *tmr)
+{
+  int h = tmr->hash;
+  register Timer *tmr2;
+  register Timer *tmr2prev;
+
+  tmr2 = timers[h];
+  if (tmr2 == NULL)
+    {
+      /* The list is empty. */
+      timers[h] = tmr;
+      tmr->prev = tmr->next = NULL;
+    }
+  else
+    {
+      if (tmr->time.tv_sec < tmr2->time.tv_sec ||
+          (tmr->time.tv_sec == tmr2->time.tv_sec &&
+           tmr->time.tv_usec <= tmr2->time.tv_usec))
+        {
+          /* The new timer goes at the head of the list. */
+
+          timers[h] = tmr;
+          tmr->prev = NULL;
+          tmr->next = tmr2;
+          tmr2->prev = tmr;
+        }
+      else
+        {
+          /* Walk the list to find the insertion point. */
+
+          for (tmr2prev = tmr2, tmr2 = tmr2->next; tmr2 != NULL;
+               tmr2prev = tmr2, tmr2 = tmr2->next)
+            {
+              if (tmr->time.tv_sec < tmr2->time.tv_sec ||
+                  (tmr->time.tv_sec == tmr2->time.tv_sec &&
+                   tmr->time.tv_usec <= tmr2->time.tv_usec))
+                {
+                  /* Found it. */
+                  tmr2prev->next = tmr;
+                  tmr->prev = tmr2prev;
+                  tmr->next = tmr2;
+                  tmr2->prev = tmr;
+                  return;
+                }
+            }
+
+          /* Oops, got to the end of the list.  Add to tail. */
+
+          tmr2prev->next = tmr;
+          tmr->prev = tmr2prev;
+          tmr->next = NULL;
+        }
+    }
+}
+
+static void l_remove(Timer *tmr)
+{
+  int h = tmr->hash;
+
+  if (tmr->prev == NULL)
+    {
+      timers[h] = tmr->next;
+    }
+  else
+    {
+      tmr->prev->next = tmr->next;
+    }
+
+  if (tmr->next != NULL)
+    {
+      tmr->next->prev = tmr->prev;
+    }
+}
+
+static void l_resort(Timer *tmr)
+{
+  /* Remove the timer from its old list. */
+
+  l_remove(tmr);
+
+  /* Recompute the hash. */
+
+  tmr->hash = hash(tmr);
+
+  /* And add it back in to its new list, sorted correctly. */
+
+  l_add(tmr);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void tmr_init(void)
+{
+  int h;
+
+  for (h = 0; h < HASH_SIZE; ++h)
+    {
+      timers[h] = NULL;
+    }
+
+  free_timers = NULL;
+}
+
+Timer *tmr_create(struct timeval *now, TimerProc *timer_proc,
+                  ClientData client_data, long msecs, int periodic)
+{
+  Timer *tmr;
+
+  if (free_timers != NULL)
+    {
+      tmr = free_timers;
+      free_timers = tmr->next;
+    }
+  else
+    {
+      tmr = (Timer*)httpd_malloc(sizeof(Timer));
+      if (!tmr)
+        {
+          return NULL;
+        }
+    }
+
+  tmr->timer_proc  = timer_proc;
+  tmr->client_data = client_data;
+  tmr->msecs       = msecs;
+  tmr->periodic    = periodic;
+
+  if (now != NULL)
+    {
+      tmr->time = *now;
+    }
+  else
+    {
+      (void)gettimeofday(&tmr->time, NULL);
+    }
+
+  tmr->time.tv_sec  += msecs / 1000L;
+  tmr->time.tv_usec += (msecs % 1000L) * 1000L;
+  if (tmr->time.tv_usec >= 1000000L)
+    {
+      tmr->time.tv_sec  += tmr->time.tv_usec / 1000000L;
+      tmr->time.tv_usec %= 1000000L;
+    }
+  tmr->hash = hash(tmr);
+
+  /* Add the new timer to the proper active list. */
+
+  l_add(tmr);
+  return tmr;
+}
+
+long tmr_mstimeout(struct timeval *now)
+{
+  int h;
+  int gotone;
+  long msecs, m;
+  register Timer *tmr;
+
+  gotone = 0;
+  msecs  = 0;
+
+  /* Since the lists are sorted, we only need to look at the  * first timer on
+   * each one.
+   */
+
+  for (h = 0; h < HASH_SIZE; ++h)
+    {
+      tmr = timers[h];
+      if (tmr != NULL)
+        {
+          m = (tmr->time.tv_sec - now->tv_sec) * 1000L +
+            (tmr->time.tv_usec - now->tv_usec) / 1000L;
+          if (!gotone)
+            {
+              msecs = m;
+              gotone = 1;
+            }
+          else if (m < msecs)
+            {
+              msecs = m;
+            }
+        }
+    }
+
+  if (!gotone)
+    {
+      return INFTIM;
+    }
+
+  if (msecs <= 0)
+    {
+      msecs = 0;
+    }
+
+  return msecs;
+}
+
+void tmr_run(struct timeval *now)
+{
+  int h;
+  Timer *tmr;
+  Timer *next;
+
+  for (h = 0; h < HASH_SIZE; ++h)
+    {
+      for (tmr = timers[h]; tmr != NULL; tmr = next)
+        {
+          next = tmr->next;
+
+          /* Since the lists are sorted, as soon as we find a timer  * that isn'tmr 
+           * ready yet, we can go on to the next list
+           */
+
+          if (tmr->time.tv_sec > now->tv_sec ||
+              (tmr->time.tv_sec == now->tv_sec && tmr->time.tv_usec > now->tv_usec))
+            {
+              break;
+            }
+
+          (tmr->timer_proc)(tmr->client_data, now);
+          if (tmr->periodic)
+            {
+              /* Reschedule. */
+
+              tmr->time.tv_sec += tmr->msecs / 1000L;
+              tmr->time.tv_usec += (tmr->msecs % 1000L) * 1000L;
+              if (tmr->time.tv_usec >= 1000000L)
+                {
+                  tmr->time.tv_sec += tmr->time.tv_usec / 1000000L;
+                  tmr->time.tv_usec %= 1000000L;
+                }
+              l_resort(tmr);
+            }
+          else
+            {
+              tmr_cancel(tmr);
+            }
+        }
+    }
+}
+
+void tmr_cancel(Timer *tmr)
+{
+  /* Remove it from its active list. */
+
+  l_remove(tmr);
+
+  /* And put it on the free list. */
+
+  tmr->next   = free_timers;
+  free_timers = tmr;
+  tmr->prev   = NULL;
+}
+
+void tmr_cleanup(void)
+{
+  Timer *tmr;
+
+  while (free_timers != NULL)
+    {
+      tmr = free_timers;
+      free_timers = tmr->next;
+      httpd_free((void*)tmr);
+    }
+}
+
+void tmr_destroy(void)
+{
+  int h;
+
+  for (h = 0; h < HASH_SIZE; ++h)
+    {
+      while (timers[h] != NULL)
+        {
+          tmr_cancel(timers[h]);
+        }
+    }
+  tmr_cleanup();
+}
diff --git a/apps/netutils/thttpd/timers.h b/apps/netutils/thttpd/timers.h
new file mode 100644
index 000000000..2d28d3558
--- /dev/null
+++ b/apps/netutils/thttpd/timers.h
@@ -0,0 +1,136 @@
+/****************************************************************************
+ * netutils/thttpd/timers.h
+ * Header file for THTTPD timers package
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Derived from the file of the same name in THTTPD:
+ *
+ *   Copyright © 1995,1998,1999,2000 by Jef Poskanzer <jef@mail.acme.com>.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __NETUTILS_THTTPD_TIMERS_H
+#define __NETUTILS_THTTPD_TIMERS_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <time.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef INFTIM
+#  define INFTIM -1
+#endif
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* ClientData is a random value that tags along with a timer.  The client
+ * can use it for whatever, and it gets passed to the callback when the
+ * timer triggers.
+ */
+
+typedef union
+{
+  void *p;
+  int   i;
+  long  l;
+} ClientData;
+
+/* The TimerProc gets called when the timer expires.  It gets passed
+ * the ClientData associated with the timer, and a timeval in case
+ * it wants to schedule another timer.
+ */
+
+typedef void TimerProc(ClientData client_data, struct timeval *nowP);
+
+/* The Timer struct. */
+
+typedef struct TimerStruct
+{
+  TimerProc          *timer_proc;
+  ClientData          client_data;
+  long                msecs;
+  int                 periodic;
+  struct timeval      time;
+  struct TimerStruct *prev;
+  struct TimerStruct *next;
+  int hash;
+} Timer;
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+extern ClientData JunkClientData;       /* For use when you don't care */
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Initialize the timer package. */
+
+extern void tmr_init(void);
+
+/* Set up a timer, either periodic or one-shot. Returns (Timer*) 0 on errors. */
+
+extern Timer *tmr_create(struct timeval *nowP, TimerProc * timer_proc,
+                         ClientData client_data, long msecs, int periodic);
+
+/* Returns a timeout in milliseconds indicating how long until the next timer
+ * triggers.  You can just put the call to this routine right in your poll().
+ * Returns INFTIM (-1) if no timers are pending.
+ */
+
+extern long tmr_mstimeout(struct timeval *nowP);
+
+/* Run the list of timers. Your main program needs to call this every so often. */
+
+extern void tmr_run(struct timeval *nowP);
+
+/* Deschedule a timer.  Note that non-periodic timers are automatically
+ * descheduled when they run, so you don't have to call this on them.
+ */
+
+extern void tmr_cancel(Timer *timer);
+
+/* Clean up the timers package, freeing any unused storage. */
+
+extern void tmr_cleanup(void);
+
+/* Cancel all timers and free storage, usually in preparation for exitting. */
+
+extern void tmr_destroy(void);
+
+#endif /* __NETUTILS_THTTPD_TIMERS_H */
+