X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=utils.c;h=d990d7dfd2bee38ac13db87ddffb452a14836e0f;hb=8109b957b668a90d4a9b00f1e9db3d8d7e491bf3;hp=742e2809559b414324fab5473bc4066f10a22ec5;hpb=6dfd8f67760b977ec7e345aece872c2a40a3be1e;p=project%2Fuhttpd.git

diff --git a/utils.c b/utils.c
index 742e280..d990d7d 100644
--- a/utils.c
+++ b/utils.c
@@ -1,20 +1,20 @@
 /*
  * uhttpd - Tiny single-threaded httpd
  *
- *   Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- *   Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <ctype.h>
@@ -25,16 +25,23 @@ bool uh_use_chunked(struct client *cl)
 	if (cl->request.version != UH_HTTP_VER_1_1)
 		return false;
 
-	if (cl->request.method == UH_HTTP_MSG_HEAD)
+	if (cl->request.method == UH_HTTP_MSG_HEAD || cl->request.method == UH_HTTP_MSG_OPTIONS)
+		return false;
+
+	/* RFC2616 10.2.5, 10.3.5 */
+	if (cl->http_code == 204 || cl->http_code == 304)
 		return false;
 
-	return true;
+	return !cl->request.disable_chunked;
 }
 
 void uh_chunk_write(struct client *cl, const void *data, int len)
 {
 	bool chunked = uh_use_chunked(cl);
 
+	if (cl->state == CLIENT_STATE_CLEANUP)
+		return;
+
 	uloop_timeout_set(&cl->timeout, conf.network_timeout * 1000);
 	if (chunked)
 		ustream_printf(cl->us, "%X\r\n", len);
@@ -49,6 +56,9 @@ void uh_chunk_vprintf(struct client *cl, const char *format, va_list arg)
 	va_list arg2;
 	int len;
 
+	if (cl->state == CLIENT_STATE_CLEANUP)
+		return;
+
 	uloop_timeout_set(&cl->timeout, conf.network_timeout * 1000);
 	if (!uh_use_chunked(cl)) {
 		ustream_vprintf(cl->us, format, arg);
@@ -81,6 +91,9 @@ void uh_chunk_eof(struct client *cl)
 	if (!uh_use_chunked(cl))
 		return;
 
+	if (cl->state == CLIENT_STATE_CLEANUP)
+		return;
+
 	ustream_printf(cl->us, "0\r\n\r\n");
 }
 
@@ -122,7 +135,7 @@ int uh_urlencode(char *buf, int blen, const char *src, int slen)
 {
 	int i;
 	int len = 0;
-	const char hex[] = "0123456789abcdef";
+	static const char hex[] = "0123456789abcdef";
 
 	for (i = 0; (i < slen) && (len < blen); i++)
 	{
@@ -195,6 +208,10 @@ bool uh_path_match(const char *prefix, const char *url)
 {
 	int len = strlen(prefix);
 
+	/* A prefix of "/" will - by definition - match any url */
+	if (prefix[0] == '/' && len == 1)
+		return true;
+
 	if (strncmp(url, prefix, len) != 0)
 		return false;
 
@@ -232,3 +249,45 @@ bool uh_addr_rfc1918(struct uh_addr *addr)
 
 	return 0;
 }
+
+
+static bool is_html_special_char(char c)
+{
+	switch (c)
+	{
+	case 0x22:
+	case 0x26:
+	case 0x27:
+	case 0x3C:
+	case 0x3E:
+		return true;
+
+	default:
+		return false;
+	}
+}
+
+char *uh_htmlescape(const char *str)
+{
+	size_t i, len;
+	char *p, *copy;
+
+	for (i = 0, len = 1; str[i]; i++)
+		if (is_html_special_char(str[i]))
+			len += 6; /* &#x??; */
+		else
+			len++;
+
+	copy = calloc(1, len);
+
+	if (!copy)
+		return NULL;
+
+	for (i = 0, p = copy; str[i]; i++)
+		if (is_html_special_char(str[i]))
+			p += sprintf(p, "&#x%02x;", (unsigned int)str[i]);
+		else
+			*p++ = str[i];
+
+	return copy;
+}