diff --git a/docs/README.md b/docs/README.md
index 781aa861..63af5fec 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2509,6 +2509,8 @@ Print formatted string into a string buffer, just like `snprintf()`
 standard function does, but in a predictable way that does not depend on
 the C library or the build environment. The return value can be larger
 than the buffer length `len`, in which case the overflow bytes are not printed.
+Mongoose library is often used to exchange data in JSON format, therefore a
+non-standard `%Q` specifier for formatting JSON strings is also supported.
 
 Parameters:
 - `buf` - Pointer to pointer to output buffer
@@ -2520,6 +2522,7 @@ Supported format specifiers:
 - `hhu`, `hu`, `u`, `lu`, `llu` - same but for unsigned variants
 - `hhx`, `hx`, `x`, `lx`, `llx` - same, unsigned and hex output
 - `s` - `for char *`
+- `Q` - `for char *`, outputs double-quoted JSON-escaped string (extension)
 - `c` - `for char`
 - `%` - `the `%` character itself
 - `p` - for any pointer, prints `0x.....` hex value
diff --git a/examples/device-dashboard/Makefile b/examples/device-dashboard/Makefile
index eaea59bb..423bd428 100644
--- a/examples/device-dashboard/Makefile
+++ b/examples/device-dashboard/Makefile
@@ -1,5 +1,5 @@
 PROG ?= example
-SOURCES ?= ../../mongoose.c main.c net.c mjson.c packed_fs.c
+SOURCES ?= ../../mongoose.c main.c net.c packed_fs.c
 CFLAGS ?= -I../.. -DMG_ENABLE_PACKED_FS=1 -DMG_ENABLE_LINES=1 $(EXTRA)
 FILES_TO_EMBED ?= $(wildcard web_root/*)
 ROOT ?= $(realpath $(CURDIR)/../../..)
diff --git a/examples/device-dashboard/mjson.c b/examples/device-dashboard/mjson.c
deleted file mode 100644
index ced0d89d..00000000
--- a/examples/device-dashboard/mjson.c
+++ /dev/null
@@ -1,1066 +0,0 @@
-// Copyright (c) 2018-2020 Cesanta Software Limited
-// All rights reserved
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include <float.h>
-#include <math.h>
-
-#include "mjson.h"
-
-#if defined(_MSC_VER)
-#define alloca(x) _alloca(x)
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1700
-#define va_copy(x, y) (x) = (y)
-#define isinf(x) !_finite(x)
-#define isnan(x) _isnan(x)
-#endif
-
-static double mystrtod(const char *str, char **end);
-
-static int mjson_esc(int c, int esc) {
-  const char *p, *esc1 = "\b\f\n\r\t\\\"", *esc2 = "bfnrt\\\"";
-  for (p = esc ? esc1 : esc2; *p != '\0'; p++) {
-    if (*p == c) return esc ? esc2[p - esc1] : esc1[p - esc2];
-  }
-  return 0;
-}
-
-static int mjson_escape(int c) {
-  return mjson_esc(c, 1);
-}
-
-static int mjson_pass_string(const char *s, int len) {
-  int i;
-  for (i = 0; i < len; i++) {
-    if (s[i] == '\\' && i + 1 < len && mjson_escape(s[i + 1])) {
-      i++;
-    } else if (s[i] == '\0') {
-      return MJSON_ERROR_INVALID_INPUT;
-    } else if (s[i] == '"') {
-      return i;
-    }
-  }
-  return MJSON_ERROR_INVALID_INPUT;
-}
-
-int mjson(const char *s, int len, mjson_cb_t cb, void *ud) {
-  enum { S_VALUE, S_KEY, S_COLON, S_COMMA_OR_EOO } expecting = S_VALUE;
-  unsigned char nesting[MJSON_MAX_DEPTH];
-  int i, depth = 0;
-#define MJSONCALL(ev) \
-  if (cb != NULL && cb(ev, s, start, i - start + 1, ud)) return i + 1;
-
-// In the ascii table, the distance between `[` and `]` is 2.
-// Ditto for `{` and `}`. Hence +2 in the code below.
-#define MJSONEOO()                                                     \
-  do {                                                                 \
-    if (c != nesting[depth - 1] + 2) return MJSON_ERROR_INVALID_INPUT; \
-    depth--;                                                           \
-    if (depth == 0) {                                                  \
-      MJSONCALL(tok);                                                  \
-      return i + 1;                                                    \
-    }                                                                  \
-  } while (0)
-
-  for (i = 0; i < len; i++) {
-    int start = i;
-    unsigned char c = ((unsigned char *) s)[i];
-    int tok = c;
-    if (c == ' ' || c == '\t' || c == '\n' || c == '\r') continue;
-    // printf("- %c [%.*s] %d %d\n", c, i, s, depth, expecting);
-    switch (expecting) {
-      case S_VALUE:
-        if (c == '{') {
-          if (depth >= (int) sizeof(nesting)) return MJSON_ERROR_TOO_DEEP;
-          nesting[depth++] = c;
-          expecting = S_KEY;
-          break;
-        } else if (c == '[') {
-          if (depth >= (int) sizeof(nesting)) return MJSON_ERROR_TOO_DEEP;
-          nesting[depth++] = c;
-          break;
-        } else if (c == ']' && depth > 0) {  // Empty array
-          MJSONEOO();
-        } else if (c == 't' && i + 3 < len && memcmp(&s[i], "true", 4) == 0) {
-          i += 3;
-          tok = MJSON_TOK_TRUE;
-        } else if (c == 'n' && i + 3 < len && memcmp(&s[i], "null", 4) == 0) {
-          i += 3;
-          tok = MJSON_TOK_NULL;
-        } else if (c == 'f' && i + 4 < len && memcmp(&s[i], "false", 5) == 0) {
-          i += 4;
-          tok = MJSON_TOK_FALSE;
-        } else if (c == '-' || ((c >= '0' && c <= '9'))) {
-          char *end = NULL;
-          mystrtod(&s[i], &end);
-          if (end != NULL) i += (int) (end - &s[i] - 1);
-          tok = MJSON_TOK_NUMBER;
-        } else if (c == '"') {
-          int n = mjson_pass_string(&s[i + 1], len - i - 1);
-          if (n < 0) return n;
-          i += n + 1;
-          tok = MJSON_TOK_STRING;
-        } else {
-          return MJSON_ERROR_INVALID_INPUT;
-        }
-        if (depth == 0) {
-          MJSONCALL(tok);
-          return i + 1;
-        }
-        expecting = S_COMMA_OR_EOO;
-        break;
-
-      case S_KEY:
-        if (c == '"') {
-          int n = mjson_pass_string(&s[i + 1], len - i - 1);
-          if (n < 0) return n;
-          i += n + 1;
-          tok = MJSON_TOK_KEY;
-          expecting = S_COLON;
-        } else if (c == '}') {  // Empty object
-          MJSONEOO();
-          expecting = S_COMMA_OR_EOO;
-        } else {
-          return MJSON_ERROR_INVALID_INPUT;
-        }
-        break;
-
-      case S_COLON:
-        if (c == ':') {
-          expecting = S_VALUE;
-        } else {
-          return MJSON_ERROR_INVALID_INPUT;
-        }
-        break;
-
-      case S_COMMA_OR_EOO:
-        if (depth <= 0) return MJSON_ERROR_INVALID_INPUT;
-        if (c == ',') {
-          expecting = (nesting[depth - 1] == '{') ? S_KEY : S_VALUE;
-        } else if (c == ']' || c == '}') {
-          MJSONEOO();
-        } else {
-          return MJSON_ERROR_INVALID_INPUT;
-        }
-        break;
-    }
-    MJSONCALL(tok);
-  }
-  return MJSON_ERROR_INVALID_INPUT;
-}
-
-struct msjon_get_data {
-  const char *path;     // Lookup json path
-  int pos;              // Current path position
-  int d1;               // Current depth of traversal
-  int d2;               // Expected depth of traversal
-  int i1;               // Index in an array
-  int i2;               // Expected index in an array
-  int obj;              // If the value is array/object, offset where it starts
-  const char **tokptr;  // Destination
-  int *toklen;          // Destination length
-  int tok;              // Returned token
-};
-
-#include <stdio.h>
-
-static int plen1(const char *s) {
-  int i = 0, n = 0;
-  while (s[i] != '\0' && s[i] != '.' && s[i] != '[')
-    n++, i += s[i] == '\\' ? 2 : 1;
-  // printf("PLEN: s: [%s], [%.*s] => %d\n", s, i, s, n);
-  return n;
-}
-
-static int plen2(const char *s) {
-  int i = 0, n = 0;
-  while (s[i] != '\0' && s[i] != '.' && s[i] != '[')
-    n++, i += s[i] == '\\' ? 2 : 1;
-  // printf("PLEN: s: [%s], [%.*s] => %d\n", s, i, s, n);
-  return i;
-}
-
-static int kcmp(const char *a, const char *b, int n) {
-  int i = 0, j = 0, r = 0;
-  for (i = 0, j = 0; j < n; i++, j++) {
-    if (b[i] == '\\') i++;
-    if ((r = a[j] - b[i]) != 0) return r;
-  }
-  // printf("KCMP: a: [%.*s], b:[%.*s] ==> %d\n", n, a, i, b, r);
-  return r;
-}
-
-static int mjson_get_cb(int tok, const char *s, int off, int len, void *ud) {
-  struct msjon_get_data *d = (struct msjon_get_data *) ud;
-#if 0
-  printf("--> %2x %2d %2d %2d %2d\t %2d %2d\t'%s' '%s' '%s' '%s'\n", tok, d->d1,
-         d->d2, d->i1, d->i2, (int) off, (int) d->pos, s, d->path, s + off,
-         d->path + d->pos);
-#endif
-  if (d->tok != MJSON_TOK_INVALID) return 1;  // Found
-  if (tok == '{' || tok == '[') {
-    if (d->d1 < d->d2) d->obj = -1;
-    if (d->d1 == d->d2) d->obj = off;
-    if (d->d1 == d->d2 && tok == '[' && d->path[d->pos] == '[') {
-      d->i1 = 0;
-      d->i2 = (int) mystrtod(&d->path[d->pos + 1], NULL);
-      if (d->i1 == d->i2) {
-        while (d->path[d->pos] && d->path[d->pos] != ']') d->pos++;
-        if (d->path[d->pos] == ']') d->pos++;
-        d->d2++;
-      }
-    }
-    d->d1++;
-  } else if (tok == '}' || tok == ']') {
-    if (tok == ']' && d->d1 == d->d2) d->i1 = 0;
-    d->d1--;
-    // printf("X %s %d %d %d %d %d\n", d->path + d->pos, d->d1, d->d2, d->i1,
-    //       d->i2, d->obj);
-    if (!d->path[d->pos] && d->d1 == d->d2 && d->obj != -1) {
-      d->tok = tok - 2;
-      if (d->tokptr) *d->tokptr = s + d->obj;
-      if (d->toklen) *d->toklen = off - d->obj + 1;
-      return 1;
-    }
-  } else if (tok == ',' && d->d1 == d->d2 && d->pos &&
-             d->path[d->pos - 1] == ']') {
-    return 1;  // Not found in the current elem array
-  } else if (tok == ',' && d->d1 == d->d2 + 1 && d->path[d->pos] == '[') {
-    // printf("GG '%s' '%s'\n", d->path, &d->path[d->pos]);
-    d->i1++;
-    if (d->i1 == d->i2) {
-      while (d->path[d->pos] && d->path[d->pos] != ']') d->pos++;
-      if (d->path[d->pos] == ']') d->pos++;
-      d->d2++;
-    }
-  } else if (tok == MJSON_TOK_KEY && d->d1 == d->d2 + 1 &&
-             d->path[d->pos] == '.' && s[off] == '"' &&
-             s[off + len - 1] == '"' &&
-             plen1(&d->path[d->pos + 1]) == len - 2 &&
-             kcmp(s + off + 1, &d->path[d->pos + 1], len - 2) == 0) {
-    d->d2++;
-    d->pos += plen2(&d->path[d->pos + 1]) + 1;
-  } else if (tok == MJSON_TOK_KEY && d->d1 == d->d2) {
-    return 1;  // Exhausted path, not found
-  } else if (MJSON_TOK_IS_VALUE(tok)) {
-    // printf("T %d %d %d %d %d\n", tok, d->d1, d->d2, d->i1, d->i2);
-    if (d->d1 == d->d2 && d->i1 == d->i2 && !d->path[d->pos]) {
-      d->tok = tok;
-      if (d->tokptr) *d->tokptr = s + off;
-      if (d->toklen) *d->toklen = len;
-      return 1;
-    }
-  }
-  return 0;
-}
-
-int mjson_find(const char *s, int n, const char *jp, const char **tp, int *tl) {
-  struct msjon_get_data data = {jp, 1,  0,  0,  0,
-                                0,  -1, tp, tl, MJSON_TOK_INVALID};
-  if (jp[0] != '$') return MJSON_TOK_INVALID;
-  if (mjson(s, n, mjson_get_cb, &data) < 0) return MJSON_TOK_INVALID;
-  return data.tok;
-}
-
-int mjson_get_number(const char *s, int len, const char *path, double *v) {
-  const char *p;
-  int tok, n;
-  if ((tok = mjson_find(s, len, path, &p, &n)) == MJSON_TOK_NUMBER) {
-    if (v != NULL) *v = mystrtod(p, NULL);
-  }
-  return tok == MJSON_TOK_NUMBER ? 1 : 0;
-}
-
-int mjson_get_bool(const char *s, int len, const char *path, int *v) {
-  int tok = mjson_find(s, len, path, NULL, NULL);
-  if (tok == MJSON_TOK_TRUE && v != NULL) *v = 1;
-  if (tok == MJSON_TOK_FALSE && v != NULL) *v = 0;
-  return tok == MJSON_TOK_TRUE || tok == MJSON_TOK_FALSE ? 1 : 0;
-}
-
-static unsigned char unhex(unsigned char c) {
-  return (c >= '0' && c <= '9')   ? (unsigned char) (c - '0')
-         : (c >= 'A' && c <= 'F') ? (unsigned char) (c - '7')
-                                  : (unsigned char) (c - 'W');
-}
-
-static unsigned char mjson_unhex_nimble(const char *s) {
-  unsigned char *u = (unsigned char *) s;
-  return (unsigned char) (((unsigned char) (unhex(u[0]) << 4)) | unhex(u[1]));
-}
-
-static int mjson_unescape(const char *s, int len, char *to, int n) {
-  int i, j;
-  for (i = 0, j = 0; i < len && j < n; i++, j++) {
-    if (s[i] == '\\' && i + 5 < len && s[i + 1] == 'u') {
-      //  \uXXXX escape. We could process a simple one-byte chars
-      // \u00xx from the ASCII range. More complex chars would require
-      // dragging in a UTF8 library, which is too much for us
-      if (s[i + 2] != '0' || s[i + 3] != '0') return -1;  // Too much, give up
-      ((unsigned char *) to)[j] = mjson_unhex_nimble(s + i + 4);
-      i += 5;
-    } else if (s[i] == '\\' && i + 1 < len) {
-      int c = mjson_esc(s[i + 1], 0);
-      if (c == 0) return -1;
-      to[j] = (char) (unsigned char) c;
-      i++;
-    } else {
-      to[j] = s[i];
-    }
-  }
-  if (j >= n) return -1;
-  if (n > 0) to[j] = '\0';
-  return j;
-}
-
-int mjson_get_string(const char *s, int len, const char *path, char *to,
-                     int n) {
-  const char *p;
-  int sz;
-  if (mjson_find(s, len, path, &p, &sz) != MJSON_TOK_STRING) return -1;
-  return mjson_unescape(p + 1, sz - 2, to, n);
-}
-
-int mjson_get_hex(const char *s, int len, const char *x, char *to, int n) {
-  const char *p;
-  int i, j, sz;
-  if (mjson_find(s, len, x, &p, &sz) != MJSON_TOK_STRING) return -1;
-  for (i = j = 0; i < sz - 3 && j < n; i += 2, j++) {
-    ((unsigned char *) to)[j] = mjson_unhex_nimble(p + i + 1);
-  }
-  if (j < n) to[j] = '\0';
-  return j;
-}
-
-#if MJSON_ENABLE_BASE64
-static unsigned char mjson_base64rev(int c) {
-  if (c >= 'A' && c <= 'Z') {
-    return (unsigned char) (c - 'A');
-  } else if (c >= 'a' && c <= 'z') {
-    return (unsigned char) (c + 26 - 'a');
-  } else if (c >= '0' && c <= '9') {
-    return (unsigned char) (c + 52 - '0');
-  } else if (c == '+') {
-    return 62;
-  } else if (c == '/') {
-    return 63;
-  } else {
-    return 64;
-  }
-}
-
-int mjson_base64_dec(const char *src, int n, char *dst, int dlen) {
-  const char *end = src + n;
-  int len = 0;
-  while (src + 3 < end && len < dlen) {
-    unsigned char a = mjson_base64rev(src[0]), b = mjson_base64rev(src[1]),
-                  c = mjson_base64rev(src[2]), d = mjson_base64rev(src[3]);
-    dst[len++] = (char) (unsigned char) ((a << 2) | (b >> 4));
-    if (src[2] != '=' && len < dlen) {
-      dst[len++] = (char) (unsigned char) ((b << 4) | (c >> 2));
-      if (src[3] != '=' && len < dlen) {
-        dst[len++] = (char) (unsigned char) ((c << 6) | d);
-      }
-    }
-    src += 4;
-  }
-  if (len < dlen) dst[len] = '\0';
-  return len;
-}
-
-int mjson_get_base64(const char *s, int len, const char *path, char *to,
-                     int n) {
-  const char *p;
-  int sz;
-  if (mjson_find(s, len, path, &p, &sz) != MJSON_TOK_STRING) return 0;
-  return mjson_base64_dec(p + 1, sz - 2, to, n);
-}
-#endif  // MJSON_ENABLE_BASE64
-
-#if MJSON_ENABLE_NEXT
-struct nextdata {
-  int off, len, depth, t, vo, arrayindex;
-  int *koff, *klen, *voff, *vlen, *vtype;
-};
-
-static int next_cb(int tok, const char *s, int off, int len, void *ud) {
-  struct nextdata *d = (struct nextdata *) ud;
-  // int i;
-  switch (tok) {
-    case '{':
-    case '[':
-      if (d->depth == 0 && tok == '[') d->arrayindex = 0;
-      if (d->depth == 1 && off > d->off) {
-        d->vo = off;
-        d->t = tok == '{' ? MJSON_TOK_OBJECT : MJSON_TOK_ARRAY;
-        if (d->voff) *d->voff = off;
-        if (d->vtype) *d->vtype = d->t;
-      }
-      d->depth++;
-      break;
-    case '}':
-    case ']':
-      d->depth--;
-      if (d->depth == 1 && d->vo) {
-        d->len = off + len;
-        if (d->vlen) *d->vlen = d->len - d->vo;
-        if (d->arrayindex >= 0) {
-          if (d->koff) *d->koff = d->arrayindex;  // koff holds array index
-          if (d->klen) *d->klen = 0;              // klen holds 0
-        }
-        return 1;
-      }
-      if (d->depth == 1 && d->arrayindex >= 0) d->arrayindex++;
-      break;
-    case ',':
-    case ':':
-      break;
-    case MJSON_TOK_KEY:
-      if (d->depth == 1 && d->off < off) {
-        if (d->koff) *d->koff = off;  // And report back to the user
-        if (d->klen) *d->klen = len;  // If we have to
-      }
-      break;
-    default:
-      if (d->depth != 1) break;
-      // If we're iterating over the array
-      if (off > d->off) {
-        d->len = off + len;
-        if (d->vlen) *d->vlen = len;    // value length
-        if (d->voff) *d->voff = off;    // value offset
-        if (d->vtype) *d->vtype = tok;  // value type
-        if (d->arrayindex >= 0) {
-          if (d->koff) *d->koff = d->arrayindex;  // koff holds array index
-          if (d->klen) *d->klen = 0;              // klen holds 0
-        }
-        return 1;
-      }
-      if (d->arrayindex >= 0) d->arrayindex++;
-      break;
-  }
-  (void) s;
-  return 0;
-}
-
-int mjson_next(const char *s, int n, int off, int *koff, int *klen, int *voff,
-               int *vlen, int *vtype) {
-  struct nextdata d = {off, 0, 0, 0, 0, -1, koff, klen, voff, vlen, vtype};
-  mjson(s, n, next_cb, &d);
-  return d.len;
-}
-#endif
-
-#if MJSON_ENABLE_PRINT
-int mjson_print_fixed_buf(const char *ptr, int len, void *fndata) {
-  struct mjson_fixedbuf *fb = (struct mjson_fixedbuf *) fndata;
-  int i, left = fb->size - 1 - fb->len;
-  if (left < len) len = left;
-  for (i = 0; i < len; i++) fb->ptr[fb->len + i] = ptr[i];
-  fb->len += len;
-  fb->ptr[fb->len] = '\0';
-  return len;
-}
-
-// This function allocates memory in chunks of size MJSON_DYNBUF_CHUNK
-// to decrease memory fragmentation, when many calls are executed to
-// print e.g. a base64 string or a hex string.
-int mjson_print_dynamic_buf(const char *ptr, int len, void *fndata) {
-  char *s, *buf = *(char **) fndata;
-  size_t curlen = buf == NULL ? 0 : strlen(buf);
-  size_t new_size = curlen + (size_t) len + 1 + MJSON_DYNBUF_CHUNK;
-  new_size -= new_size % MJSON_DYNBUF_CHUNK;
-
-  if ((s = (char *) MJSON_REALLOC(buf, new_size)) == NULL) {
-    return 0;
-  } else {
-    memcpy(s + curlen, ptr, (size_t) len);
-    s[curlen + (size_t) len] = '\0';
-    *(char **) fndata = s;
-    return len;
-  }
-}
-
-int mjson_snprintf(char *buf, size_t len, const char *fmt, ...) {
-  va_list ap;
-  struct mjson_fixedbuf fb = {buf, (int) len, 0};
-  va_start(ap, fmt);
-  mjson_vprintf(mjson_print_fixed_buf, &fb, fmt, &ap);
-  va_end(ap);
-  return fb.len;
-}
-
-char *mjson_aprintf(const char *fmt, ...) {
-  va_list ap;
-  char *result = NULL;
-  va_start(ap, fmt);
-  mjson_vprintf(mjson_print_dynamic_buf, &result, fmt, &ap);
-  va_end(ap);
-  return result;
-}
-
-int mjson_print_null(const char *ptr, int len, void *userdata) {
-  (void) ptr;
-  (void) userdata;
-  return len;
-}
-
-int mjson_print_buf(mjson_print_fn_t fn, void *fnd, const char *buf, int len) {
-  return fn(buf, len, fnd);
-}
-
-int mjson_print_long(mjson_print_fn_t fn, void *fnd, long val, int is_signed) {
-  unsigned long v = (unsigned long) val, s = 0, n, i;
-  char buf[20], t;
-  if (is_signed && val < 0) buf[s++] = '-', v = (unsigned long) (-val);
-  // This loop prints a number in reverse order. I guess this is because we
-  // write numbers from right to left: least significant digit comes last.
-  // Maybe because we use Arabic numbers, and Arabs write RTL?
-  for (n = 0; v > 0; v /= 10) buf[s + n++] = "0123456789"[v % 10];
-  // Reverse a string
-  for (i = 0; i < n / 2; i++)
-    t = buf[s + i], buf[s + i] = buf[s + n - i - 1], buf[s + n - i - 1] = t;
-  if (val == 0) buf[n++] = '0';  // Handle special case
-  return fn(buf, (int) (s + n), fnd);
-}
-
-int mjson_print_int(mjson_print_fn_t fn, void *fnd, int v, int s) {
-  return mjson_print_long(fn, fnd, s ? (long) v : (long) (unsigned) v, s);
-}
-
-static int addexp(char *buf, int e, int sign) {
-  int n = 0;
-  buf[n++] = 'e';
-  buf[n++] = (char) sign;
-  if (e > 400) return 0;
-  if (e < 10) buf[n++] = '0';
-  if (e >= 100) buf[n++] = (char) (e / 100 + '0'), e -= 100 * (e / 100);
-  if (e >= 10) buf[n++] = (char) (e / 10 + '0'), e -= 10 * (e / 10);
-  buf[n++] = (char) (e + '0');
-  return n;
-}
-
-int mjson_print_dbl(mjson_print_fn_t fn, void *fnd, double d, int width) {
-  char buf[40];
-  int i, s = 0, n = 0, e = 0;
-  double t, mul, saved;
-  if (d == 0.0) return fn("0", 1, fnd);
-  if (isinf(d)) return fn(d > 0 ? "inf" : "-inf", d > 0 ? 3 : 4, fnd);
-  if (isnan(d)) return fn("nan", 3, fnd);
-  if (d < 0.0) d = -d, buf[s++] = '-';
-
-  // Round
-  saved = d;
-  mul = 1.0;
-  while (d >= 10.0 && d / mul >= 10.0) mul *= 10.0;
-  while (d <= 1.0 && d / mul <= 1.0) mul /= 10.0;
-  for (i = 0, t = mul * 5; i < width; i++) t /= 10.0;
-  d += t;
-  // Calculate exponent, and 'mul' for scientific representation
-  mul = 1.0;
-  while (d >= 10.0 && d / mul >= 10.0) mul *= 10.0, e++;
-  while (d < 1.0 && d / mul < 1.0) mul /= 10.0, e--;
-  // printf(" --> %g %d %g %g\n", saved, e, t, mul);
-
-  if (e >= width) {
-    struct mjson_fixedbuf fb = {buf + s, (int) sizeof(buf) - s, 0};
-    n = mjson_print_dbl(mjson_print_fixed_buf, &fb, saved / mul, width);
-    // printf(" --> %.*g %d [%.*s]\n", 10, d / t, e, fb.len, fb.ptr);
-    n += addexp(buf + s + n, e, '+');
-    return fn(buf, s + n, fnd);
-  } else if (e <= -width) {
-    struct mjson_fixedbuf fb = {buf + s, (int) sizeof(buf) - s, 0};
-    n = mjson_print_dbl(mjson_print_fixed_buf, &fb, saved / mul, width);
-    // printf(" --> %.*g %d [%.*s]\n", 10, d / mul, e, fb.len, fb.ptr);
-    n += addexp(buf + s + n, -e, '-');
-    return fn(buf, s + n, fnd);
-  } else {
-    for (i = 0, t = mul; t >= 1.0 && s + n < (int) sizeof(buf); i++) {
-      int ch = (int) (d / t);
-      if (n > 0 || ch > 0) buf[s + n++] = (char) (ch + '0');
-      d -= ch * t;
-      t /= 10.0;
-    }
-    // printf(" --> [%g] -> %g %g (%d) [%.*s]\n", saved, d, t, n, s + n, buf);
-    if (n == 0) buf[s++] = '0';
-    while (t >= 1.0 && n + s < (int) sizeof(buf)) buf[n++] = '0', t /= 10.0;
-    if (s + n < (int) sizeof(buf)) buf[n + s++] = '.';
-    // printf(" 1--> [%g] -> [%.*s]\n", saved, s + n, buf);
-    for (i = 0, t = 0.1; s + n < (int) sizeof(buf) && n < width; i++) {
-      int ch = (int) (d / t);
-      buf[s + n++] = (char) (ch + '0');
-      d -= ch * t;
-      t /= 10.0;
-    }
-  }
-  while (n > 0 && buf[s + n - 1] == '0') n--;  // Trim trailing zeros
-  if (n > 0 && buf[s + n - 1] == '.') n--;     // Trim trailing dot
-  buf[s + n] = '\0';
-  return fn(buf, s + n, fnd);
-}
-
-int mjson_print_str(mjson_print_fn_t fn, void *fnd, const char *s, int len) {
-  int i, n = fn("\"", 1, fnd);
-  for (i = 0; i < len; i++) {
-    char c = (char) (unsigned char) mjson_escape(s[i]);
-    if (c) {
-      n += fn("\\", 1, fnd);
-      n += fn(&c, 1, fnd);
-    } else {
-      n += fn(&s[i], 1, fnd);
-    }
-  }
-  return n + fn("\"", 1, fnd);
-}
-
-#if MJSON_ENABLE_BASE64
-int mjson_print_b64(mjson_print_fn_t fn, void *fnd, const unsigned char *s,
-                    int n) {
-  const char *t =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  int i, len = fn("\"", 1, fnd);
-  for (i = 0; i < n; i += 3) {
-    int a = s[i], b = i + 1 < n ? s[i + 1] : 0, c = i + 2 < n ? s[i + 2] : 0;
-    char buf[4] = {t[a >> 2], t[(a & 3) << 4 | (b >> 4)], '=', '='};
-    if (i + 1 < n) buf[2] = t[(b & 15) << 2 | (c >> 6)];
-    if (i + 2 < n) buf[3] = t[c & 63];
-    len += fn(buf, sizeof(buf), fnd);
-  }
-  return len + fn("\"", 1, fnd);
-}
-#endif /* MJSON_ENABLE_BASE64 */
-
-int mjson_vprintf(mjson_print_fn_t fn, void *fnd, const char *fmt,
-                  va_list *ap) {
-  int i = 0, n = 0;
-  while (fmt[i] != '\0') {
-    if (fmt[i] == '%') {
-      char fc = fmt[++i];
-      int is_long = 0;
-      if (fc == 'l') {
-        is_long = 1;
-        fc = fmt[i + 1];
-      }
-      if (fc == 'Q') {
-        char *buf = va_arg(*ap, char *);
-        n += mjson_print_str(fn, fnd, buf ? buf : "",
-                             buf ? (int) strlen(buf) : 0);
-      } else if (strncmp(&fmt[i], ".*Q", 3) == 0) {
-        int len = va_arg(*ap, int);
-        char *buf = va_arg(*ap, char *);
-        n += mjson_print_str(fn, fnd, buf, len);
-        i += 2;
-      } else if (fc == 'd' || fc == 'u') {
-        int is_signed = (fc == 'd');
-        if (is_long) {
-          long val = va_arg(*ap, long);
-          n += mjson_print_long(fn, fnd, val, is_signed);
-          i++;
-        } else {
-          int val = va_arg(*ap, int);
-          n += mjson_print_int(fn, fnd, val, is_signed);
-        }
-      } else if (fc == 'B') {
-        const char *s = va_arg(*ap, int) ? "true" : "false";
-        n += mjson_print_buf(fn, fnd, s, (int) strlen(s));
-      } else if (fc == 's') {
-        char *buf = va_arg(*ap, char *);
-        n += mjson_print_buf(fn, fnd, buf, (int) strlen(buf));
-      } else if (strncmp(&fmt[i], ".*s", 3) == 0) {
-        int len = va_arg(*ap, int);
-        char *buf = va_arg(*ap, char *);
-        n += mjson_print_buf(fn, fnd, buf, len);
-        i += 2;
-      } else if (fc == 'g') {
-        n += mjson_print_dbl(fn, fnd, va_arg(*ap, double), 6);
-      } else if (strncmp(&fmt[i], ".*g", 3) == 0) {
-        int width = va_arg(*ap, int);
-        n += mjson_print_dbl(fn, fnd, va_arg(*ap, double), width);
-        i += 2;
-#if MJSON_ENABLE_BASE64
-      } else if (fc == 'V') {
-        int len = va_arg(*ap, int);
-        const char *buf = va_arg(*ap, const char *);
-        n += mjson_print_b64(fn, fnd, (unsigned char *) buf, len);
-#endif
-      } else if (fc == 'H') {
-        const char *hex = "0123456789abcdef";
-        int j, len = va_arg(*ap, int);
-        const unsigned char *p = va_arg(*ap, const unsigned char *);
-        n += fn("\"", 1, fnd);
-        for (j = 0; j < len; j++) {
-          n += fn(&hex[(p[j] >> 4) & 15], 1, fnd);
-          n += fn(&hex[p[j] & 15], 1, fnd);
-        }
-        n += fn("\"", 1, fnd);
-      } else if (fc == 'M') {
-        mjson_vprint_fn_t vfn = va_arg(*ap, mjson_vprint_fn_t);
-        n += vfn(fn, fnd, ap);
-      }
-      i++;
-    } else {
-      n += mjson_print_buf(fn, fnd, &fmt[i++], 1);
-    }
-  }
-  return n;
-}
-
-int mjson_printf(mjson_print_fn_t fn, void *fnd, const char *fmt, ...) {
-  va_list ap;
-  int len;
-  va_start(ap, fmt);
-  len = mjson_vprintf(fn, fnd, fmt, &ap);
-  va_end(ap);
-  return len;
-}
-#endif /* MJSON_ENABLE_PRINT */
-
-static int is_digit(int c) {
-  return c >= '0' && c <= '9';
-}
-
-/* NOTE: strtod() implementation by Yasuhiro Matsumoto. */
-static double mystrtod(const char *str, char **end) {
-  double d = 0.0;
-  int sign = 1, n = 0;
-  const char *p = str, *a = str;
-
-  /* decimal part */
-  if (*p == '-') {
-    sign = -1;
-    ++p;
-  } else if (*p == '+') {
-    ++p;
-  }
-  if (is_digit(*p)) {
-    d = (double) (*p++ - '0');
-    while (*p && is_digit(*p)) {
-      d = d * 10.0 + (double) (*p - '0');
-      ++p;
-      ++n;
-    }
-    a = p;
-  } else if (*p != '.') {
-    goto done;
-  }
-  d *= sign;
-
-  /* fraction part */
-  if (*p == '.') {
-    double f = 0.0;
-    double base = 0.1;
-    ++p;
-
-    if (is_digit(*p)) {
-      while (*p && is_digit(*p)) {
-        f += base * (*p - '0');
-        base /= 10.0;
-        ++p;
-        ++n;
-      }
-    }
-    d += f * sign;
-    a = p;
-  }
-
-  /* exponential part */
-  if ((*p == 'E') || (*p == 'e')) {
-    int i, e = 0, neg = 0;
-    p++;
-    if (*p == '-') p++, neg++;
-    if (*p == '+') p++;
-    while (is_digit(*p)) e = e * 10 + *p++ - '0';
-    if (neg) e = -e;
-#if 0
-    if (d == 2.2250738585072011 && e == -308) {
-      d = 0.0;
-      a = p;
-      goto done;
-    }
-    if (d == 2.2250738585072012 && e <= -308) {
-      d *= 1.0e-308;
-      a = p;
-      goto done;
-    }
-#endif
-    for (i = 0; i < e; i++) d *= 10;
-    for (i = 0; i < -e; i++) d /= 10;
-    a = p;
-  } else if (p > str && !is_digit(*(p - 1))) {
-    a = str;
-    goto done;
-  }
-
-done:
-  if (end) *end = (char *) a;
-  return d;
-}
-
-#if MJSON_ENABLE_MERGE
-int mjson_merge(const char *s, int n, const char *s2, int n2,
-                mjson_print_fn_t fn, void *userdata) {
-  int koff, klen, voff, vlen, t, t2, k, off = 0, len = 0, comma = 0;
-  if (n < 2) return len;
-  len += fn("{", 1, userdata);
-  while ((off = mjson_next(s, n, off, &koff, &klen, &voff, &vlen, &t)) != 0) {
-    char *path = (char *) alloca((size_t) klen + 1);
-    const char *val;
-    memcpy(path, "$.", 2);
-    memcpy(path + 2, s + koff + 1, (size_t) (klen - 2));
-    path[klen] = '\0';
-    if ((t2 = mjson_find(s2, n2, path, &val, &k)) != MJSON_TOK_INVALID) {
-      if (t2 == MJSON_TOK_NULL) continue;  // null deletes the key
-    } else {
-      val = s + voff;  // Key is not found in the update. Copy the old value.
-    }
-    if (comma) len += fn(",", 1, userdata);
-    len += fn(s + koff, klen, userdata);
-    len += fn(":", 1, userdata);
-    if (t == MJSON_TOK_OBJECT && t2 == MJSON_TOK_OBJECT) {
-      len += mjson_merge(s + voff, vlen, val, k, fn, userdata);
-    } else {
-      if (t2 != MJSON_TOK_INVALID) vlen = k;
-      len += fn(val, vlen, userdata);
-    }
-    comma = 1;
-  }
-  // Add missing keys
-  off = 0;
-  while ((off = mjson_next(s2, n2, off, &koff, &klen, &voff, &vlen, &t)) != 0) {
-    char *path = (char *) alloca((size_t) klen + 1);
-    const char *val;
-    if (t == MJSON_TOK_NULL) continue;
-    memcpy(path, "$.", 2);
-    memcpy(path + 2, s2 + koff + 1, (size_t) (klen - 2));
-    path[klen] = '\0';
-    if (mjson_find(s, n, path, &val, &vlen) != MJSON_TOK_INVALID) continue;
-    if (comma) len += fn(",", 1, userdata);
-    len += fn(s2 + koff, klen, userdata);
-    len += fn(":", 1, userdata);
-    len += fn(s2 + voff, vlen, userdata);
-    comma = 1;
-  }
-  len += fn("}", 1, userdata);
-  return len;
-}
-#endif  // MJSON_ENABLE_MERGE
-
-#if MJSON_ENABLE_PRETTY
-struct prettydata {
-  int level;
-  int len;
-  int prev;
-  const char *pad;
-  int padlen;
-  mjson_print_fn_t fn;
-  void *userdata;
-};
-
-static int pretty_cb(int ev, const char *s, int off, int len, void *ud) {
-  struct prettydata *d = (struct prettydata *) ud;
-  int i;
-  switch (ev) {
-    case '{':
-    case '[':
-      d->level++;
-      d->len += d->fn(s + off, len, d->userdata);
-      break;
-    case '}':
-    case ']':
-      d->level--;
-      if (d->prev != '[' && d->prev != '{' && d->padlen > 0) {
-        d->len += d->fn("\n", 1, d->userdata);
-        for (i = 0; i < d->level; i++)
-          d->len += d->fn(d->pad, d->padlen, d->userdata);
-      }
-      d->len += d->fn(s + off, len, d->userdata);
-      break;
-    case ',':
-      d->len += d->fn(s + off, len, d->userdata);
-      if (d->padlen > 0) {
-        d->len += d->fn("\n", 1, d->userdata);
-        for (i = 0; i < d->level; i++)
-          d->len += d->fn(d->pad, d->padlen, d->userdata);
-      }
-      break;
-    case ':':
-      d->len += d->fn(s + off, len, d->userdata);
-      if (d->padlen > 0) d->len += d->fn(" ", 1, d->userdata);
-      break;
-    case MJSON_TOK_KEY:
-      if (d->prev == '{' && d->padlen > 0) {
-        d->len += d->fn("\n", 1, d->userdata);
-        for (i = 0; i < d->level; i++)
-          d->len += d->fn(d->pad, d->padlen, d->userdata);
-      }
-      d->len += d->fn(s + off, len, d->userdata);
-      break;
-    default:
-      if (d->prev == '[' && d->padlen > 0) {
-        d->len += d->fn("\n", 1, d->userdata);
-        for (i = 0; i < d->level; i++)
-          d->len += d->fn(d->pad, d->padlen, d->userdata);
-      }
-      d->len += d->fn(s + off, len, d->userdata);
-      break;
-  }
-  d->prev = ev;
-  return 0;
-}
-
-int mjson_pretty(const char *s, int n, const char *pad, mjson_print_fn_t fn,
-                 void *userdata) {
-  struct prettydata d = {0, 0, 0, pad, (int) strlen(pad), fn, userdata};
-  if (mjson(s, n, pretty_cb, &d) < 0) return -1;
-  return d.len;
-}
-#endif  // MJSON_ENABLE_PRETTY
-
-#if MJSON_ENABLE_RPC
-struct jsonrpc_ctx jsonrpc_default_context;
-
-int mjson_globmatch(const char *s1, int n1, const char *s2, int n2) {
-  int i = 0, j = 0, ni = 0, nj = 0;
-  while (i < n1 || j < n2) {
-    if (i < n1 && j < n2 && (s1[i] == '?' || s2[j] == s1[i])) {
-      i++, j++;
-    } else if (i < n1 && (s1[i] == '*' || s1[i] == '#')) {
-      ni = i, nj = j + 1, i++;
-    } else if (nj > 0 && nj <= n2 && (s1[i - 1] == '#' || s2[j] != '/')) {
-      i = ni, j = nj;
-    } else {
-      return 0;
-    }
-  }
-  return 1;
-}
-
-void jsonrpc_return_errorv(struct jsonrpc_request *r, int code,
-                           const char *message, const char *data_fmt,
-                           va_list *ap) {
-  if (r->id_len == 0) return;
-  mjson_printf(r->fn, r->fndata,
-               "{\"id\":%.*s,\"error\":{\"code\":%d,\"message\":%Q", r->id_len,
-               r->id, code, message == NULL ? "" : message);
-  if (data_fmt != NULL) {
-    mjson_printf(r->fn, r->fndata, ",\"data\":");
-    mjson_vprintf(r->fn, r->fndata, data_fmt, ap);
-  }
-  mjson_printf(r->fn, r->fndata, "}}\n");
-}
-
-void jsonrpc_return_error(struct jsonrpc_request *r, int code,
-                          const char *message, const char *data_fmt, ...) {
-  va_list ap;
-  va_start(ap, data_fmt);
-  jsonrpc_return_errorv(r, code, message, data_fmt, &ap);
-  va_end(ap);
-}
-
-void jsonrpc_return_successv(struct jsonrpc_request *r, const char *result_fmt,
-                             va_list *ap) {
-  if (r->id_len == 0) return;
-  mjson_printf(r->fn, r->fndata, "{\"id\":%.*s,\"result\":", r->id_len, r->id);
-  if (result_fmt != NULL) {
-    mjson_vprintf(r->fn, r->fndata, result_fmt, ap);
-  } else {
-    mjson_printf(r->fn, r->fndata, "%s", "null");
-  }
-  mjson_printf(r->fn, r->fndata, "}\n");
-}
-
-void jsonrpc_return_success(struct jsonrpc_request *r, const char *result_fmt,
-                            ...) {
-  va_list ap;
-  va_start(ap, result_fmt);
-  jsonrpc_return_successv(r, result_fmt, &ap);
-  va_end(ap);
-}
-
-void jsonrpc_ctx_process(struct jsonrpc_ctx *ctx, const char *buf, int len,
-                         mjson_print_fn_t fn, void *fndata, void *ud) {
-  const char *result = NULL, *error = NULL;
-  int result_sz = 0, error_sz = 0;
-  struct jsonrpc_method *m = NULL;
-  struct jsonrpc_request r = {ctx, buf, len, 0, 0, 0, 0, 0, 0, fn, fndata, ud};
-
-  // Is is a response frame?
-  mjson_find(buf, len, "$.result", &result, &result_sz);
-  if (result == NULL) mjson_find(buf, len, "$.error", &error, &error_sz);
-  if (result_sz > 0 || error_sz > 0) {
-    if (ctx->response_cb) ctx->response_cb(buf, len, ctx->response_cb_data);
-    return;
-  }
-
-  // Method must exist and must be a string
-  if (mjson_find(buf, len, "$.method", &r.method, &r.method_len) !=
-      MJSON_TOK_STRING) {
-    mjson_printf(fn, fndata, "{\"error\":{\"code\":-32700,\"message\":%.*Q}}\n",
-                 len, buf);
-    return;
-  }
-
-  // id and params are optional
-  mjson_find(buf, len, "$.id", &r.id, &r.id_len);
-  mjson_find(buf, len, "$.params", &r.params, &r.params_len);
-
-  for (m = ctx->methods; m != NULL; m = m->next) {
-    if (mjson_globmatch(m->method, m->method_sz, r.method + 1,
-                        r.method_len - 2) > 0) {
-      if (r.params == NULL) r.params = "";
-      m->cb(&r);
-      break;
-    }
-  }
-  if (m == NULL) {
-    jsonrpc_return_error(&r, JSONRPC_ERROR_NOT_FOUND, "method not found", NULL);
-  }
-}
-
-static int jsonrpc_print_methods(mjson_print_fn_t fn, void *fndata,
-                                 va_list *ap) {
-  struct jsonrpc_ctx *ctx = va_arg(*ap, struct jsonrpc_ctx *);
-  struct jsonrpc_method *m;
-  int len = 0;
-  for (m = ctx->methods; m != NULL; m = m->next) {
-    if (m != ctx->methods) len += mjson_print_buf(fn, fndata, ",", 1);
-    len += mjson_print_str(fn, fndata, m->method, (int) strlen(m->method));
-  }
-  return len;
-}
-
-void jsonrpc_list(struct jsonrpc_request *r) {
-  jsonrpc_return_success(r, "[%M]", jsonrpc_print_methods, r->ctx);
-}
-
-void jsonrpc_ctx_init(struct jsonrpc_ctx *ctx, mjson_print_fn_t response_cb,
-                      void *response_cb_data) {
-  ctx->methods = NULL;
-  ctx->response_cb = response_cb;
-  ctx->response_cb_data = response_cb_data;
-}
-
-void jsonrpc_init(mjson_print_fn_t response_cb, void *userdata) {
-  struct jsonrpc_ctx *ctx = &jsonrpc_default_context;
-  jsonrpc_ctx_init(ctx, response_cb, userdata);
-  jsonrpc_ctx_export(ctx, MJSON_RPC_LIST_NAME, jsonrpc_list);
-}
-#endif  // MJSON_ENABLE_RPC
diff --git a/examples/device-dashboard/mjson.h b/examples/device-dashboard/mjson.h
deleted file mode 100644
index 084b320a..00000000
--- a/examples/device-dashboard/mjson.h
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright (c) 2018-2020 Cesanta Software Limited
-// All rights reserved
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#ifndef MJSON_H
-#define MJSON_H
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef MJSON_ENABLE_PRINT
-#define MJSON_ENABLE_PRINT 1
-#endif
-
-#ifndef MJSON_ENABLE_RPC
-#define MJSON_ENABLE_RPC 1
-#endif
-
-#ifndef MJSON_ENABLE_BASE64
-#define MJSON_ENABLE_BASE64 1
-#endif
-
-#ifndef MJSON_ENABLE_MERGE
-#define MJSON_ENABLE_MERGE 1
-#endif
-
-#ifndef MJSON_ENABLE_PRETTY
-#define MJSON_ENABLE_PRETTY 1
-#endif
-
-#ifndef MJSON_ENABLE_NEXT
-#define MJSON_ENABLE_NEXT 1
-#endif
-
-#ifndef MJSON_RPC_LIST_NAME
-#define MJSON_RPC_LIST_NAME "rpc.list"
-#endif
-
-#ifndef MJSON_DYNBUF_CHUNK
-#define MJSON_DYNBUF_CHUNK 256  // Allocation granularity for print_dynamic_buf
-#endif
-
-#ifndef MJSON_REALLOC
-#define MJSON_REALLOC realloc
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MJSON_ERROR_INVALID_INPUT (-1)
-#define MJSON_ERROR_TOO_DEEP (-2)
-#define MJSON_TOK_INVALID 0
-#define MJSON_TOK_KEY 1
-#define MJSON_TOK_STRING 11
-#define MJSON_TOK_NUMBER 12
-#define MJSON_TOK_TRUE 13
-#define MJSON_TOK_FALSE 14
-#define MJSON_TOK_NULL 15
-#define MJSON_TOK_ARRAY 91
-#define MJSON_TOK_OBJECT 123
-#define MJSON_TOK_IS_VALUE(t) ((t) > 10 && (t) < 20)
-
-typedef int (*mjson_cb_t)(int ev, const char *s, int off, int len, void *ud);
-
-#ifndef MJSON_MAX_DEPTH
-#define MJSON_MAX_DEPTH 20
-#endif
-
-int mjson(const char *s, int len, mjson_cb_t cb, void *ud);
-int mjson_find(const char *s, int len, const char *jp, const char **, int *);
-int mjson_get_number(const char *s, int len, const char *path, double *v);
-int mjson_get_bool(const char *s, int len, const char *path, int *v);
-int mjson_get_string(const char *s, int len, const char *path, char *to, int n);
-int mjson_get_hex(const char *s, int len, const char *path, char *to, int n);
-
-#if MJSON_ENABLE_NEXT
-int mjson_next(const char *s, int n, int off, int *koff, int *klen, int *voff,
-               int *vlen, int *vtype);
-#endif
-
-#if MJSON_ENABLE_BASE64
-int mjson_get_base64(const char *s, int len, const char *path, char *to, int n);
-int mjson_base64_dec(const char *src, int n, char *dst, int dlen);
-#endif
-
-#if MJSON_ENABLE_PRINT
-typedef int (*mjson_print_fn_t)(const char *buf, int len, void *userdata);
-typedef int (*mjson_vprint_fn_t)(mjson_print_fn_t, void *, va_list *);
-
-struct mjson_fixedbuf {
-  char *ptr;
-  int size, len;
-};
-
-int mjson_printf(mjson_print_fn_t, void *, const char *fmt, ...);
-int mjson_vprintf(mjson_print_fn_t, void *, const char *fmt, va_list *ap);
-int mjson_print_str(mjson_print_fn_t, void *, const char *s, int len);
-int mjson_print_int(mjson_print_fn_t, void *, int value, int is_signed);
-int mjson_print_long(mjson_print_fn_t, void *, long value, int is_signed);
-int mjson_print_buf(mjson_print_fn_t fn, void *, const char *buf, int len);
-int mjson_print_dbl(mjson_print_fn_t fn, void *, double, int width);
-
-int mjson_print_null(const char *ptr, int len, void *userdata);
-int mjson_print_fixed_buf(const char *ptr, int len, void *userdata);
-int mjson_print_dynamic_buf(const char *ptr, int len, void *userdata);
-
-int mjson_snprintf(char *buf, size_t len, const char *fmt, ...);
-char *mjson_aprintf(const char *fmt, ...);
-
-#if MJSON_ENABLE_PRETTY
-int mjson_pretty(const char *, int, const char *, mjson_print_fn_t, void *);
-#endif
-
-#if MJSON_ENABLE_MERGE
-int mjson_merge(const char *, int, const char *, int, mjson_print_fn_t, void *);
-#endif
-
-#endif  // MJSON_ENABLE_PRINT
-
-#if MJSON_ENABLE_RPC
-
-void jsonrpc_init(mjson_print_fn_t, void *userdata);
-int mjson_globmatch(const char *s1, int n1, const char *s2, int n2);
-
-struct jsonrpc_request {
-  struct jsonrpc_ctx *ctx;
-  const char *frame;    // Points to the whole frame
-  int frame_len;        // Frame length
-  const char *params;   // Points to the "params" in the request frame
-  int params_len;       // Length of the "params"
-  const char *id;       // Points to the "id" in the request frame
-  int id_len;           // Length of the "id"
-  const char *method;   // Points to the "method" in the request frame
-  int method_len;       // Length of the "method"
-  mjson_print_fn_t fn;  // Printer function
-  void *fndata;         // Printer function data
-  void *userdata;       // Callback's user data as specified at export time
-};
-
-struct jsonrpc_method {
-  const char *method;
-  int method_sz;
-  void (*cb)(struct jsonrpc_request *);
-  struct jsonrpc_method *next;
-};
-
-// Main RPC context, stores current request information and a list of
-// exported RPC methods.
-struct jsonrpc_ctx {
-  struct jsonrpc_method *methods;
-  mjson_print_fn_t response_cb;
-  void *response_cb_data;
-};
-
-// Registers function fn under the given name within the given RPC context
-#define jsonrpc_ctx_export(ctx, name, fn)                                 \
-  do {                                                                    \
-    static struct jsonrpc_method m = {(name), sizeof(name) - 1, (fn), 0}; \
-    m.next = (ctx)->methods;                                              \
-    (ctx)->methods = &m;                                                  \
-  } while (0)
-
-void jsonrpc_ctx_init(struct jsonrpc_ctx *ctx, mjson_print_fn_t, void *);
-void jsonrpc_return_error(struct jsonrpc_request *r, int code,
-                          const char *message, const char *data_fmt, ...);
-void jsonrpc_return_success(struct jsonrpc_request *r, const char *result_fmt,
-                            ...);
-void jsonrpc_ctx_process(struct jsonrpc_ctx *ctx, const char *req, int req_sz,
-                         mjson_print_fn_t fn, void *fndata, void *userdata);
-
-extern struct jsonrpc_ctx jsonrpc_default_context;
-extern void jsonrpc_list(struct jsonrpc_request *r);
-
-#define jsonrpc_export(name, fn) \
-  jsonrpc_ctx_export(&jsonrpc_default_context, (name), (fn))
-
-#define jsonrpc_process(buf, len, fn, fnd, ud) \
-  jsonrpc_ctx_process(&jsonrpc_default_context, (buf), (len), (fn), (fnd), (ud))
-
-#define JSONRPC_ERROR_INVALID -32700    /* Invalid JSON was received */
-#define JSONRPC_ERROR_NOT_FOUND -32601  /* The method does not exist */
-#define JSONRPC_ERROR_BAD_PARAMS -32602 /* Invalid params passed */
-#define JSONRPC_ERROR_INTERNAL -32603   /* Internal JSON-RPC error */
-
-#endif  // MJSON_ENABLE_RPC
-#ifdef __cplusplus
-}
-#endif
-#endif  // MJSON_H
diff --git a/examples/device-dashboard/net.c b/examples/device-dashboard/net.c
index e3fefa06..531025d4 100644
--- a/examples/device-dashboard/net.c
+++ b/examples/device-dashboard/net.c
@@ -1,7 +1,6 @@
 // Copyright (c) 2020-2022 Cesanta Software Limited
 // All rights reserved
 
-#include "mjson.h"
 #include "mongoose.h"
 
 #define MQTT_SERVER "mqtt://broker.hivemq.com:1883"
@@ -67,20 +66,17 @@ static struct user *getuser(struct mg_http_message *hm) {
 static void send_notification(struct mg_mgr *mgr, const char *name,
                               const char *data) {
   struct mg_connection *c;
-  char *msg = mjson_aprintf("{%Q:%Q,%Q:%s}", "name", name, "data", data);
   for (c = mgr->conns; c != NULL; c = c->next) {
     if (c->label[0] != 'W') continue;
-    // c->is_hexdumping = 1;
-    mg_ws_send(c, msg, strlen(msg), WEBSOCKET_OP_TEXT);
-    if (strcmp(name, "metrics") != 0) MG_INFO(("%lu -> %s", c->id, msg));
+    mg_ws_printf(c, WEBSOCKET_OP_TEXT, "{%Q:%Q,%Q:%s}", "name", name, "data",
+                 data);
   }
-  free(msg);
 }
 
 // Send simulated metrics data to the dashboard, for chart rendering
 static void timer_metrics_fn(void *param) {
   char buf[50];
-  mg_snprintf(buf, sizeof(buf), "[ %lu, %d ]", (unsigned long) time(NULL),
+  mg_snprintf(buf, sizeof(buf), "[%lu, %d]", (unsigned long) time(NULL),
               10 + (int) ((double) rand() * 10 / RAND_MAX));
   send_notification(param, "metrics", buf);
 }
@@ -94,11 +90,12 @@ static void mqtt_fn(struct mg_connection *c, int ev, void *ev_data, void *fnd) {
     send_notification(c->mgr, "config", "null");
   } else if (ev == MG_EV_MQTT_MSG) {
     struct mg_mqtt_message *mm = ev_data;
-    char *message = mjson_aprintf(
-        "{%Q: %.*Q,%Q:%.*Q,%Q:%d}", "topic", (int) mm->topic.len, mm->topic.ptr,
-        "data", (int) mm->data.len, mm->data.ptr, "qos", mm->qos);
-    send_notification(c->mgr, "message", message);
-    free(message);
+    char buf[100], *p = buf;
+    mg_asprintf(&p, sizeof(buf), "{%Q: %.*Q, %Q: %.*Q, %Q: %d}", "topic",
+                (int) mm->topic.len, mm->topic.ptr, "data", (int) mm->data.len,
+                mm->data.ptr, "qos", (int) mm->qos);
+    send_notification(c->mgr, "message", p);
+    if (p != buf) free(p);
   } else if (ev == MG_EV_MQTT_CMD) {
     struct mg_mqtt_message *mm = (struct mg_mqtt_message *) ev_data;
     MG_DEBUG(("cmd %d qos %d", mm->cmd, mm->qos));
@@ -141,11 +138,9 @@ void device_dashboard_fn(struct mg_connection *c, int ev, void *ev_data,
       // All URIs starting with /api/ must be authenticated
       mg_printf(c, "%s", "HTTP/1.1 403 Denied\r\nContent-Length: 0\r\n\r\n");
     } else if (mg_http_match_uri(hm, "/api/config/get")) {
-      char *response = mjson_aprintf("{%Q:%Q,%Q:%Q,%Q:%Q,%Q:%B}", "url",
-                                     s_config.url, "pub", s_config.pub, "sub",
-                                     s_config.sub, "connected", s_connected);
-      mg_http_reply(c, 200, NULL, "%s\n", response);
-      free(response);
+      mg_http_reply(c, 200, NULL, "{%Q:%Q,%Q:%Q,%Q:%Q,%Q:%s}\n", "url",
+                    s_config.url, "pub", s_config.pub, "sub", s_config.sub,
+                    "connected", s_connected ? "true" : "false");
     } else if (mg_http_match_uri(hm, "/api/config/set")) {
       // Admins only
       if (strcmp(u->name, "admin") == 0) {
@@ -170,10 +165,8 @@ void device_dashboard_fn(struct mg_connection *c, int ev, void *ev_data,
       mg_ws_upgrade(c, hm, NULL);
       // mg_printf(c, "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n");
     } else if (mg_http_match_uri(hm, "/api/login")) {
-      char *response =
-          mjson_aprintf("{%Q:%Q,%Q:%Q}", "user", u->name, "token", u->token);
-      mg_http_reply(c, 200, NULL, "%s\n", response);
-      free(response);
+      mg_http_reply(c, 200, NULL, "{%Q:%Q,%Q:%Q}\n", "user", u->name, "token",
+                    u->token);
     } else {
       struct mg_http_serve_opts opts = {0};
 #if 0
diff --git a/examples/device-dashboard/packed_fs.c b/examples/device-dashboard/packed_fs.c
index 3a2cb04d..59cd220f 100644
--- a/examples/device-dashboard/packed_fs.c
+++ b/examples/device-dashboard/packed_fs.c
@@ -2786,7 +2786,7 @@ static const struct packed_file {
   time_t mtime;
 } packed_files[] = {
   {"/web_root/index.html", v1, sizeof(v1), 1654437619},
-  {"/web_root/main.js", v2, sizeof(v2), 1654710571},
+  {"/web_root/main.js", v2, sizeof(v2), 1654714271},
   {"/web_root/preact.min.js", v3, sizeof(v3), 1652374364},
   {"/web_root/style.css", v4, sizeof(v4), 1654709515},
   {"/web_root/user.png", v5, sizeof(v5), 1626172939},
diff --git a/examples/esp32/device-dashboard/main/CMakeLists.txt b/examples/esp32/device-dashboard/main/CMakeLists.txt
index 1d7f60b4..e665b9e2 100644
--- a/examples/esp32/device-dashboard/main/CMakeLists.txt
+++ b/examples/esp32/device-dashboard/main/CMakeLists.txt
@@ -2,7 +2,6 @@ idf_component_register(SRCS "main.c"
                             "wifi.c"
                             "net.c"
                             "packed_fs.c"
-                            "mjson.c"
                             "mongoose.c")
 component_compile_options(-DMG_ENABLE_LINES)
 component_compile_options(-DMG_ENABLE_PACKED_FS)
diff --git a/examples/esp32/device-dashboard/main/mjson.c b/examples/esp32/device-dashboard/main/mjson.c
deleted file mode 120000
index f770080a..00000000
--- a/examples/esp32/device-dashboard/main/mjson.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../device-dashboard/mjson.c
\ No newline at end of file
diff --git a/examples/esp32/device-dashboard/main/mjson.h b/examples/esp32/device-dashboard/main/mjson.h
deleted file mode 120000
index c0da8da7..00000000
--- a/examples/esp32/device-dashboard/main/mjson.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../device-dashboard/mjson.h
\ No newline at end of file
diff --git a/mongoose.c b/mongoose.c
index 7b734d2f..f1fb6996 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -4823,10 +4823,10 @@ static size_t mg_nce(const char *s, size_t n, size_t ofs, size_t *koff,
   return ofs > n ? n : ofs;
 }
 
-bool mg_split(struct mg_str *s, struct mg_str *k, struct mg_str *v, char delim) {
+bool mg_split(struct mg_str *s, struct mg_str *k, struct mg_str *v, char sep) {
   size_t koff = 0, klen = 0, voff = 0, vlen = 0, off = 0;
   if (s->ptr == NULL || s->len == 0) return 0;
-  off = mg_nce(s->ptr, s->len, 0, &koff, &klen, &voff, &vlen, delim);
+  off = mg_nce(s->ptr, s->len, 0, &koff, &klen, &voff, &vlen, sep);
   if (k != NULL) *k = mg_str_n(s->ptr + koff, klen);
   if (v != NULL) *v = mg_str_n(s->ptr + voff, vlen);
   *s = mg_str_n(s->ptr + off, s->len - off);
@@ -4963,6 +4963,36 @@ static size_t mg_copys(char *buf, size_t len, size_t n, char *p, size_t k) {
   return j;
 }
 
+static char mg_esc(int c, bool esc) {
+  const char *p, *esc1 = "\b\f\n\r\t\\\"", *esc2 = "bfnrt\\\"";
+  for (p = esc ? esc1 : esc2; *p != '\0'; p++) {
+    if (*p == c) return esc ? esc2[p - esc1] : esc1[p - esc2];
+  }
+  return 0;
+}
+
+static char mg_escape(int c) {
+  return mg_esc(c, true);
+}
+
+static size_t mg_copyq(char *buf, size_t len, size_t n, char *p, size_t k) {
+  size_t j = 0, extra = 2;
+  if (n < len) buf[n++] = '"';
+  for (j = 0; j < k && p[j]; j++) {
+    char c = mg_escape(p[j]);
+    if (c) {
+      if (j + n < len) buf[n + j] = '\\';
+      n++;
+      extra++;
+      if (j + n < len) buf[n + j] = c;
+    } else {
+      if (j + n < len) buf[n + j] = p[j];
+    }
+  }
+  if (j + n < len) buf[n + j] = '"';
+  return j + extra;
+}
+
 size_t mg_vsnprintf(char *buf, size_t len, const char *fmt, va_list ap) {
   size_t i = 0, n = 0;
   while (fmt[i] != '\0') {
@@ -5016,14 +5046,16 @@ size_t mg_vsnprintf(char *buf, size_t len, const char *fmt, va_list ap) {
         int p = va_arg(ap, int);
         if (n < len) buf[n] = (char) p;
         n++;
-      } else if (c == 's') {
+      } else if (c == 's' || c == 'Q') {
         char *p = va_arg(ap, char *);
+        size_t (*fn)(char *, size_t, size_t, char *, size_t) =
+            c == 's' ? mg_copys : mg_copyq;
         if (pr == ~0U) pr = p == NULL ? 0 : strlen(p);
         for (j = 0; !minus && pr < w && j + pr < w; j++)
-          n += mg_copys(buf, len, n, &pad, 1);
-        n += mg_copys(buf, len, n, p, pr);
+          n += fn(buf, len, n, &pad, 1);
+        n += fn(buf, len, n, p, pr);
         for (j = 0; minus && pr < w && j + pr < w; j++)
-          n += mg_copys(buf, len, n, &pad, 1);
+          n += fn(buf, len, n, &pad, 1);
       } else if (c == '%') {
         if (n < len) buf[n] = '%';
         n++;
diff --git a/src/str.c b/src/str.c
index cfce73ee..73776dce 100644
--- a/src/str.c
+++ b/src/str.c
@@ -146,10 +146,10 @@ static size_t mg_nce(const char *s, size_t n, size_t ofs, size_t *koff,
   return ofs > n ? n : ofs;
 }
 
-bool mg_split(struct mg_str *s, struct mg_str *k, struct mg_str *v, char delim) {
+bool mg_split(struct mg_str *s, struct mg_str *k, struct mg_str *v, char sep) {
   size_t koff = 0, klen = 0, voff = 0, vlen = 0, off = 0;
   if (s->ptr == NULL || s->len == 0) return 0;
-  off = mg_nce(s->ptr, s->len, 0, &koff, &klen, &voff, &vlen, delim);
+  off = mg_nce(s->ptr, s->len, 0, &koff, &klen, &voff, &vlen, sep);
   if (k != NULL) *k = mg_str_n(s->ptr + koff, klen);
   if (v != NULL) *v = mg_str_n(s->ptr + voff, vlen);
   *s = mg_str_n(s->ptr + off, s->len - off);
@@ -286,6 +286,36 @@ static size_t mg_copys(char *buf, size_t len, size_t n, char *p, size_t k) {
   return j;
 }
 
+static char mg_esc(int c, bool esc) {
+  const char *p, *esc1 = "\b\f\n\r\t\\\"", *esc2 = "bfnrt\\\"";
+  for (p = esc ? esc1 : esc2; *p != '\0'; p++) {
+    if (*p == c) return esc ? esc2[p - esc1] : esc1[p - esc2];
+  }
+  return 0;
+}
+
+static char mg_escape(int c) {
+  return mg_esc(c, true);
+}
+
+static size_t mg_copyq(char *buf, size_t len, size_t n, char *p, size_t k) {
+  size_t j = 0, extra = 2;
+  if (n < len) buf[n++] = '"';
+  for (j = 0; j < k && p[j]; j++) {
+    char c = mg_escape(p[j]);
+    if (c) {
+      if (j + n < len) buf[n + j] = '\\';
+      n++;
+      extra++;
+      if (j + n < len) buf[n + j] = c;
+    } else {
+      if (j + n < len) buf[n + j] = p[j];
+    }
+  }
+  if (j + n < len) buf[n + j] = '"';
+  return j + extra;
+}
+
 size_t mg_vsnprintf(char *buf, size_t len, const char *fmt, va_list ap) {
   size_t i = 0, n = 0;
   while (fmt[i] != '\0') {
@@ -339,14 +369,16 @@ size_t mg_vsnprintf(char *buf, size_t len, const char *fmt, va_list ap) {
         int p = va_arg(ap, int);
         if (n < len) buf[n] = (char) p;
         n++;
-      } else if (c == 's') {
+      } else if (c == 's' || c == 'Q') {
         char *p = va_arg(ap, char *);
+        size_t (*fn)(char *, size_t, size_t, char *, size_t) =
+            c == 's' ? mg_copys : mg_copyq;
         if (pr == ~0U) pr = p == NULL ? 0 : strlen(p);
         for (j = 0; !minus && pr < w && j + pr < w; j++)
-          n += mg_copys(buf, len, n, &pad, 1);
-        n += mg_copys(buf, len, n, p, pr);
+          n += fn(buf, len, n, &pad, 1);
+        n += fn(buf, len, n, p, pr);
         for (j = 0; minus && pr < w && j + pr < w; j++)
-          n += mg_copys(buf, len, n, &pad, 1);
+          n += fn(buf, len, n, &pad, 1);
       } else if (c == '%') {
         if (n < len) buf[n] = '%';
         n++;
diff --git a/test/unit_test.c b/test/unit_test.c
index 156fa107..d770f357 100644
--- a/test/unit_test.c
+++ b/test/unit_test.c
@@ -1366,9 +1366,22 @@ static bool sn(const char *fmt, ...) {
   return result;
 }
 
+static bool sn2(const char *expect, const char *fmt, ...) {
+  char buf[100];
+  va_list ap;
+  bool result;
+  va_start(ap, fmt);
+  mg_vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  va_start(ap, fmt);
+  result = strcmp(expect, buf) == 0;
+  if (!result) MG_ERROR(("[%s] != [%s]", expect, buf));
+  return result;
+}
+
 static bool sccmp(const char *s1, const char *s2, int expected) {
   int n1 = mg_casecmp(s1, s2);
-  MG_INFO(("[%s] [%s] %d %d", s1, s2, n1, expected));
+  // MG_INFO(("[%s] [%s] %d %d", s1, s2, n1, expected));
   return n1 == expected;
 }
 
@@ -1432,6 +1445,28 @@ static void test_str(void) {
   ASSERT(sn("%s ", "a"));
   ASSERT(sn("%s %s", "a", "b"));
   ASSERT(sn("%2s %s", "a", "b"));
+
+  // Non-standard formatting
+  {
+    char buf[100];
+    const char *expected;
+
+    expected = "\"\"";
+    mg_snprintf(buf, sizeof(buf), "%Q", "");
+    ASSERT(strcmp(buf, expected) == 0);
+
+    expected = "\"a'b\"";
+    mg_snprintf(buf, sizeof(buf), "%Q", "a'b");
+    ASSERT(strcmp(buf, expected) == 0);
+
+    expected = "\"a\\b\\n\\f\\r\\t\\\"\"";
+    mg_snprintf(buf, sizeof(buf), "%Q", "a\b\n\f\r\t\"");
+    ASSERT(strcmp(buf, expected) == 0);
+
+    expected = "\"abc\"";
+    mg_snprintf(buf, sizeof(buf), "%.*Q", 3, "abcdef");
+    ASSERT(strcmp(buf, expected) == 0);
+  }
 }
 
 static void fn1(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
@@ -1807,8 +1842,7 @@ struct stream_status {
 // Consume recv buffer after letting it reach MG_MAX_RECV_SIZE
 static void eh8(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   struct stream_status *status = (struct stream_status *) fn_data;
-  if (c->is_listening)
-    return;
+  if (c->is_listening) return;
 
   ASSERT(c->recv.len <= MG_MAX_RECV_SIZE);
 
@@ -1832,29 +1866,29 @@ static void eh8(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
     else
       consume = MG_MAX_RECV_SIZE / 3;
     status->received += consume;
-    status->recv_crc = mg_crc32(status->recv_crc, (const char *) c->recv.buf, consume);
+    status->recv_crc =
+        mg_crc32(status->recv_crc, (const char *) c->recv.buf, consume);
     mg_iobuf_del(&c->recv, 0, consume);
   }
 
   // count polls with full buffer to ensure c->is_full prevents reads
-  if (ev == MG_EV_POLL && c->recv.len == MG_MAX_RECV_SIZE)
-    status->polls += 1;
+  if (ev == MG_EV_POLL && c->recv.len == MG_MAX_RECV_SIZE) status->polls += 1;
   (void) ev_data;
 }
 
 // Toggle c->is_full to prevent max_recv_buf_size reached read errors
-static void eh10(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
-  if (c->recv.len >= MG_MAX_RECV_SIZE && ev == MG_EV_READ)
-    c->is_full = true;
+static void eh10(struct mg_connection *c, int ev, void *ev_data,
+                 void *fn_data) {
+  if (c->recv.len >= MG_MAX_RECV_SIZE && ev == MG_EV_READ) c->is_full = true;
 
   eh8(c, ev, ev_data, fn_data);
 
-  if (c->recv.len < MG_MAX_RECV_SIZE && ev == MG_EV_POLL)
-    c->is_full = false;
+  if (c->recv.len < MG_MAX_RECV_SIZE && ev == MG_EV_POLL) c->is_full = false;
 }
 
 // Send buffer larger than MG_MAX_RECV_SIZE to server
-static void eh11(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
+static void eh11(struct mg_connection *c, int ev, void *ev_data,
+                 void *fn_data) {
   struct stream_status *status = (struct stream_status *) fn_data;
   if (ev == MG_EV_CONNECT) {
     size_t len = MG_MAX_RECV_SIZE * 2;