diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-13 16:58:49 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-13 16:58:49 +0000 |
commit | d2e8f9f549edebda7029cca0d5704e09ea93f679 (patch) | |
tree | 069643454e1936db021400ccac6a92c4587bc240 /apps/netutils/thttpd | |
parent | 05a6ec77b4fc41cc5b866b9228ee037fbf3eb902 (diff) | |
download | px4-nuttx-d2e8f9f549edebda7029cca0d5704e09ea93f679.tar.gz px4-nuttx-d2e8f9f549edebda7029cca0d5704e09ea93f679.tar.bz2 px4-nuttx-d2e8f9f549edebda7029cca0d5704e09ea93f679.zip |
Email address change in apps/
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5143 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/netutils/thttpd')
-rw-r--r-- | apps/netutils/thttpd/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/cgi-src/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/cgi-src/phf.c | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/cgi-src/redirect.c | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/cgi-src/ssi.c | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/config.h | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/fdwatch.c | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/fdwatch.h | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/libhttpd.c | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/libhttpd.h | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/mime_types.h | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/tdate_parse.c | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/tdate_parse.h | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/thttpd.c | 2 | ||||
-rwxr-xr-x | apps/netutils/thttpd/thttpd_alloc.c | 2 | ||||
-rwxr-xr-x | apps/netutils/thttpd/thttpd_alloc.h | 2 | ||||
-rwxr-xr-x | apps/netutils/thttpd/thttpd_cgi.c | 2 | ||||
-rwxr-xr-x | apps/netutils/thttpd/thttpd_cgi.h | 122 | ||||
-rwxr-xr-x | apps/netutils/thttpd/thttpd_strings.c | 358 | ||||
-rwxr-xr-x | apps/netutils/thttpd/thttpd_strings.h | 246 | ||||
-rw-r--r-- | apps/netutils/thttpd/timers.c | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/timers.h | 2 |
22 files changed, 382 insertions, 382 deletions
diff --git a/apps/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile index 4978c7c79..f505125da 100644 --- a/apps/netutils/thttpd/Makefile +++ b/apps/netutils/thttpd/Makefile @@ -2,7 +2,7 @@ # apps/netutils/thttpd/Makefile # # Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/cgi-src/Makefile b/apps/netutils/thttpd/cgi-src/Makefile index 46b41fd62..60efb08e7 100644 --- a/apps/netutils/thttpd/cgi-src/Makefile +++ b/apps/netutils/thttpd/cgi-src/Makefile @@ -2,7 +2,7 @@ # apps/netutils/cgi-src/Makefile # # Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/cgi-src/phf.c b/apps/netutils/thttpd/cgi-src/phf.c index 2541481c4..575bf85ba 100644 --- a/apps/netutils/thttpd/cgi-src/phf.c +++ b/apps/netutils/thttpd/cgi-src/phf.c @@ -3,7 +3,7 @@ * Cracker trap * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/cgi-src/redirect.c b/apps/netutils/thttpd/cgi-src/redirect.c index 84f3b8712..d91a715da 100644 --- a/apps/netutils/thttpd/cgi-src/redirect.c +++ b/apps/netutils/thttpd/cgi-src/redirect.c @@ -3,7 +3,7 @@ * Simple redirection CGI program * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/cgi-src/ssi.c b/apps/netutils/thttpd/cgi-src/ssi.c index 4afb141f9..c8bdab4ed 100644 --- a/apps/netutils/thttpd/cgi-src/ssi.c +++ b/apps/netutils/thttpd/cgi-src/ssi.c @@ -3,7 +3,7 @@ * Server-side-includes CGI program * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/config.h b/apps/netutils/thttpd/config.h index f1b4c2d4c..d238fabd8 100644 --- a/apps/netutils/thttpd/config.h +++ b/apps/netutils/thttpd/config.h @@ -2,7 +2,7 @@ * netutils/thttpd/config.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/fdwatch.c b/apps/netutils/thttpd/fdwatch.c index 24ea7a1e0..50ea65e78 100644 --- a/apps/netutils/thttpd/fdwatch.c +++ b/apps/netutils/thttpd/fdwatch.c @@ -3,7 +3,7 @@ * FD watcher routines for poll() * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/fdwatch.h b/apps/netutils/thttpd/fdwatch.h index e60727db1..38a5ecbc0 100644 --- a/apps/netutils/thttpd/fdwatch.h +++ b/apps/netutils/thttpd/fdwatch.h @@ -2,7 +2,7 @@ * netutils/thttpd/fdwatch.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in THTTPD: * diff --git a/apps/netutils/thttpd/libhttpd.c b/apps/netutils/thttpd/libhttpd.c index 05831b335..ee0ac999c 100644 --- a/apps/netutils/thttpd/libhttpd.c +++ b/apps/netutils/thttpd/libhttpd.c @@ -3,7 +3,7 @@ * HTTP Protocol Library * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/libhttpd.h b/apps/netutils/thttpd/libhttpd.h index f2e39e04d..b245a6edf 100644 --- a/apps/netutils/thttpd/libhttpd.h +++ b/apps/netutils/thttpd/libhttpd.h @@ -3,7 +3,7 @@ * HTTP Protocol Library Definitions * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/mime_types.h b/apps/netutils/thttpd/mime_types.h index cd0c514a8..958192758 100644 --- a/apps/netutils/thttpd/mime_types.h +++ b/apps/netutils/thttpd/mime_types.h @@ -6,7 +6,7 @@ * contained no copyright information. * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/tdate_parse.c b/apps/netutils/thttpd/tdate_parse.c index d9ace1b41..e91ab5ebb 100644 --- a/apps/netutils/thttpd/tdate_parse.c +++ b/apps/netutils/thttpd/tdate_parse.c @@ -3,7 +3,7 @@ * Parse string dates into internal form, stripped-down version * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/tdate_parse.h b/apps/netutils/thttpd/tdate_parse.h index 301d5467a..eea82d7cb 100644 --- a/apps/netutils/thttpd/tdate_parse.h +++ b/apps/netutils/thttpd/tdate_parse.h @@ -2,7 +2,7 @@ * netutils/thttpd/fdwatch.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in THTTPD: * diff --git a/apps/netutils/thttpd/thttpd.c b/apps/netutils/thttpd/thttpd.c index 3b49c0141..1b074902d 100644 --- a/apps/netutils/thttpd/thttpd.c +++ b/apps/netutils/thttpd/thttpd.c @@ -3,7 +3,7 @@ * Tiny HTTP Server * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/thttpd_alloc.c b/apps/netutils/thttpd/thttpd_alloc.c index 71c71397b..12872f192 100755 --- a/apps/netutils/thttpd/thttpd_alloc.c +++ b/apps/netutils/thttpd/thttpd_alloc.c @@ -2,7 +2,7 @@ * netutils/thttpd/thttpd_alloc.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/thttpd_alloc.h b/apps/netutils/thttpd/thttpd_alloc.h index 1f24bc2e9..e8c8f80c3 100755 --- a/apps/netutils/thttpd/thttpd_alloc.h +++ b/apps/netutils/thttpd/thttpd_alloc.h @@ -2,7 +2,7 @@ * netutils/thttpd/thttpd_alloc.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/thttpd_cgi.c b/apps/netutils/thttpd/thttpd_cgi.c index 0c23a2587..9c0de509b 100755 --- a/apps/netutils/thttpd/thttpd_cgi.c +++ b/apps/netutils/thttpd/thttpd_cgi.c @@ -3,7 +3,7 @@ * CGI support * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file libhttpd.c in the original THTTPD package: * diff --git a/apps/netutils/thttpd/thttpd_cgi.h b/apps/netutils/thttpd/thttpd_cgi.h index 2d98e25ec..47923223c 100755 --- a/apps/netutils/thttpd/thttpd_cgi.h +++ b/apps/netutils/thttpd/thttpd_cgi.h @@ -1,61 +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 */
+/**************************************************************************** + * netutils/thttpd/thttpd_cgi.h + * CGI support + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * 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 index 82836ee99..5795e3754 100755 --- a/apps/netutils/thttpd/thttpd_strings.c +++ b/apps/netutils/thttpd/thttpd_strings.c @@ -1,179 +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 */
+/**************************************************************************** + * netutils/thttpd/thttpd_strings.c + * HTTP strings + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * 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 index 5bbaf7948..dc05f6295 100755 --- a/apps/netutils/thttpd/thttpd_strings.h +++ b/apps/netutils/thttpd/thttpd_strings.h @@ -1,123 +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 */
+/**************************************************************************** + * netutils/thttpd/thttpd_strings.h + * HTTP strings + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * 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 index 8edd7b21b..dc94306b0 100644 --- a/apps/netutils/thttpd/timers.c +++ b/apps/netutils/thttpd/timers.c @@ -3,7 +3,7 @@ * Simple Timer Routines * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/timers.h b/apps/netutils/thttpd/timers.h index 2d28d3558..7c8f9f201 100644 --- a/apps/netutils/thttpd/timers.h +++ b/apps/netutils/thttpd/timers.h @@ -3,7 +3,7 @@ * Header file for THTTPD timers package * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from the file of the same name in THTTPD: * |