diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index d6d3ec61d2b..fc78a9dace9 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -543,7 +543,7 @@ CONFIG_THTTPD_CGI_STACKSIZE=1024
CONFIG_THTTPD_CGI_BYTECOUNT=20000
CONFIG_THTTPD_CGI_TIMELIMIT=0
CONFIG_THTTPD_CHARSET="iso-8859-1"
-CONFIG_THTTPD_IOBUFFERSIZE=256
+CONFIG_THTTPD_IOBUFFERSIZE=1024
#CONFIG_THTTPD_INDEX_NAMES
CONFIG_AUTH_FILE=n
CONFIG_THTTPD_LISTEN_BACKLOG=8
diff --git a/lib/lib_strcasecmp.c b/lib/lib_strcasecmp.c
index 425a3e639f4..d9c5e5636c0 100644
--- a/lib/lib_strcasecmp.c
+++ b/lib/lib_strcasecmp.c
@@ -54,10 +54,10 @@
#ifndef CONFIG_ARCH_STRCMP
int strcasecmp(const char *cs, const char *ct)
{
- register signed char result;
+ register int result;
for (;;)
{
- if ((result = toupper(*cs) - toupper(*ct)) != 0 || !*cs)
+ if ((result = (int)toupper(*cs) - (int)toupper(*ct)) != 0 || !*cs)
{
break;
}
diff --git a/lib/lib_strncasecmp.c b/lib/lib_strncasecmp.c
index 5b35bfff1e9..c34396a502b 100644
--- a/lib/lib_strncasecmp.c
+++ b/lib/lib_strncasecmp.c
@@ -54,10 +54,10 @@
#ifndef CONFIG_ARCH_STRNCASECMP
int strncasecmp(const char *cs, const char *ct, size_t nb)
{
- register signed char result = 0;
+ register int result = 0;
for (; nb > 0; nb--)
{
- if ((result = toupper(*cs) - toupper(*ct)) != 0 || !*cs)
+ if ((result = (int)toupper(*cs) - (int)toupper(*ct)) != 0 || !*cs)
{
break;
}
diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c
index 1fe609dffe4..238f91076cb 100644
--- a/netutils/thttpd/libhttpd.c
+++ b/netutils/thttpd/libhttpd.c
@@ -136,13 +136,13 @@ struct cgi_outbuffer_s
static void free_httpd_server(httpd_server *hs);
static int initialize_listen_socket(httpd_sockaddr *saP);
-static void add_response(httpd_conn *hc, char *str);
-static void send_mime(httpd_conn *hc, int status, char *title, char *encodings,
- char *extraheads, char *type, off_t length, time_t mod);
-static void send_response(httpd_conn *hc, int status, char *title,
- char *extraheads, char *form, char *arg);
+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(char *str, char *dfstr, int dfsize);
+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);
@@ -234,41 +234,51 @@ static size_t str_alloc_size = 0;
* HTTP Strings
****************************************************************************/
-static char *ok200title = "OK";
-static char *ok206title = "Partial Content";
+static const char ok200title[] = "OK";
+static const char ok206title[] = "Partial Content";
-static char *err302title = "Found";
-static char *err302form = "The actual URL is '%s'.\n";
+static const char err302title[] = "Found";
+static const char err302form[] = "The actual URL is '%s'.\n";
-static char *err304title = "Not Modified";
+static const char err304title[] = "Not Modified";
-char *httpd_err400title = "Bad Request";
-char *httpd_err400form = "Your request has bad syntax or is inherently impossible to satisfy.\n";
+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
-static char *err401title = "Unauthorized";
-static char *err401form = "Authorization required for the URL '%s'.\n";
+static const char err401title[] = "Unauthorized";
+static const char err401form[] = "Authorization required for the URL '%s'.\n";
#endif
-static char *err403title = "Forbidden";
+static const char err403title[] = "Forbidden";
#ifndef EXPLICIT_ERROR_PAGES
-static char *err403form = "You do not have permission to get URL '%s' from this server.\n";
+static const char err403form[] = "You do not have permission to get URL '%s' from this server.\n";
#endif
-static char *err404title = "Not Found";
-static char *err404form = "The requested URL '%s' was not found on this server.\n";
+static const char err404title[] = "Not Found";
+static const char err404form[] = "The requested URL '%s' was not found on this server.\n";
-char *httpd_err408title = "Request Timeout";
-char *httpd_err408form = "No request appeared within a reasonable time period.\n";
+const char httpd_err408title[] = "Request Timeout";
+const char httpd_err408form[] = "No request appeared within a reasonable time period.\n";
-static char *err500title = "Internal Error";
-static char *err500form = "There was an unusual problem serving the requested URL '%s'.\n";
+static const char err500title[] = "Internal Error";
+static const char err500form[] = "There was an unusual problem serving the requested URL '%s'.\n";
-static char *err501title = "Not Implemented";
-static char *err501form = "The requested method '%s' is not implemented by this server.\n";
+static const char err501title[] = "Not Implemented";
+static const char err501form[] = "The requested method '%s' is not implemented by this server.\n";
-char *httpd_err503title = "Service Temporarily Overloaded";
-char *httpd_err503form = "The requested URL '%s' is temporarily overloaded. Please try again later.\n";
+static const char httpd_err503title[] = "Service Temporarily Overloaded";
+static const char httpd_err503form[] = "The requested URL '%s' is temporarily overloaded. Please try again later.\n";
+
+static const char html_crlf[] = "\r\n";
+static const char html_html[] = "\r\n";
+static const char html_endhtml[] = "\r\n";
+static const char html_hdtitle[] = "";
+static const char html_titlehd[] = "\r\n";
+static const char html_body[] = "\r\n";
+static const char html_endbody[] = "\r\n";
+static const char html_hdr2[] = "";
+static const char html_endhdr2[] = "
";
/****************************************************************************
* Private Functions
@@ -365,12 +375,12 @@ static int initialize_listen_socket(httpd_sockaddr *saP)
/* Append a string to the buffer waiting to be sent as response. */
-static void add_response(httpd_conn *hc, char *str)
+static void add_response(httpd_conn *hc, const char *str)
{
int resplen;
int len;
- len = strlen(str);
+ len = strlen(str);
resplen = hc->buflen + len;
if (resplen > CONFIG_THTTPD_IOBUFFERSIZE)
@@ -384,8 +394,8 @@ static void add_response(httpd_conn *hc, char *str)
hc->buflen = resplen;
}
-static void send_mime(httpd_conn *hc, int status, char *title, char *encodings,
- char *extraheads, char *type, off_t length, time_t mod)
+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";
@@ -491,21 +501,27 @@ static void send_mime(httpd_conn *hc, int status, char *title, char *encodings,
}
}
-static void send_response(httpd_conn *hc, int status, char *title, char *extraheads,
- char *form, char *arg)
+static void send_response(httpd_conn *hc, int status, const char *title, const char *extraheads,
+ const char *form, const char *arg)
{
- char defanged_arg[1000], buf[2000];
+ char defanged[72];
+ char buf[128];
- send_mime(hc, status, title, "", extraheads, "text/html; charset=%s",
- (off_t) - 1, (time_t) 0);
- (void)snprintf(buf, sizeof(buf), "\
-\n\
-%d %s\n\
-\n\
-%d %s
\n", status, title, status, title);
+ 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);
- defang(arg, defanged_arg, sizeof(defanged_arg));
- (void)snprintf(buf, sizeof(buf), form, defanged_arg);
+ 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))
@@ -523,19 +539,18 @@ static void send_response(httpd_conn *hc, int status, char *title, char *extrahe
static void send_response_tail(httpd_conn *hc)
{
- char buf[1000];
-
- (void)snprintf(buf, sizeof(buf), "\
-
\n\
-%s\n\
-\n\
-\n", CONFIG_THTTPD_SERVER_ADDRESS, "thttpd");
- add_response(hc, buf);
+ add_response(hc, "
\r\n");
+ add_response(hc, "thttpd");
+ add_response(hc, "\r\n");
+ add_response(hc, html_endbody);
+ add_response(hc, html_endhtml);
}
-static void defang(char *str, char *dfstr, int dfsize)
+static void defang(const char *str, char *dfstr, int dfsize)
{
- char *cp1;
+ const char *cp1;
char *cp2;
for (cp1 = str, cp2 = dfstr;
@@ -1720,20 +1735,23 @@ static void ls_child(int argc, char **argv)
if (fp == (FILE *) 0)
{
ndbg("fdopen: %d\n", errno);
+ INTERNALERROR("fdopen");
httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
httpd_write_response(hc);
closedir(dirp);
exit(1);
}
- (void)fprintf(fp, "\
-\n\
-Index of %s\n\
-\n\
-Index of %s
\n\
-\n\
-mode links bytes last-changed name\n\
-
", hc->encodedurl, hc->encodedurl);
+ 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("\r\nmode links bytes last-changed name\r\n
", fp);
/* Read in names. */
@@ -1923,7 +1941,9 @@ mode links bytes last-changed name\n\
nameptrs[i], linkprefix, link, fileclass);
}
- (void)fprintf(fp, "
\n\n");
+ fputs("
", fp);
+ fputs(html_endbody, fp);
+ fputs(html_endhtml, fp);
(void)fclose(fp);
exit(0);
}
@@ -2003,6 +2023,7 @@ static int ls(httpd_conn *hc)
{
ndbg("task_create: %d\n", errno);
closedir(dirp);
+ INTERNALERROR("task_create");
httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
return -1;
}
@@ -2028,6 +2049,7 @@ static int ls(httpd_conn *hc)
else
{
closedir(dirp);
+ NOTIMPLEMENTED(httpd_method_str(hc->method));
httpd_send_err(hc, 501, err501title, "", err501form, httpd_method_str(hc->method));
return -1;
}
@@ -2319,7 +2341,7 @@ static inline int cgi_interpose_output(httpd_conn *hc, int rfd, char *inbuffer,
ssize_t nbytes_read;
char *br;
int status;
- char *title;
+ const char *title;
char *cp;
/* Make sure the connection is in blocking mode. It should already be
@@ -2342,7 +2364,9 @@ static inline int cgi_interpose_output(httpd_conn *hc, int rfd, char *inbuffer,
* EAGAIN is not an error, but it is still cause to return.
*/
- nbytes_read = read(rfd, inbuffer, sizeof(inbuffer));
+ nbytes_read = read(hc->conn_fd, inbuffer, sizeof(inbuffer));
+ nvdbg("Read %d bytes from fd %d\n", nbytes_read, hc->conn_fd);
+
if (nbytes_read < 0)
{
if (errno != EINTR)
@@ -2361,6 +2385,7 @@ static inline int cgi_interpose_output(httpd_conn *hc, int rfd, char *inbuffer,
if (nbytes_read <= 0)
{
+ nvdbg("End-of-file\n");
br = &(hdr->buffer[hdr->len]);
hdr->state = CGI_OUTBUFFER_HEADERREAD;
}
@@ -2372,12 +2397,14 @@ static inline int cgi_interpose_output(httpd_conn *hc, int rfd, char *inbuffer,
(void)memcpy(&(hdr->buffer[hdr->len]), inbuffer, nbytes_read);
hdr->len += nbytes_read;
hdr->buffer[hdr->len] = '\0';
+ nvdbg("Header bytes accumulated: %d\n", hdr->len);
/* Check for end of header */
if ((br = strstr(hdr->buffer, "\015\012\015\012")) != NULL ||
(br = strstr(hdr->buffer, "\012\012")) != NULL)
{
+ nvdbg("End-of-header\n");
hdr->state = CGI_OUTBUFFER_HEADERREAD;
}
else
@@ -2430,7 +2457,8 @@ static inline int cgi_interpose_output(httpd_conn *hc, int rfd, char *inbuffer,
/* Write the status line. */
- switch (status)
+ nvdbg("Status: %d\n", status);
+ switch (status)
{
case 200:
title = ok200title;
@@ -2445,6 +2473,7 @@ static inline int cgi_interpose_output(httpd_conn *hc, int rfd, char *inbuffer,
break;
case 400:
+ BADREQUEST("status");
title = httpd_err400title;
break;
@@ -2467,10 +2496,12 @@ static inline int cgi_interpose_output(httpd_conn *hc, int rfd, char *inbuffer,
break;
case 500:
+ INTERNALERROR("status");
title = err500title;
break;
case 501:
+ NOTIMPLEMENTED("status");
title = err501title;
break;
@@ -2510,6 +2541,8 @@ static inline int cgi_interpose_output(httpd_conn *hc, int rfd, char *inbuffer,
*/
nbytes_read = read(rfd, inbuffer, sizeof(inbuffer));
+ nvdbg("Read %d bytes from fd %d\n", nbytes_read, rfd);
+
if (nbytes_read < 0)
{
if (errno != EINTR)
@@ -2528,6 +2561,7 @@ static inline int cgi_interpose_output(httpd_conn *hc, int rfd, char *inbuffer,
if (nbytes_read == 0)
{
+ nvdbg("End-of-file\n");
close(hc->conn_fd);
close(rfd);
hdr->state = CGI_OUTBUFFER_DONE;
@@ -2789,6 +2823,7 @@ errout_with_descriptors:
close(rfd);
close(hc->conn_fd);
+ INTERNALERROR("errout");
httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
httpd_write_response(hc);
return err;
@@ -2834,6 +2869,7 @@ static int cgi(httpd_conn *hc)
if (child < 0)
{
ndbg("task_create: %d\n", errno);
+ INTERNALERROR("task_create");
httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
return -1;
}
@@ -2846,6 +2882,7 @@ static int cgi(httpd_conn *hc)
}
else
{
+ NOTIMPLEMENTED("CGI");
httpd_send_err(hc, 501, err501title, "", err501form, httpd_method_str(hc->method));
return -1;
}
@@ -2873,6 +2910,7 @@ static int really_start_request(httpd_conn *hc, struct timeval *nowP)
if (hc->method != METHOD_GET && hc->method != METHOD_HEAD &&
hc->method != METHOD_POST)
{
+ NOTIMPLEMENTED("really start");
httpd_send_err(hc, 501, err501title, "", err501form,
httpd_method_str(hc->method));
return -1;
@@ -2881,6 +2919,7 @@ static int really_start_request(httpd_conn *hc, struct timeval *nowP)
/* Stat the file. */
if (stat(hc->expnfilename, &hc->sb) < 0)
{
+ INTERNALERROR(hc->expnfilename);
httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
return -1;
}
@@ -3002,6 +3041,7 @@ static int really_start_request(httpd_conn *hc, struct timeval *nowP)
cp = expand_filename(indexname, &pi, hc->tildemapped);
if (cp == (char *)0 || pi[0] != '\0')
{
+ INTERNALERROR(indexname);
httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
return -1;
}
@@ -3141,6 +3181,7 @@ static int really_start_request(httpd_conn *hc, struct timeval *nowP)
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;
}
@@ -3493,14 +3534,16 @@ void httpd_realloc_str(char **strP, size_t * maxsizeP, size_t size)
}
}
-void httpd_send_err(httpd_conn *hc, int status, char *title, char *extraheads,
- char *form, char *arg)
+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')
{
@@ -3508,6 +3551,7 @@ void httpd_send_err(httpd_conn *hc, int status, char *title, char *extraheads,
"%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;
}
}
@@ -3515,10 +3559,10 @@ void httpd_send_err(httpd_conn *hc, int status, char *title, char *extraheads,
/* Try server-wide error page. */
- (void)snprintf(filename, sizeof(filename),
- "%s/err%d.html", CONFIG_THTTPD_ERROR_DIRECTORY, status);
+ (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;
}
@@ -3533,7 +3577,7 @@ void httpd_send_err(httpd_conn *hc, int status, char *title, char *extraheads,
#endif
}
-char *httpd_method_str(int method)
+const char *httpd_method_str(int method)
{
switch (method)
{
@@ -3891,21 +3935,27 @@ int httpd_parse_request(httpd_conn *hc)
char *pi;
hc->checked_idx = 0; /* reset */
- method_str = bufgets(hc);
+ 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");
+ url += strspn(url, " \t\012\015");
+ nvdbg("url: \"%s\"\n", url);
protocol = strpbrk(url, " \t\012\015");
+ nvdbg("protocol: \"%s\"\n", protocol ? protocol : "");
+
if (!protocol)
{
- protocol = "HTTP/0.9";
+ protocol = "HTTP/0.9";
hc->mime_flag = FALSE;
}
else
@@ -3934,14 +3984,16 @@ int httpd_parse_request(httpd_conn *hc)
{
if (!hc->one_one)
{
+ BADREQUEST("one_one");
httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
return -1;
}
reqhost = url + 7;
- url = strchr(reqhost, '/');
+ url = strchr(reqhost, '/');
if (!url)
{
+ BADREQUEST("reqhost-1");
httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
return -1;
}
@@ -3949,6 +4001,7 @@ int httpd_parse_request(httpd_conn *hc)
if (strchr(reqhost, '/') != (char *)0 || reqhost[0] == '.')
{
+ BADREQUEST("reqhost-2");
httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
return -1;
}
@@ -3960,6 +4013,7 @@ int httpd_parse_request(httpd_conn *hc)
if (*url != '/')
{
+ BADREQUEST("url-2");
httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
return -1;
}
@@ -3978,6 +4032,7 @@ int httpd_parse_request(httpd_conn *hc)
}
else
{
+ NOTIMPLEMENTED(method_str);
httpd_send_err(hc, 501, err501title, "", err501form, method_str);
return -1;
}
@@ -4019,6 +4074,7 @@ int httpd_parse_request(httpd_conn *hc)
(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;
}
@@ -4059,8 +4115,8 @@ int httpd_parse_request(httpd_conn *hc)
if (strchr(hc->hdrhost, '/') != (char *)0 ||
hc->hdrhost[0] == '.')
{
- httpd_send_err(hc, 400, httpd_err400title, "",
- httpd_err400form, "");
+ BADREQUEST("hdrhost");
+ httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
return -1;
}
}
@@ -4236,6 +4292,7 @@ int httpd_parse_request(httpd_conn *hc)
if (hc->reqhost[0] == '\0' && hc->hdrhost[0] == '\0')
{
+ BADREQUEST("reqhost-3");
httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
return -1;
}
@@ -4288,6 +4345,7 @@ int httpd_parse_request(httpd_conn *hc)
#ifdef CONFIG_THTTPD_VHOST
if (!vhost_map(hc))
{
+ INTERNALERROR("VHOST");
httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
return -1;
}
@@ -4300,6 +4358,7 @@ int httpd_parse_request(httpd_conn *hc)
cp = expand_filename(hc->expnfilename, &pi, hc->tildemapped);
if (!cp)
{
+ INTERNALERROR(hc->expnfilename);
httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
return -1;
}
diff --git a/netutils/thttpd/libhttpd.h b/netutils/thttpd/libhttpd.h
index fc0aa490be8..66410d343a5 100644
--- a/netutils/thttpd/libhttpd.h
+++ b/netutils/thttpd/libhttpd.h
@@ -68,7 +68,58 @@
#define NEW(t,n) ((t*) malloc( sizeof(t) * (n) ))
#define RENEW(o,t,n) ((t*) realloc( (void*) o, sizeof(t) * (n) ))
-/* Methods. */
+/* 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
@@ -263,21 +314,19 @@ 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, char *title,
- char *extraheads, char *form, char *arg);
+extern void httpd_send_err(httpd_conn *hc, int status, const char *title,
+ const char *extraheads, const char *form, const char *arg);
/* Some error messages. */
-extern char *httpd_err400title;
-extern char *httpd_err400form;
-extern char *httpd_err408title;
-extern char *httpd_err408form;
-extern char *httpd_err503title;
-extern char *httpd_err503form;
+extern const char httpd_err400title[];
+extern const char httpd_err400form[];
+extern const char httpd_err408title[];
+extern const char httpd_err408form[];
/* Generate a string representation of a method number. */
-extern char *httpd_method_str(int method);
+extern const char *httpd_method_str(int method);
/* Reallocate a string. */
diff --git a/netutils/thttpd/thttpd.c b/netutils/thttpd/thttpd.c
index d89d6dd06a2..093d8929427 100644
--- a/netutils/thttpd/thttpd.c
+++ b/netutils/thttpd/thttpd.c
@@ -307,6 +307,7 @@ static void handle_read(struct connect_s *conn, struct timeval *tv)
{
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);
@@ -317,12 +318,13 @@ static void handle_read(struct connect_s *conn, struct timeval *tv)
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 glanc
+ /* 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.
@@ -332,6 +334,9 @@ static void handle_read(struct connect_s *conn, struct timeval *tv)
{
return;
}
+
+ ndbg("read(fd=%d) failed: %d\n", hc->conn_fd, errno);
+ BADREQUEST("read");
goto errout_with_400;
}
@@ -345,7 +350,8 @@ static void handle_read(struct connect_s *conn, struct timeval *tv)
case GR_NO_REQUEST:
return;
case GR_BAD_REQUEST:
- goto errout_with_400;
+ BADREQUEST("httpd_got_request");
+ goto errout_with_400;
}
/* Yes. Try parsing and resolving it */
@@ -408,6 +414,7 @@ static void handle_read(struct connect_s *conn, struct timeval *tv)
if (actual != conn->offset)
{
ndbg("fseek to %d failed: offset=%d errno=%d\n", conn->offset, actual, errno);
+ BADREQUEST("lseek");
goto errout_with_400;
}
@@ -421,6 +428,7 @@ static void handle_read(struct connect_s *conn, struct timeval *tv)
return;
errout_with_400:
+ BADREQUEST("errout");
httpd_send_err(hc, 400, httpd_err400title, "", httpd_err400form, "");
errout_with_connection: