utils: add uh_htmlescape() helper

[project/uhttpd.git] / utils.c

diff --git a/utils.c b/utils.c
index 3b868e3..1c61c41 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -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;
 
-       return true;
+       /* RFC2616 10.2.5, 10.3.5 */
+       if (cl->http_code == 204 || cl->http_code == 304)
+               return false;
+
+       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");
 }
 
@@ -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 len;
+       char *p, *copy;
+
+       for (p = str, len = 1; *p; p++)
+               if (is_html_special_char(*p))
+                       len += 6; /* &#x??; */
+               else
+                       len++;
+
+       copy = calloc(1, len);
+
+       if (!copy)
+               return NULL;
+
+       for (p = copy; *str; str++)
+               if (is_html_special_char(*str))
+                       p += sprintf(p, "&#x%02x;", (unsigned int)*str);
+               else
+                       *p++ = *str;
+
+       return copy;
+}