Change Mongoose version to 6.7

PUBLISHED_FROM=e18f33e14f4c0e1cb004aa264dd64ca5a0056190

README.md

@@ -5,33 +5,27 @@
 Mongoose is ideal for embedded environments. It has been designed
 for connecting devices and bringing them online. On the market since 2004,
 used by vast number of open source and
-commercial products - it even runs on space stations!
+commercial products - it even runs on the International Space station!
 Mongoose makes embedded network programming fast, robust, and easy.
 
-If you're looking for a pre-compiled Windows or Mac binary,
-- [Download pre-compiled Mongoose web server binary](https://www.cesanta.com/products/binary)
+- [Download Mongoose Source Code here](https://www.cesanta.com)
 
-Alternatively,
+Looking for a complete IoT firmware solution?
 
-- [Download Mongoose Source Code here](http://hubs.ly/H01bWvx0)
-- [Check our latest releases] (https://github.com/cesanta/mongoose/releases)
-- [Read User Guide and API reference](https://docs.cesanta.com/mongoose/dev)
-- [Study mongoose example code](https://github.com/cesanta/mongoose/tree/master/examples)
-
-If you are looking for a complete solution with firmware and cloud components, check out [Mongoose IoT Platform](https://github.com/cesanta/mongoose-iot).
+Check out [Mongoose OS](https://mongoose-iot.com) - open source embedded operating system for low-power connected microcontrollers. Secure, designed for Internet of Things, complete environment for prototyping, development and managing.
 
 # Support
-- [Support Forum - Ask your technical questions here] (http://forum.cesanta.com/index.php?p=/categories/mongoose)
-- [Chat - Visit www.cesanta.com for our live chat] (http://www.cesanta.com)
-- [Commercial one-to-one support - Available to all commercial license holders] (https://www.cesanta.com/services-support)
+- [Study mongoose example code](https://github.com/cesanta/mongoose/tree/master/examples)
+- [Read User Guide and API reference](https://docs.cesanta.com/mongoose)
+- [Support Forum - ask your technical questions here] (http://forum.cesanta.com/index.php?p=/categories/mongoose)
+- [Commercial licensing and support available] (https://www.cesanta.com/services-support)
+- [Check our latest releases] (https://github.com/cesanta/mongoose/releases)
 
 # Features
 
 * Cross-platform: works on Linux/UNIX, MacOS, QNX, eCos, Windows, Android,
   iPhone, FreeRTOS (TI CC3200, ESP8266), etc
-* Single-threaded, asynchronous, non-blocking core with simple event-based API
-* Native support for [PicoTCP embedded TCP/IP stack](http://www.picotcp.com),
-  [LWIP embedded TCP/IP stack](https://en.wikipedia.org/wiki/LwIP)
+* Supported hardware platforms: TI CC3200, TI MSP432, NRF52, STM32, PIC32, ESP8266, ESP32 and more
 * Builtin protocols:
    - plain TCP, plain UDP, SSL/TLS (over TCP, one-way or two-way)
    - HTTP client, HTTP server
@@ -39,6 +33,9 @@ If you are looking for a complete solution with firmware and cloud components, c
    - MQTT client, MQTT broker
    - CoAP client, CoAP server
    - DNS client, DNS server, async DNS resolver
+* Single-threaded, asynchronous, non-blocking core with simple event-based API
+* Native support for [PicoTCP embedded TCP/IP stack](http://www.picotcp.com),
+  [LWIP embedded TCP/IP stack](https://en.wikipedia.org/wiki/LwIP)
 * Tiny static and run-time footprint
 * Source code is both ISO C and ISO C++ compliant
 * Very easy to integrate: just copy
@@ -48,13 +45,9 @@ If you are looking for a complete solution with firmware and cloud components, c
 
 # Licensing
 
-Mongoose is released under commercial and [GNU GPL v.2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) open source licenses.
+Mongoose is released under Commercial and [GNU GPL v.2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) open source licenses.
 
-Commercial Projects:
-Once your project becomes commercialised GPLv2 licensing dictates that you need to either open your source fully or purchase a commercial license. Cesanta offer full, royalty-free commercial licenses without any GPL restrictions. If your needs require a custom license, we’d be happy to work on a solution with you. [Contact us for pricing.] (https://www.cesanta.com/contact)
-
-Prototyping:
-While your project is still in prototyping stage and not for sale, you can use Mongoose’s open source code without license restrictions.
+Commercial Projects: [Contact us for commercial license.] (https://www.cesanta.com/contact)
 
 # Dashboard Example
 
@@ -64,7 +57,7 @@ the functionality:
 
 ![](http://www.cesanta.com/hubfs/www.cesanta.com/diagrams/dash_mongoose_diagram.png)
 
-[Developing a new product? Contact us today to discuss how Mongoose can help
+[Developing a new product? Contact us today to discuss how Mongoose can help.
 ](https://www.cesanta.com/contact)
 
 # Contributions
@@ -73,4 +66,7 @@ To submit contributions, sign
 [Cesanta CLA](https://docs.cesanta.com/contributors_la.shtml)
 and send GitHub pull request. You retain the copyright on your contributions.
 
+# Looking for a pre-compiled Mongoose web server Windows or Mac binary?
+- [Download pre-compiled Mongoose web server binary.](https://www.cesanta.com/products/binary)
+
 [![Analytics](https://ga-beacon.appspot.com/UA-42732794-5/project-page)](https://github.com/cesanta/mongoose)

docs/build-options/disabling-flags.md

@@ -1,11 +0,0 @@
----
-title: Disabling flags
----
-
-- `MG_DISABLE_HTTP_WEBSOCKET` disable HTTP + Websocket protocol support
-- `MG_DISABLE_HTTP_DIGEST_AUTH` disable HTTP Digest (MD5) authorization support
-- `MG_DISABLE_MQTT` disable MQTT support
-- `MG_DISABLE_SHA1` disable SHA1 support (used by Websocket)
-- `MG_DISABLE_MD5` disable MD5 support (used by HTTP auth)
-- `MG_DISABLE_SOCKETPAIR` disable `mg_broadcast()` API
-- `MG_DISABLE_HTTP_KEEP_ALIVE` useful for embedded systems to save resources

docs/build-options/enabling-flags.md

@@ -1,11 +0,0 @@
----
-title: Enabling flags
----
-
-- `MG_ENABLE_SSL` Enable OpenSSL support
-- `MG_ENABLE_IPV6` Enable IPV6 support
-- `MG_ENABLE_THREADS` enable `mg_start_thread()` API
-- `MG_ENABLE_MQTT_BROKER` enable MQTT broker
-- `MG_ENABLE_DNS_SERVER` enable DNS server
-- `MG_ENABLE_COAP` enable CoAP protocol
-- `MG_ENABLE_GETADDRINFO` enable `getaddrinfo()` in `mg_resolve2()`

docs/c-api/coap.h/intro.md

@@ -1,17 +1,17 @@
 ---
-title: "CoAP"
+title: "CoAP API reference"
 symbol_kind: "intro"
 decl_name: "coap.h"
 items:
-  - { type: file, name: mg_set_protocol_coap.md }
-  - { type: file, name: mg_coap_add_option.md }
-  - { type: file, name: mg_coap_free_options.md }
-  - { type: file, name: mg_coap_send_message.md }
-  - { type: file, name: mg_coap_send_ack.md }
-  - { type: file, name: mg_coap_parse.md }
-  - { type: file, name: mg_coap_compose.md }
-  - { type: file, name: struct_mg_coap_option.md }
-  - { type: file, name: struct_mg_coap_message.md }
+  - { name: mg_coap_add_option.md }
+  - { name: mg_coap_compose.md }
+  - { name: mg_coap_free_options.md }
+  - { name: mg_coap_parse.md }
+  - { name: mg_coap_send_ack.md }
+  - { name: mg_coap_send_message.md }
+  - { name: mg_set_protocol_coap.md }
+  - { name: struct_mg_coap_message.md }
+  - { name: struct_mg_coap_option.md }
 ---
 
 CoAP message format:

docs/c-api/coap.h/mg_coap_add_option.md

@@ -8,6 +8,7 @@ signature: |
                                             size_t len);
 ---
 
-Add new option to mg_coap_message structure.
-Returns pointer to the newly created option. 
+Adds a new option to mg_coap_message structure.
+Returns pointer to the newly created option.
+Note: options must be freed by using mg_coap_free_options 
 

docs/c-api/coap.h/mg_coap_free_options.md

@@ -6,6 +6,6 @@ signature: |
   void mg_coap_free_options(struct mg_coap_message *cm);
 ---
 
-Free the memory allocated for options,
-if cm paramater doesn't contain any option does nothing. 
+Frees the memory allocated for options.
+If the cm paramater doesn't contain any option it does nothing. 
 

docs/c-api/coap.h/mg_coap_parse.md

@@ -6,13 +6,13 @@ signature: |
   uint32_t mg_coap_parse(struct mbuf *io, struct mg_coap_message *cm);
 ---
 
-Parse COAP message and fills mg_coap_message and returns cm->flags.
+Parses CoAP message and fills mg_coap_message and returns cm->flags.
 This is a helper function.
 
-NOTE: usually CoAP work over UDP, so lack of data means format error,
-but in theory it is possible to use CoAP over TCP (according to RFC)
+NOTE: usually CoAP works over UDP, so lack of data means format error.
+But, in theory, it is possible to use CoAP over TCP (according to RFC)
 
-The caller have to check results and treat COAP_NOT_ENOUGH_DATA according to
+The caller has to check results and treat COAP_NOT_ENOUGH_DATA according to
 underlying protocol:
 
 - in case of UDP COAP_NOT_ENOUGH_DATA means COAP_FORMAT_ERROR,

docs/c-api/coap.h/mg_coap_send_ack.md

@@ -6,7 +6,7 @@ signature: |
   uint32_t mg_coap_send_ack(struct mg_connection *nc, uint16_t msg_id);
 ---
 
-Compose CoAP acknowledgement from `mg_coap_message`
-and send it into `nc` connection.
+Composes CoAP acknowledgement from `mg_coap_message`
+and sends it into `nc` connection.
 Return value: see `mg_coap_send_message()` 
 

docs/c-api/coap.h/mg_coap_send_message.md

@@ -7,9 +7,9 @@ signature: |
                                 struct mg_coap_message *cm);
 ---
 
-Compose CoAP message from `mg_coap_message`
-and send it into `nc` connection.
-Return 0 on success. On error, it is a bitmask:
+Composes a CoAP message from `mg_coap_message`
+and sends it into `nc` connection.
+Returns 0 on success. On error, it is a bitmask:
 
 - `#define MG_COAP_ERROR 0x10000`
 - `#define MG_COAP_FORMAT_ERROR (MG_COAP_ERROR | 0x20000)`

docs/c-api/coap.h/mg_set_protocol_coap.md

@@ -6,5 +6,5 @@ signature: |
   int mg_set_protocol_coap(struct mg_connection *nc);
 ---
 
-Set CoAP protocol handler - trigger CoAP specific events 
+Sets CoAP protocol handler - triggers CoAP specific events. 
 

docs/c-api/dns-server.h/intro.md

@@ -1,12 +0,0 @@
----
-title: "DNS server"
-symbol_kind: "intro"
-decl_name: "dns-server.h"
-items:
-  - { type: file, name: mg_dns_create_reply.md }
-  - { type: file, name: mg_dns_reply_record.md }
-  - { type: file, name: mg_dns_send_reply.md }
----
-
-Disabled by default; enable with `-DMG_ENABLE_DNS_SERVER`.
-

docs/c-api/dns.h/intro.md

@@ -1,18 +1,19 @@
 ---
-title: "DNS"
+title: "DNS API reference"
 symbol_kind: "intro"
 decl_name: "dns.h"
 items:
-  - { type: file, name: mg_dns_parse_record_data.md }
-  - { type: file, name: mg_send_dns_query.md }
-  - { type: file, name: mg_dns_insert_header.md }
-  - { type: file, name: mg_dns_copy_questions.md }
-  - { type: file, name: mg_dns_encode_record.md }
-  - { type: file, name: mg_parse_dns.md }
-  - { type: file, name: mg_dns_uncompress_name.md }
-  - { type: file, name: mg_set_protocol_dns.md }
-  - { type: file, name: struct_mg_dns_resource_record.md }
-  - { type: file, name: struct_mg_dns_message.md }
+  - { name: mg_dns_copy_questions.md }
+  - { name: mg_dns_encode_name.md }
+  - { name: mg_dns_encode_record.md }
+  - { name: mg_dns_insert_header.md }
+  - { name: mg_dns_parse_record_data.md }
+  - { name: mg_dns_uncompress_name.md }
+  - { name: mg_parse_dns.md }
+  - { name: mg_send_dns_query.md }
+  - { name: mg_set_protocol_dns.md }
+  - { name: struct_mg_dns_message.md }
+  - { name: struct_mg_dns_resource_record.md }
 ---
 
 

docs/c-api/dns.h/mg_dns_copy_questions.md

@@ -6,10 +6,10 @@ signature: |
   int mg_dns_copy_questions(struct mbuf *io, struct mg_dns_message *msg);
 ---
 
-Append already encoded questions from an existing message.
+Appends already encoded questions from an existing message.
 
 This is useful when generating a DNS reply message which includes
 all question records.
 
-Return number of appened bytes. 
+Returns the number of appended bytes. 
 

docs/c-api/dns.h/mg_dns_encode_name.md

@@ -0,0 +1,10 @@
+---
+title: "mg_dns_encode_name()"
+decl_name: "mg_dns_encode_name"
+symbol_kind: "func"
+signature: |
+  int mg_dns_encode_name(struct mbuf *io, const char *name, size_t len);
+---
+
+Encodes a DNS name. 
+

docs/c-api/dns.h/mg_dns_encode_record.md

@@ -8,18 +8,18 @@ signature: |
                            size_t rlen);
 ---
 
-Encode and append a DNS resource record to an IO buffer.
+Encodes and appends a DNS resource record to an IO buffer.
 
 The record metadata is taken from the `rr` parameter, while the name and data
 are taken from the parameters, encoded in the appropriate format depending on
-record type, and stored in the IO buffer. The encoded values might contain
+record type and stored in the IO buffer. The encoded values might contain
 offsets within the IO buffer. It's thus important that the IO buffer doesn't
 get trimmed while a sequence of records are encoded while preparing a DNS
-*reply.
+reply.
 
 This function doesn't update the `name` and `rdata` pointers in the `rr`
-*struct
-because they might be invalidated as soon as the IO buffer grows again.
+struct because they might be invalidated as soon as the IO buffer grows
+again.
 
-Return the number of bytes appened or -1 in case of error. 
+Returns the number of bytes appened or -1 in case of error. 
 

docs/c-api/dns.h/mg_dns_insert_header.md

@@ -7,7 +7,7 @@ signature: |
                            struct mg_dns_message *msg);
 ---
 
-Insert a DNS header to an IO buffer.
+Inserts a DNS header to an IO buffer.
 
-Return number of bytes inserted. 
+Returns the number of bytes inserted. 
 

docs/c-api/dns.h/mg_dns_parse_record_data.md

@@ -8,7 +8,7 @@ signature: |
                                size_t data_len);
 ---
 
-Parse the record data from a DNS resource record.
+Parses the record data from a DNS resource record.
 
  - A:     struct in_addr *ina
  - AAAA:  struct in6_addr *ina

docs/c-api/dns.h/mg_dns_uncompress_name.md

@@ -7,15 +7,15 @@ signature: |
                                 char *dst, int dst_len);
 ---
 
-Uncompress a DNS compressed name.
+Uncompresses a DNS compressed name.
 
-The containing dns message is required because the compressed encoding
+The containing DNS message is required because of the compressed encoding
 and reference suffixes present elsewhere in the packet.
 
-If name is less than `dst_len` characters long, the remainder
-of `dst` is terminated with `\0' characters. Otherwise, `dst` is not
-*terminated.
+If the name is less than `dst_len` characters long, the remainder
+of `dst` is terminated with `\0` characters. Otherwise, `dst` is not
+terminated.
 
 If `dst_len` is 0 `dst` can be NULL.
-Return the uncompressed name length. 
+Returns the uncompressed name length. 
 

docs/c-api/dns.h/mg_send_dns_query.md

@@ -7,5 +7,5 @@ signature: |
                          int query_type);
 ---
 
-Send a DNS query to the remote end. 
+Sends a DNS query to the remote end. 
 

docs/c-api/dns.h/mg_set_protocol_dns.md

@@ -6,11 +6,11 @@ signature: |
   void mg_set_protocol_dns(struct mg_connection *nc);
 ---
 
-Attach built-in DNS event handler to the given listening connection.
+Attaches a built-in DNS event handler to the given listening connection.
 
-DNS event handler parses incoming UDP packets, treating them as DNS
-requests. If incoming packet gets successfully parsed by the DNS event
-handler, a user event handler will receive `MG_DNS_REQUEST` event, with
+The DNS event handler parses the incoming UDP packets, treating them as DNS
+requests. If an incoming packet gets successfully parsed by the DNS event
+handler, a user event handler will receive an `MG_DNS_REQUEST` event, with
 `ev_data` pointing to the parsed `struct mg_dns_message`.
 
 See

docs/c-api/dns_server.h/intro.md

@@ -0,0 +1,12 @@
+---
+title: "DNS server API reference"
+symbol_kind: "intro"
+decl_name: "dns_server.h"
+items:
+  - { name: mg_dns_create_reply.md }
+  - { name: mg_dns_reply_record.md }
+  - { name: mg_dns_send_reply.md }
+---
+
+Disabled by default; enable with `-DMG_ENABLE_DNS_SERVER`.
+

docs/c-api/dns_server.h/mg_dns_create_reply.md

@@ -7,18 +7,18 @@ signature: |
                                           struct mg_dns_message *msg);
 ---
 
-Create a DNS reply.
+Creates a DNS reply.
 
 The reply will be based on an existing query message `msg`.
 The query body will be appended to the output buffer.
-"reply + recursion allowed" will be added to the message flags and
+"reply + recursion allowed" will be added to the message flags and the
 message's num_answers will be set to 0.
 
 Answer records can be appended with `mg_dns_send_reply` or by lower
 level function defined in the DNS API.
 
-In order to send the reply use `mg_dns_send_reply`.
-It's possible to use a connection's send buffer as reply buffers,
+In order to send a reply use `mg_dns_send_reply`.
+It's possible to use a connection's send buffer as reply buffer,
 and it will work for both UDP and TCP connections.
 
 Example:

docs/c-api/dns_server.h/mg_dns_reply_record.md

@@ -9,10 +9,10 @@ signature: |
                           size_t rdata_len);
 ---
 
-Append a DNS reply record to the IO buffer and to the DNS message.
+Appends a DNS reply record to the IO buffer and to the DNS message.
 
-The message num_answers field will be incremented. It's caller's duty
-to ensure num_answers is propertly initialized.
+The message's num_answers field will be incremented. It's the caller's duty
+to ensure num_answers is properly initialised.
 
 Returns -1 on error. 
 

docs/c-api/dns_server.h/mg_dns_send_reply.md

@@ -6,12 +6,12 @@ signature: |
   void mg_dns_send_reply(struct mg_connection *nc, struct mg_dns_reply *r);
 ---
 
-Send a DNS reply through a connection.
+Sends a DNS reply through a connection.
 
 The DNS data is stored in an IO buffer pointed by reply structure in `r`.
 This function mutates the content of that buffer in order to ensure that
-the DNS header reflects size and flags of the mssage, that might have been
-updated either with `mg_dns_reply_record` or by direct manipulation of
+the DNS header reflects the size and flags of the message, that might have
+been updated either with `mg_dns_reply_record` or by direct manipulation of
 `r->message`.
 
 Once sent, the IO buffer will be trimmed unless the reply IO buffer

docs/c-api/http.h/intro.md

@@ -1,39 +1,22 @@
 ---
-title: "HTTP + Websocket"
+title: "Common API reference"
 symbol_kind: "intro"
 decl_name: "http.h"
 items:
-  - { type: file, name: mg_set_protocol_http_websocket.md }
-  - { type: file, name: mg_send_websocket_handshake.md }
-  - { type: file, name: mg_send_websocket_handshake2.md }
-  - { type: file, name: mg_connect_ws.md }
-  - { type: file, name: mg_connect_ws_opt.md }
-  - { type: file, name: mg_send_websocket_frame.md }
-  - { type: file, name: mg_send_websocket_framev.md }
-  - { type: file, name: mg_printf_websocket_frame.md }
-  - { type: file, name: mg_send_http_chunk.md }
-  - { type: file, name: mg_printf_http_chunk.md }
-  - { type: file, name: mg_send_response_line.md }
-  - { type: file, name: mg_send_head.md }
-  - { type: file, name: mg_printf_html_escape.md }
-  - { type: file, name: mg_parse_http.md }
-  - { type: file, name: mg_get_http_header.md }
-  - { type: file, name: mg_http_parse_header.md }
-  - { type: file, name: mg_parse_multipart.md }
-  - { type: file, name: mg_get_http_var.md }
-  - { type: file, name: mg_url_decode.md }
-  - { type: file, name: mg_http_create_digest_auth_header.md }
-  - { type: file, name: mg_connect_http.md }
-  - { type: file, name: mg_connect_http_opt.md }
-  - { type: file, name: mg_serve_http.md }
-  - { type: file, name: mg_register_http_endpoint.md }
-  - { type: file, name: mg_file_upload_handler.md }
-  - { type: file, name: mg_http_check_digest_auth.md }
-  - { type: file, name: mg_fu_fname_fn.md }
-  - { type: file, name: struct_http_message.md }
-  - { type: file, name: struct_websocket_message.md }
-  - { type: file, name: struct_mg_http_multipart_part.md }
-  - { type: file, name: struct_mg_serve_http_opts.md }
+  - { name: mg_connect_ws.md }
+  - { name: mg_connect_ws_opt.md }
+  - { name: mg_printf_websocket_frame.md }
+  - { name: mg_send_websocket_frame.md }
+  - { name: mg_send_websocket_framev.md }
+  - { name: mg_send_websocket_handshake.md }
+  - { name: mg_send_websocket_handshake2.md }
+  - { name: mg_send_websocket_handshake3.md }
+  - { name: mg_set_protocol_http_websocket.md }
+  - { name: mg_url_decode.md }
+  - { name: struct_http_message.md }
+  - { name: struct_mg_http_multipart_part.md }
+  - { name: struct_mg_ssi_call_ctx.md }
+  - { name: struct_websocket_message.md }
 ---
 
 

docs/c-api/http.h/mg_connect_ws.md

@@ -13,7 +13,7 @@ Helper function that creates an outbound WebSocket connection.
 
 `url` is a URL to connect to. It must be properly URL-encoded, e.g. have
 no spaces, etc. By default, `mg_connect_ws()` sends Connection and
-Host headers. `extra_headers` is an extra HTTP headers to send, e.g.
+Host headers. `extra_headers` is an extra HTTP header to send, e.g.
 `"User-Agent: my-app\r\n"`.
 If `protocol` is not NULL, then a `Sec-WebSocket-Protocol` header is sent.
 

docs/c-api/http.h/mg_connect_ws_opt.md

@@ -12,6 +12,6 @@ signature: |
 
 Helper function that creates an outbound WebSocket connection
 
-Mostly identical to mg_connect_ws, but allows to provide extra parameters
-(for example, SSL parameters 
+Mostly identical to `mg_connect_ws`, but allows to provide extra parameters
+(for example, SSL parameters) 
 

docs/c-api/http.h/mg_get_http_var.md

@@ -1,16 +0,0 @@
----
-title: "mg_get_http_var()"
-decl_name: "mg_get_http_var"
-symbol_kind: "func"
-signature: |
-  int mg_get_http_var(const struct mg_str *buf, const char *name, char *dst,
-                      size_t dst_len);
----
-
-Fetch an HTTP form variable.
-
-Fetch a variable `name` from a `buf` into a buffer specified by
-`dst`, `dst_len`. Destination is always zero-terminated. Return length
-of a fetched variable. If not found, 0 is returned. `buf` must be
-valid url-encoded buffer. If destination is too small, `-1` is returned. 
-

docs/c-api/http.h/mg_parse_http.md

@@ -1,15 +0,0 @@
----
-title: "mg_parse_http()"
-decl_name: "mg_parse_http"
-symbol_kind: "func"
-signature: |
-  int mg_parse_http(const char *s, int n, struct http_message *hm, int is_req);
----
-
-Parse a HTTP message.
-
-`is_req` should be set to 1 if parsing request, 0 if reply.
-
-Return number of bytes parsed. If HTTP message is
-incomplete, `0` is returned. On parse error, negative number is returned. 
-

docs/c-api/http.h/mg_printf_websocket_frame.md

@@ -7,8 +7,8 @@ signature: |
                                  const char *fmt, ...);
 ---
 
-Send websocket frame to the remote end.
+Sends WebSocket frame to the remote end.
 
-Like `mg_send_websocket_frame()`, but allows to create formatted message
+Like `mg_send_websocket_frame()`, but allows to create formatted messages
 with `printf()`-like semantics. 
 

docs/c-api/http.h/mg_send_http_chunk.md

@@ -1,25 +0,0 @@
----
-title: "mg_send_http_chunk()"
-decl_name: "mg_send_http_chunk"
-symbol_kind: "func"
-signature: |
-  void mg_send_http_chunk(struct mg_connection *nc, const char *buf, size_t len);
----
-
-Send buffer `buf` of size `len` to the client using chunked HTTP encoding.
-This function first sends buffer size as hex number + newline, then
-buffer itself, then newline. For example,
-  `mg_send_http_chunk(nc, "foo", 3)` whill append `3\r\nfoo\r\n` string to
-the `nc->send_mbuf` output IO buffer.
-
-NOTE: HTTP header "Transfer-Encoding: chunked" should be sent prior to
-using this function.
-
-NOTE: do not forget to send empty chunk at the end of the response,
-to tell the client that everything was sent. Example:
-
-```
-  mg_printf_http_chunk(nc, "%s", "my response!");
-  mg_send_http_chunk(nc, "", 0); // Tell the client we're finished
-``` 
-

docs/c-api/http.h/mg_send_websocket_frame.md

@@ -7,9 +7,9 @@ signature: |
                                const void *data, size_t data_len);
 ---
 
-Send websocket frame to the remote end.
+Send WebSocket frame to the remote end.
 
-`op_and_flags` specifies frame's type, one of:
+`op_and_flags` specifies the frame's type. It's one of:
 
 - WEBSOCKET_OP_CONTINUE
 - WEBSOCKET_OP_TEXT

docs/c-api/http.h/mg_send_websocket_framev.md

@@ -7,7 +7,7 @@ signature: |
                                 const struct mg_str *strings, int num_strings);
 ---
 
-Send multiple websocket frames.
+Sends multiple websocket frames.
 
 Like `mg_send_websocket_frame()`, but composes a frame from multiple buffers. 
 

docs/c-api/http.h/mg_send_websocket_handshake3.md

@@ -0,0 +1,13 @@
+---
+title: "mg_send_websocket_handshake3()"
+decl_name: "mg_send_websocket_handshake3"
+symbol_kind: "func"
+signature: |
+  void mg_send_websocket_handshake3(struct mg_connection *nc, const char *path,
+                                    const char *host, const char *protocol,
+                                    const char *extra_headers, const char *user,
+                                    const char *pass);
+---
+
+Like mg_send_websocket_handshake2 but also passes basic auth header 
+

docs/c-api/http.h/mg_set_protocol_http_websocket.md

@@ -6,45 +6,54 @@ signature: |
   void mg_set_protocol_http_websocket(struct mg_connection *nc);
 ---
 
-Attach built-in HTTP event handler to the given connection.
-User-defined event handler will receive following extra events:
+Attaches a built-in HTTP event handler to the given connection.
+The user-defined event handler will receive following extra events:
 
 - MG_EV_HTTP_REQUEST: HTTP request has arrived. Parsed HTTP request
  is passed as
   `struct http_message` through the handler's `void *ev_data` pointer.
-- MG_EV_HTTP_MULTIPART_REQUEST: A multipart POST request has received.
-  This event is sent before body is parsed. After this user
-  should expect a sequence of MG_EV_HTTP_PART_BEGIN/DATA/END requests.
-  This is also the last time when headers and other request fields are
-  accessible.
-- MG_EV_HTTP_REPLY: HTTP reply has arrived. Parsed HTTP reply is passed as
-  `struct http_message` through the handler's `void *ev_data` pointer.
-- MG_EV_HTTP_CHUNK: HTTP chunked-encoding chunk has arrived.
-  Parsed HTTP reply is passed as `struct http_message` through the
+- MG_EV_HTTP_REPLY: The HTTP reply has arrived. The parsed HTTP reply is
+  passed as `struct http_message` through the handler's `void *ev_data`
+  pointer.
+- MG_EV_HTTP_CHUNK: The HTTP chunked-encoding chunk has arrived.
+  The parsed HTTP reply is passed as `struct http_message` through the
   handler's `void *ev_data` pointer. `http_message::body` would contain
   incomplete, reassembled HTTP body.
-  It will grow with every new chunk arrived, and
-  potentially can consume a lot of memory. An event handler may process
+  It will grow with every new chunk that arrives, and it can
+  potentially consume a lot of memory. An event handler may process
   the body as chunks are coming, and signal Mongoose to delete processed
   body by setting `MG_F_DELETE_CHUNK` in `mg_connection::flags`. When
   the last zero chunk is received,
   Mongoose sends `MG_EV_HTTP_REPLY` event with
   full reassembled body (if handler did not signal to delete chunks) or
   with empty body (if handler did signal to delete chunks).
-- MG_EV_WEBSOCKET_HANDSHAKE_REQUEST: server has received websocket handshake
-  request. `ev_data` contains parsed HTTP request.
-- MG_EV_WEBSOCKET_HANDSHAKE_DONE: server has completed Websocket handshake.
-  `ev_data` is `NULL`.
-- MG_EV_WEBSOCKET_FRAME: new websocket frame has arrived. `ev_data` is
+- MG_EV_WEBSOCKET_HANDSHAKE_REQUEST: server has received the WebSocket
+  handshake request. `ev_data` contains parsed HTTP request.
+- MG_EV_WEBSOCKET_HANDSHAKE_DONE: server has completed the WebSocket
+  handshake. `ev_data` is `NULL`.
+- MG_EV_WEBSOCKET_FRAME: new WebSocket frame has arrived. `ev_data` is
   `struct websocket_message *`
-- MG_EV_HTTP_PART_BEGIN: new part of multipart message is started,
-  extra parameters are passed in mg_http_multipart_part
-- MG_EV_HTTP_PART_DATA: new portion of data from multiparted message
-  no additional headers are available, only data and data size
-- MG_EV_HTTP_PART_END: final boundary received, analogue to maybe used to
-  find the end of packet
-  Note: Mongoose should be compiled with MG_ENABLE_HTTP_STREAMING_MULTIPART
-  to enable MG_EV_HTTP_MULTIPART_REQUEST, MG_EV_HTTP_REQUEST_END,
-  MG_EV_HTTP_REQUEST_CANCEL, MG_EV_HTTP_PART_BEGIN, MG_EV_HTTP_PART_DATA,
-  MG_EV_HTTP_PART_END constants 
+
+When compiled with MG_ENABLE_HTTP_STREAMING_MULTIPART, Mongoose parses
+multipart requests and splits them into separate events:
+- MG_EV_HTTP_MULTIPART_REQUEST: Start of the request.
+  This event is sent before body is parsed. After this, the user
+  should expect a sequence of PART_BEGIN/DATA/END requests.
+  This is also the last time when headers and other request fields are
+  accessible.
+- MG_EV_HTTP_PART_BEGIN: Start of a part of a multipart message.
+  Argument: mg_http_multipart_part with var_name and file_name set
+  (if present). No data is passed in this message.
+- MG_EV_HTTP_PART_DATA: new portion of data from the multipart message.
+  Argument: mg_http_multipart_part. var_name and file_name are preserved,
+  data is available in mg_http_multipart_part.data.
+- MG_EV_HTTP_PART_END: End of the current part. var_name, file_name are
+  the same, no data in the message. If status is 0, then the part is
+  properly terminated with a boundary, status < 0 means that connection
+  was terminated.
+- MG_EV_HTTP_MULTIPART_REQUEST_END: End of the multipart request.
+  Argument: mg_http_multipart_part, var_name and file_name are NULL,
+  status = 0 means request was properly closed, < 0 means connection
+  was terminated (note: in this case both PART_END and REQUEST_END are
+  delivered). 
 

docs/c-api/http.h/mg_url_decode.md

@@ -7,12 +7,12 @@ signature: |
                     int is_form_url_encoded);
 ---
 
-Decode URL-encoded string.
+Decodes a URL-encoded string.
 
 Source string is specified by (`src`, `src_len`), and destination is
 (`dst`, `dst_len`). If `is_form_url_encoded` is non-zero, then
 `+` character is decoded as a blank space character. This function
-guarantees to `\0`-terminate the destination. If destination is too small,
-then source string is partially decoded and `-1` is returned. Otherwise,
-a length of decoded string is returned, not counting final `\0`. 
+guarantees to NUL-terminate the destination. If destination is too small,
+then the source string is partially decoded and `-1` is returned. Otherwise,
+a length of the decoded string is returned, not counting final NUL. 
 

docs/c-api/http.h/struct_mg_ssi_call_ctx.md

@@ -0,0 +1,14 @@
+---
+title: "struct mg_ssi_call_ctx"
+decl_name: "struct mg_ssi_call_ctx"
+symbol_kind: "struct"
+signature: |
+  struct mg_ssi_call_ctx {
+    struct http_message *req; /* The request being processed. */
+    struct mg_str file;       /* Filesystem path of the file being processed. */
+    struct mg_str arg; /* The argument passed to the tag: <!-- call arg -->. */
+  };
+---
+
+SSI call context 
+

docs/c-api/http_client.h/intro.md

@@ -0,0 +1,12 @@
+---
+title: "Client API reference"
+symbol_kind: "intro"
+decl_name: "http_client.h"
+items:
+  - { name: mg_connect_http.md }
+  - { name: mg_connect_http_opt.md }
+  - { name: mg_http_create_digest_auth_header.md }
+---
+
+
+

docs/c-api/http_client.h/mg_connect_http.md

@@ -10,16 +10,16 @@ signature: |
                                         const char *post_data);
 ---
 
-Helper function that creates outbound HTTP connection.
+Helper function that creates an outbound HTTP connection.
 
-`url` is a URL to fetch. It must be properly URL-encoded, e.g. have
-no spaces, etc. By default, `mg_connect_http()` sends Connection and
-Host headers. `extra_headers` is an extra HTTP headers to send, e.g.
+`url` is the URL to fetch. It must be properly URL-encoded, e.g. have
+no spaces, etc. By default, `mg_connect_http()` sends the Connection and
+Host headers. `extra_headers` is an extra HTTP header to send, e.g.
 `"User-Agent: my-app\r\n"`.
-If `post_data` is NULL, then GET request is created. Otherwise, POST request
-is created with the specified POST data. Note that if the data being posted
-is a form submission, the `Content-Type` header should be set accordingly
-(see example below).
+If `post_data` is NULL, then a GET request is created. Otherwise, a POST
+request is created with the specified POST data. Note that if the data being
+posted is a form submission, the `Content-Type` header should be set
+accordingly (see example below).
 
 Examples:
 

docs/c-api/http_client.h/mg_connect_http_opt.md

@@ -11,8 +11,9 @@ signature: |
                                             const char *post_data);
 ---
 
-Helper function that creates outbound HTTP connection.
+Helper function that creates an outbound HTTP connection.
 
-Mostly identical to mg_connect_http, but allows to provide extra parameters
-(for example, SSL parameters 
+Mostly identical to mg_connect_http, but allows you to provide extra
+*parameters
+(for example, SSL parameters) 
 

docs/c-api/http_client.h/mg_http_create_digest_auth_header.md

@@ -9,5 +9,5 @@ signature: |
                                         const char *passwd);
 ---
 
-Create Digest authentication header for client request. 
+Creates digest authentication header for a client request. 
 

docs/c-api/http_server.h/intro.md

@@ -0,0 +1,31 @@
+---
+title: "Server API reference"
+symbol_kind: "intro"
+decl_name: "http_server.h"
+items:
+  - { name: mg_file_upload_handler.md }
+  - { name: mg_get_http_basic_auth.md }
+  - { name: mg_get_http_header.md }
+  - { name: mg_get_http_var.md }
+  - { name: mg_http_check_digest_auth.md }
+  - { name: mg_http_parse_header.md }
+  - { name: mg_http_reverse_proxy.md }
+  - { name: mg_http_send_error.md }
+  - { name: mg_http_send_redirect.md }
+  - { name: mg_http_serve_file.md }
+  - { name: mg_parse_http.md }
+  - { name: mg_parse_http_basic_auth.md }
+  - { name: mg_parse_multipart.md }
+  - { name: mg_printf_html_escape.md }
+  - { name: mg_printf_http_chunk.md }
+  - { name: mg_register_http_endpoint.md }
+  - { name: mg_send_head.md }
+  - { name: mg_send_http_chunk.md }
+  - { name: mg_send_response_line.md }
+  - { name: mg_serve_http.md }
+  - { name: mg_fu_fname_fn.md }
+  - { name: struct_mg_serve_http_opts.md }
+---
+
+
+

docs/c-api/http_server.h/mg_file_upload_handler.md

@@ -12,9 +12,10 @@ This handler can be used to implement file uploads with minimum code.
 This handler will process MG_EV_HTTP_PART_* events and store file data into
 a local file.
 `local_name_fn` will be invoked with whatever name was provided by the client
-and will expect the name of the local file to open. Return value of NULL will
-abort file upload (client will get a "403 Forbidden" response). If non-null,
-the returned string must be heap-allocated and will be freed by the caller.
+and will expect the name of the local file to open. A return value of NULL
+will abort file upload (client will get a "403 Forbidden" response). If
+non-null, the returned string must be heap-allocated and will be freed by
+the caller.
 Exception: it is ok to return the same string verbatim.
 
 Example:

docs/c-api/http_server.h/mg_get_http_basic_auth.md

@@ -0,0 +1,14 @@
+---
+title: "mg_get_http_basic_auth()"
+decl_name: "mg_get_http_basic_auth"
+symbol_kind: "func"
+signature: |
+  int mg_get_http_basic_auth(struct http_message *hm, char *user, size_t user_len,
+                             char *pass, size_t pass_len);
+---
+
+Gets and parses the Authorization: Basic header
+Returns -1 if no Authorization header is found, or if
+mg_parse_http_basic_auth
+fails parsing the resulting header. 
+

docs/c-api/http_server.h/mg_get_http_header.md

@@ -6,7 +6,7 @@ signature: |
   struct mg_str *mg_get_http_header(struct http_message *hm, const char *name);
 ---
 
-Search and return header `name` in parsed HTTP message `hm`.
+Searches and returns the header `name` in parsed HTTP message `hm`.
 If header is not found, NULL is returned. Example:
 
     struct mg_str *host_hdr = mg_get_http_header(hm, "Host"); 

docs/c-api/http_server.h/mg_get_http_var.md

@@ -0,0 +1,16 @@
+---
+title: "mg_get_http_var()"
+decl_name: "mg_get_http_var"
+symbol_kind: "func"
+signature: |
+  int mg_get_http_var(const struct mg_str *buf, const char *name, char *dst,
+                      size_t dst_len);
+---
+
+Fetches a HTTP form variable.
+
+Fetches a variable `name` from a `buf` into a buffer specified by `dst`,
+`dst_len`. The destination is always zero-terminated. Returns the length of
+a fetched variable. If not found, 0 is returned. `buf` must be valid
+url-encoded buffer. If destination is too small, `-1` is returned. 
+

docs/c-api/http_server.h/mg_http_check_digest_auth.md

@@ -7,6 +7,6 @@ signature: |
                                 FILE *fp);
 ---
 
-Authenticate HTTP request against opened passwords file.
+Authenticates a HTTP request against an opened password file.
 Returns 1 if authenticated, 0 otherwise. 
 

docs/c-api/http_server.h/mg_http_parse_header.md

@@ -7,17 +7,17 @@ signature: |
                            size_t buf_size);
 ---
 
-Parse HTTP header `hdr`. Find variable `var_name` and store it's value
-in the buffer `buf`, `buf_size`. Return 0 if variable not found, non-zero
+Parses the HTTP header `hdr`. Finds variable `var_name` and stores its value
+in the buffer `buf`, `buf_size`. Returns 0 if variable not found, non-zero
 otherwise.
 
-This function is supposed to parse
-cookies, authentication headers, etcetera. Example (error handling omitted):
+This function is supposed to parse cookies, authentication headers, etc.
+Example (error handling omitted):
 
     char user[20];
     struct mg_str *hdr = mg_get_http_header(hm, "Authorization");
     mg_http_parse_header(hdr, "username", user, sizeof(user));
 
-Return length of the variable's value. If buffer is not large enough,
+Returns the length of the variable's value. If buffer is not large enough,
 or variable not found, 0 is returned. 
 

docs/c-api/http_server.h/mg_http_reverse_proxy.md

@@ -0,0 +1,19 @@
+---
+title: "mg_http_reverse_proxy()"
+decl_name: "mg_http_reverse_proxy"
+symbol_kind: "func"
+signature: |
+  void mg_http_reverse_proxy(struct mg_connection *nc,
+                             const struct http_message *hm, struct mg_str mount,
+                             struct mg_str upstream);
+---
+
+Proxies a given request to a given upstream http server. The path prefix
+in `mount` will be stripped of the path requested to the upstream server,
+e.g. if mount is /api and upstream is http://localhost:8001/foo
+then an incoming request to /api/bar will cause a request to
+http://localhost:8001/foo/bar
+
+EXPERIMENTAL API. Please use http_serve_http + url_rewrites if a static
+mapping is good enough. 
+

docs/c-api/http_server.h/mg_http_send_error.md

@@ -0,0 +1,11 @@
+---
+title: "mg_http_send_error()"
+decl_name: "mg_http_send_error"
+symbol_kind: "func"
+signature: |
+  void mg_http_send_error(struct mg_connection *nc, int code, const char *reason);
+---
+
+Sends an error response. If reason is NULL, the message will be inferred
+from the error code (if supported). 
+

docs/c-api/http_server.h/mg_http_send_redirect.md

@@ -0,0 +1,20 @@
+---
+title: "mg_http_send_redirect()"
+decl_name: "mg_http_send_redirect"
+symbol_kind: "func"
+signature: |
+  void mg_http_send_redirect(struct mg_connection *nc, int status_code,
+                             const struct mg_str location,
+                             const struct mg_str extra_headers);
+---
+
+Sends a redirect response.
+`status_code` should be either 301 or 302 and `location` point to the
+new location.
+If `extra_headers` is not empty, then `extra_headers` are also sent
+after the reponse line. `extra_headers` must NOT end end with new line.
+
+Example:
+
+     mg_http_send_redirect(nc, 302, mg_mk_str("/login"), mg_mk_str(NULL)); 
+

docs/c-api/http_server.h/mg_http_serve_file.md

@@ -0,0 +1,28 @@
+---
+title: "mg_http_serve_file()"
+decl_name: "mg_http_serve_file"
+symbol_kind: "func"
+signature: |
+  void mg_http_serve_file(struct mg_connection *nc, struct http_message *hm,
+                          const char *path, const struct mg_str mime_type,
+                          const struct mg_str extra_headers);
+---
+
+Serves a specific file with a given MIME type and optional extra headers.
+
+Example code snippet:
+
+```c
+static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) {
+  switch (ev) {
+    case MG_EV_HTTP_REQUEST: {
+      struct http_message *hm = (struct http_message *) ev_data;
+      mg_http_serve_file(nc, hm, "file.txt",
+                         mg_mk_str("text/plain"), mg_mk_str(""));
+      break;
+    }
+    ...
+  }
+}
+``` 
+

docs/c-api/http_server.h/mg_parse_http.md

@@ -0,0 +1,15 @@
+---
+title: "mg_parse_http()"
+decl_name: "mg_parse_http"
+symbol_kind: "func"
+signature: |
+  int mg_parse_http(const char *s, int n, struct http_message *hm, int is_req);
+---
+
+Parses a HTTP message.
+
+`is_req` should be set to 1 if parsing a request, 0 if reply.
+
+Returns the number of bytes parsed. If HTTP message is
+incomplete `0` is returned. On parse error, a negative number is returned. 
+

docs/c-api/http_server.h/mg_parse_http_basic_auth.md

@@ -0,0 +1,13 @@
+---
+title: "mg_parse_http_basic_auth()"
+decl_name: "mg_parse_http_basic_auth"
+symbol_kind: "func"
+signature: |
+  int mg_parse_http_basic_auth(struct mg_str *hdr, char *user, size_t user_len,
+                               char *pass, size_t pass_len);
+---
+
+Parses the Authorization: Basic header
+Returns -1 iif the authorization type is not "Basic" or any other error such
+as incorrectly encoded base64 user password pair. 
+

docs/c-api/http_server.h/mg_parse_multipart.md

@@ -9,13 +9,13 @@ signature: |
                             size_t *chunk_len);
 ---
 
-Parse buffer `buf`, `buf_len` that contains multipart form data chunks.
-Store chunk name in a `var_name`, `var_name_len` buffer.
+Parses the buffer `buf`, `buf_len` that contains multipart form data chunks.
+Stores the chunk name in a `var_name`, `var_name_len` buffer.
 If a chunk is an uploaded file, then `file_name`, `file_name_len` is
 filled with an uploaded file name. `chunk`, `chunk_len`
 points to the chunk data.
 
-Return: number of bytes to skip to the next chunk, or 0 if there are
+Return: number of bytes to skip to the next chunk or 0 if there are
         no more chunks.
 
 Usage example:

docs/c-api/http_server.h/mg_printf_html_escape.md

@@ -6,5 +6,5 @@ signature: |
   void mg_printf_html_escape(struct mg_connection *nc, const char *fmt, ...);
 ---
 
-Send printf-formatted HTTP chunk, escaping HTML tags. 
+Sends a printf-formatted HTTP chunk, escaping HTML tags. 
 

docs/c-api/http_server.h/mg_printf_http_chunk.md

@@ -6,6 +6,6 @@ signature: |
   void mg_printf_http_chunk(struct mg_connection *nc, const char *fmt, ...);
 ---
 
-Send printf-formatted HTTP chunk.
+Sends a printf-formatted HTTP chunk.
 Functionality is similar to `mg_send_http_chunk()`. 
 

docs/c-api/http_server.h/mg_register_http_endpoint.md

@@ -7,8 +7,8 @@ signature: |
                                  mg_event_handler_t handler);
 ---
 
-Register callback for specified http endpoint
-Note: if callback is registered it is called instead of
+Registers a callback for a specified http endpoint
+Note: if callback is registered it is called instead of the
 callback provided in mg_bind
 
 Example code snippet:

docs/c-api/http_server.h/mg_send_head.md

@@ -7,15 +7,16 @@ signature: |
                     int64_t content_length, const char *extra_headers);
 ---
 
-Send response line and headers.
-This function sends response line with the `status_code`, and automatically
-sends one header: either "Content-Length", or "Transfer-Encoding".
+Sends the response line and headers.
+This function sends the response line with the `status_code`, and
+automatically
+sends one header: either "Content-Length" or "Transfer-Encoding".
 If `content_length` is negative, then "Transfer-Encoding: chunked" header
 is sent, otherwise, "Content-Length" header is sent.
 
 NOTE: If `Transfer-Encoding` is `chunked`, then message body must be sent
 using `mg_send_http_chunk()` or `mg_printf_http_chunk()` functions.
 Otherwise, `mg_send()` or `mg_printf()` must be used.
-Extra headers could be set through `extra_headers` - and note `extra_headers`
+Extra headers could be set through `extra_headers`. Note `extra_headers`
 must NOT be terminated by a new line. 
 

docs/c-api/http_server.h/mg_send_http_chunk.md

@@ -0,0 +1,25 @@
+---
+title: "mg_send_http_chunk()"
+decl_name: "mg_send_http_chunk"
+symbol_kind: "func"
+signature: |
+  void mg_send_http_chunk(struct mg_connection *nc, const char *buf, size_t len);
+---
+
+Sends buffer `buf` of size `len` to the client using chunked HTTP encoding.
+This function sends the buffer size as hex number + newline first, then
+the buffer itself, then the newline. For example,
+`mg_send_http_chunk(nc, "foo", 3)` whill append the `3\r\nfoo\r\n` string
+to the `nc->send_mbuf` output IO buffer.
+
+NOTE: The HTTP header "Transfer-Encoding: chunked" should be sent prior to
+using this function.
+
+NOTE: do not forget to send an empty chunk at the end of the response,
+to tell the client that everything was sent. Example:
+
+```
+  mg_printf_http_chunk(nc, "%s", "my response!");
+  mg_send_http_chunk(nc, "", 0); // Tell the client we're finished
+``` 
+

docs/c-api/http_server.h/mg_send_response_line.md

@@ -3,11 +3,11 @@ title: "mg_send_response_line()"
 decl_name: "mg_send_response_line"
 symbol_kind: "func"
 signature: |
-  void mg_send_response_line(struct mg_connection *c, int status_code,
+  void mg_send_response_line(struct mg_connection *nc, int status_code,
                              const char *extra_headers);
 ---
 
-Send response status line.
+Sends the response status line.
 If `extra_headers` is not NULL, then `extra_headers` are also sent
 after the reponse line. `extra_headers` must NOT end end with new line.
 Example:

docs/c-api/http_server.h/mg_serve_http.md

@@ -7,7 +7,7 @@ signature: |
                      struct mg_serve_http_opts opts);
 ---
 
-Serve given HTTP request according to the `options`.
+Serves given HTTP request according to the `options`.
 
 Example code snippet:
 

docs/c-api/http_server.h/struct_mg_serve_http_opts.md

@@ -37,22 +37,82 @@ signature: |
     /* Set to "no" to disable directory listing. Enabled by default. */
     const char *enable_directory_listing;
   
-    /* SSI files pattern. If not set, "**.shtml$|**.shtm$" is used. */
+    /*
+     * SSI files pattern. If not set, "**.shtml$|**.shtm$" is used.
+     *
+     * All files that match ssi_pattern are treated as SSI.
+     *
+     * Server Side Includes (SSI) is a simple interpreted server-side scripting
+     * language which is most commonly used to include the contents of a file
+     * into a web page. It can be useful when it is desirable to include a common
+     * piece of code throughout a website, for example, headers and footers.
+     *
+     * In order for a webpage to recognize an SSI-enabled HTML file, the
+     * filename should end with a special extension, by default the extension
+     * should be either .shtml or .shtm
+     *
+     * Unknown SSI directives are silently ignored by Mongoose. Currently,
+     * the following SSI directives are supported:
+     *    <!--#include FILE_TO_INCLUDE -->
+     *    <!--#exec "COMMAND_TO_EXECUTE" -->
+     *    <!--#call COMMAND -->
+     *
+     * Note that <!--#include ...> directive supports three path
+     *specifications:
+     *
+     * <!--#include virtual="path" -->  Path is relative to web server root
+     * <!--#include abspath="path" -->  Path is absolute or relative to the
+     *                                  web server working dir
+     * <!--#include file="path" -->,    Path is relative to current document
+     * <!--#include "path" -->
+     *
+     * The include directive may be used to include the contents of a file or
+     * the result of running a CGI script.
+     *
+     * The exec directive is used to execute
+     * a command on a server, and show command's output. Example:
+     *
+     * <!--#exec "ls -l" -->
+     *
+     * The call directive is a way to invoke a C handler from the HTML page.
+     * On each occurence of <!--#call COMMAND OPTIONAL_PARAMS> directive,
+     * Mongoose calls a registered event handler with MG_EV_SSI_CALL event,
+     * and event parameter will point to the COMMAND OPTIONAL_PARAMS string.
+     * An event handler can output any text, for example by calling
+     * `mg_printf()`. This is a flexible way of generating a web page on
+     * server side by calling a C event handler. Example:
+     *
+     * <!--#call foo --> ... <!--#call bar -->
+     *
+     * In the event handler:
+     *    case MG_EV_SSI_CALL: {
+     *      const char *param = (const char *) ev_data;
+     *      if (strcmp(param, "foo") == 0) {
+     *        mg_printf(c, "hello from foo");
+     *      } else if (strcmp(param, "bar") == 0) {
+     *        mg_printf(c, "hello from bar");
+     *      }
+     *      break;
+     *    }
+     */
     const char *ssi_pattern;
   
     /* IP ACL. By default, NULL, meaning all IPs are allowed to connect */
     const char *ip_acl;
   
+  #if MG_ENABLE_HTTP_URL_REWRITES
     /* URL rewrites.
      *
-     * Comma-separated list of `uri_pattern=file_or_directory_path` rewrites.
+     * Comma-separated list of `uri_pattern=url_file_or_directory_path` rewrites.
      * When HTTP request is received, Mongoose constructs a file name from the
      * requested URI by combining `document_root` and the URI. However, if the
      * rewrite option is used and `uri_pattern` matches requested URI, then
-     * `document_root` is ignored. Instead, `file_or_directory_path` is used,
+     * `document_root` is ignored. Instead, `url_file_or_directory_path` is used,
      * which should be a full path name or a path relative to the web server's
-     * current working directory. Note that `uri_pattern`, as all Mongoose
-     * patterns, is a prefix pattern.
+     * current working directory. It can also be an URI (http:// or https://)
+     * in which case mongoose will behave as a reverse proxy for that destination.
+     *
+     * Note that `uri_pattern`, as all Mongoose patterns, is a prefix pattern.
      *
      * If uri_pattern starts with `@` symbol, then Mongoose compares it with the
      * HOST header of the request. If they are equal, Mongoose sets document root
@@ -66,6 +126,7 @@ signature: |
      * automatically appended to the redirect location.
      */
     const char *url_rewrites;
+  #endif
   
     /* DAV document root. If NULL, DAV requests are going to fail. */
     const char *dav_document_root;

docs/c-api/intro.md

@@ -1,12 +1,16 @@
 ---
 items:
-  - { type: dir, name: mbuf.h }
-  - { type: dir, name: net.h }
-  - { type: dir, name: http.h }
-  - { type: dir, name: dns.h }
-  - { type: dir, name: dns-server.h }
-  - { type: dir, name: mqtt.h }
-  - { type: dir, name: mqtt-broker.h }
-  - { type: dir, name: coap.h }
-  - { type: dir, name: util.h }
+  - { name: mbuf.h }
+  - { name: net.h }
+  - { name: http.h }
+  - { name: http_server.h }
+  - { name: http_client.h }
+  - { name: dns.h }
+  - { name: dns_server.h }
+  - { name: resolv.h }
+  - { name: mqtt.h }
+  - { name: mqtt_server.h }
+  - { name: coap.h }
+  - { name: util.h }
+  - { name: uri.h }
 ---

docs/c-api/mbuf.h/intro.md

@@ -3,18 +3,18 @@ title: "Memory Buffers"
 symbol_kind: "intro"
 decl_name: "mbuf.h"
 items:
-  - { type: file, name: mbuf_init.md }
-  - { type: file, name: mbuf_free.md }
-  - { type: file, name: mbuf_append.md }
-  - { type: file, name: mbuf_insert.md }
-  - { type: file, name: mbuf_remove.md }
-  - { type: file, name: mbuf_resize.md }
-  - { type: file, name: mbuf_trim.md }
-  - { type: file, name: struct_mbuf.md }
+  - { name: mbuf_append.md }
+  - { name: mbuf_free.md }
+  - { name: mbuf_init.md }
+  - { name: mbuf_insert.md }
+  - { name: mbuf_remove.md }
+  - { name: mbuf_resize.md }
+  - { name: mbuf_trim.md }
+  - { name: struct_mbuf.md }
 ---
 
 Mbufs are mutable/growing memory buffers, like C++ strings.
-Mbuf can append data to the end of a buffer, or insert data into arbitrary
+Mbuf can append data to the end of a buffer or insert data into arbitrary
 position in the middle of a buffer. The buffer grows automatically when
 needed.
 

docs/c-api/mbuf.h/mbuf_append.md

@@ -8,5 +8,5 @@ signature: |
 
 Appends data to the Mbuf.
 
-Return the number of bytes appended, or 0 if out of memory. 
+Returns the number of bytes appended or 0 if out of memory. 
 

docs/c-api/mbuf.h/mbuf_free.md

@@ -6,5 +6,5 @@ signature: |
   void mbuf_free(struct mbuf *);
 ---
 
-Free the space allocated for the mbuffer and resets the mbuf structure. 
+Frees the space allocated for the mbuffer and resets the mbuf structure. 
 

docs/c-api/mbuf.h/mbuf_init.md

@@ -6,6 +6,6 @@ signature: |
   void mbuf_init(struct mbuf *, size_t initial_capacity);
 ---
 
-Initialize an Mbuf.
+Initialises an Mbuf.
 `initial_capacity` specifies the initial capacity of the mbuf. 
 

docs/c-api/mbuf.h/mbuf_insert.md

@@ -6,9 +6,9 @@ signature: |
   size_t mbuf_insert(struct mbuf *, size_t, const void *, size_t);
 ---
 
-Insert data at a specified offset in the Mbuf.
+Inserts data at a specified offset in the Mbuf.
 
 Existing data will be shifted forwards and the buffer will
 be grown if necessary.
-Return the number of bytes inserted. 
+Returns the number of bytes inserted. 
 

docs/c-api/mbuf.h/mbuf_remove.md

@@ -6,5 +6,5 @@ signature: |
   void mbuf_remove(struct mbuf *, size_t data_size);
 ---
 
-Remove `data_size` bytes from the beginning of the buffer. 
+Removes `data_size` bytes from the beginning of the buffer. 
 

docs/c-api/mbuf.h/mbuf_resize.md

@@ -6,7 +6,7 @@ signature: |
   void mbuf_resize(struct mbuf *, size_t new_size);
 ---
 
-Resize an Mbuf.
+Resizes an Mbuf.
 
 If `new_size` is smaller than buffer's `len`, the
 resize is not performed. 

docs/c-api/mbuf.h/mbuf_trim.md

@@ -6,5 +6,5 @@ signature: |
   void mbuf_trim(struct mbuf *);
 ---
 
-Shrink an Mbuf by resizing its `size` to `len`. 
+Shrinks an Mbuf by resizing its `size` to `len`. 
 

docs/c-api/mqtt-broker.h/intro.md

@@ -1,14 +0,0 @@
----
-title: "MQTT Broker"
-symbol_kind: "intro"
-decl_name: "mqtt-broker.h"
-items:
-  - { type: file, name: mg_mqtt_broker_init.md }
-  - { type: file, name: mg_mqtt_broker.md }
-  - { type: file, name: mg_mqtt_next.md }
-  - { type: file, name: struct_mg_mqtt_session.md }
-  - { type: file, name: struct_mg_mqtt_broker.md }
----
-
-
-

docs/c-api/mqtt-broker.h/mg_mqtt_broker.md

@@ -1,32 +0,0 @@
----
-title: "mg_mqtt_broker()"
-decl_name: "mg_mqtt_broker"
-symbol_kind: "func"
-signature: |
-  void mg_mqtt_broker(struct mg_connection *brk, int ev, void *data);
----
-
-Process a MQTT broker message.
-
-Listening connection expects a pointer to an initialized `mg_mqtt_broker`
-structure in the `user_data` field.
-
-Basic usage:
-
-```c
-mg_mqtt_broker_init(&brk, NULL);
-
-if ((nc = mg_bind(&mgr, address, mg_mqtt_broker)) == NULL) {
-  // fail;
-}
-nc->user_data = &brk;
-```
-
-New incoming connections will receive a `mg_mqtt_session` structure
-in the connection `user_data`. The original `user_data` will be stored
-in the `user_data` field of the session structure. This allows the user
-handler to store user data before `mg_mqtt_broker` creates the session.
-
-Since only the MG_EV_ACCEPT message is processed by the listening socket,
-for most events the `user_data` will thus point to a `mg_mqtt_session`. 
-

docs/c-api/mqtt-broker.h/mg_mqtt_broker_init.md

@@ -1,10 +0,0 @@
----
-title: "mg_mqtt_broker_init()"
-decl_name: "mg_mqtt_broker_init"
-symbol_kind: "func"
-signature: |
-  void mg_mqtt_broker_init(struct mg_mqtt_broker *brk, void *user_data);
----
-
-Initialize a MQTT broker. 
-

docs/c-api/mqtt-broker.h/mg_mqtt_next.md

@@ -1,18 +0,0 @@
----
-title: "mg_mqtt_next()"
-decl_name: "mg_mqtt_next"
-symbol_kind: "func"
-signature: |
-  struct mg_mqtt_session *mg_mqtt_next(struct mg_mqtt_broker *brk,
-                                       struct mg_mqtt_session *s);
----
-
-Iterate over all mqtt sessions connections. Example:
-
-```c
-struct mg_mqtt_session *s;
-for (s = mg_mqtt_next(brk, NULL); s != NULL; s = mg_mqtt_next(brk, s)) {
-  // Do something
-}
-``` 
-

docs/c-api/mqtt-broker.h/struct_mg_mqtt_session.md

@@ -1,17 +0,0 @@
----
-title: "struct mg_mqtt_session"
-decl_name: "struct mg_mqtt_session"
-symbol_kind: "struct"
-signature: |
-  struct mg_mqtt_session {
-    struct mg_mqtt_broker *brk;          /* Broker */
-    struct mg_mqtt_session *next, *prev; /* mg_mqtt_broker::sessions linkage */
-    struct mg_connection *nc;            /* Connection with the client */
-    size_t num_subscriptions;            /* Size of `subscriptions` array */
-    struct mg_mqtt_topic_expression *subscriptions;
-    void *user_data; /* User data */
-  };
----
-
-MQTT session (Broker side). 
-

docs/c-api/mqtt.h/intro.md

@@ -1,26 +1,26 @@
 ---
-title: "MQTT"
+title: "MQTT API reference"
 symbol_kind: "intro"
 decl_name: "mqtt.h"
 items:
-  - { type: file, name: mg_set_protocol_mqtt.md }
-  - { type: file, name: mg_send_mqtt_handshake.md }
-  - { type: file, name: mg_send_mqtt_handshake_opt.md }
-  - { type: file, name: mg_mqtt_publish.md }
-  - { type: file, name: mg_mqtt_subscribe.md }
-  - { type: file, name: mg_mqtt_unsubscribe.md }
-  - { type: file, name: mg_mqtt_disconnect.md }
-  - { type: file, name: mg_mqtt_connack.md }
-  - { type: file, name: mg_mqtt_puback.md }
-  - { type: file, name: mg_mqtt_pubrec.md }
-  - { type: file, name: mg_mqtt_pubrel.md }
-  - { type: file, name: mg_mqtt_pubcomp.md }
-  - { type: file, name: mg_mqtt_suback.md }
-  - { type: file, name: mg_mqtt_unsuback.md }
-  - { type: file, name: mg_mqtt_ping.md }
-  - { type: file, name: mg_mqtt_pong.md }
-  - { type: file, name: mg_mqtt_next_subscribe_topic.md }
-  - { type: file, name: struct_mg_mqtt_topic_expression.md }
+  - { name: mg_mqtt_connack.md }
+  - { name: mg_mqtt_disconnect.md }
+  - { name: mg_mqtt_next_subscribe_topic.md }
+  - { name: mg_mqtt_ping.md }
+  - { name: mg_mqtt_pong.md }
+  - { name: mg_mqtt_puback.md }
+  - { name: mg_mqtt_pubcomp.md }
+  - { name: mg_mqtt_publish.md }
+  - { name: mg_mqtt_pubrec.md }
+  - { name: mg_mqtt_pubrel.md }
+  - { name: mg_mqtt_suback.md }
+  - { name: mg_mqtt_subscribe.md }
+  - { name: mg_mqtt_unsuback.md }
+  - { name: mg_mqtt_unsubscribe.md }
+  - { name: mg_send_mqtt_handshake.md }
+  - { name: mg_send_mqtt_handshake_opt.md }
+  - { name: mg_set_protocol_mqtt.md }
+  - { name: struct_mg_mqtt_proto_data.md }
 ---
 
 

docs/c-api/mqtt.h/mg_mqtt_connack.md

@@ -6,5 +6,5 @@ signature: |
   void mg_mqtt_connack(struct mg_connection *nc, uint8_t return_code);
 ---
 
-Send a CONNACK command with a given `return_code`. 
+Sends a CONNACK command with a given `return_code`. 
 

docs/c-api/mqtt.h/mg_mqtt_disconnect.md

@@ -6,5 +6,5 @@ signature: |
   void mg_mqtt_disconnect(struct mg_connection *nc);
 ---
 
-Send a DISCONNECT command. 
+Sends a DISCONNECT command. 
 

docs/c-api/mqtt.h/mg_mqtt_next_subscribe_topic.md

@@ -7,9 +7,9 @@ signature: |
                                    struct mg_str *topic, uint8_t *qos, int pos);
 ---
 
-Extract the next topic expression from a SUBSCRIBE command payload.
+Extracts the next topic expression from a SUBSCRIBE command payload.
 
-Topic expression name will point to a string in the payload buffer.
-Return the pos of the next topic expression or -1 when the list
+The topic expression name will point to a string in the payload buffer.
+Returns the pos of the next topic expression or -1 when the list
 of topics is exhausted. 
 

docs/c-api/mqtt.h/mg_mqtt_ping.md

@@ -6,5 +6,5 @@ signature: |
   void mg_mqtt_ping(struct mg_connection *nc);
 ---
 
-Send a PINGREQ command. 
+Sends a PINGREQ command. 
 

docs/c-api/mqtt.h/mg_mqtt_pong.md

@@ -6,5 +6,5 @@ signature: |
   void mg_mqtt_pong(struct mg_connection *nc);
 ---
 
-Send a PINGRESP command. 
+Sends a PINGRESP command. 
 

docs/c-api/mqtt.h/mg_mqtt_puback.md

@@ -6,5 +6,5 @@ signature: |
   void mg_mqtt_puback(struct mg_connection *nc, uint16_t message_id);
 ---
 
-Send a PUBACK command with a given `message_id`. 
+Sends a PUBACK command with a given `message_id`. 
 

docs/c-api/mqtt.h/mg_mqtt_pubcomp.md

@@ -6,5 +6,5 @@ signature: |
   void mg_mqtt_pubcomp(struct mg_connection *nc, uint16_t message_id);
 ---
 
-Send a PUBCOMP command with a given `message_id`. 
+Sends a PUBCOMP command with a given `message_id`. 
 

docs/c-api/mqtt.h/mg_mqtt_publish.md

@@ -8,5 +8,5 @@ signature: |
                        size_t len);
 ---
 
-Publish a message to a given topic. 
+Publishes a message to a given topic. 
 

docs/c-api/mqtt.h/mg_mqtt_pubrec.md

@@ -6,5 +6,5 @@ signature: |
   void mg_mqtt_pubrec(struct mg_connection *nc, uint16_t message_id);
 ---
 
-Send a PUBREC command with a given `message_id`. 
+Sends a PUBREC command with a given `message_id`. 
 

docs/c-api/mqtt.h/mg_mqtt_pubrel.md

@@ -6,5 +6,5 @@ signature: |
   void mg_mqtt_pubrel(struct mg_connection *nc, uint16_t message_id);
 ---
 
-Send a PUBREL command with a given `message_id`. 
+Sends a PUBREL command with a given `message_id`. 
 

docs/c-api/mqtt.h/mg_mqtt_suback.md

@@ -7,6 +7,6 @@ signature: |
                       uint16_t message_id);
 ---
 
-Send a SUBACK command with a given `message_id`
+Sends a SUBACK command with a given `message_id`
 and a sequence of granted QoSs. 
 

docs/c-api/mqtt.h/mg_mqtt_subscribe.md

@@ -8,5 +8,5 @@ signature: |
                          size_t topics_len, uint16_t message_id);
 ---
 
-Subscribe to a bunch of topics. 
+Subscribes to a bunch of topics. 
 

docs/c-api/mqtt.h/mg_mqtt_unsuback.md

@@ -6,5 +6,5 @@ signature: |
   void mg_mqtt_unsuback(struct mg_connection *nc, uint16_t message_id);
 ---
 
-Send a UNSUBACK command with a given `message_id`. 
+Sends a UNSUBACK command with a given `message_id`. 
 

docs/c-api/mqtt.h/mg_mqtt_unsubscribe.md

@@ -7,5 +7,5 @@ signature: |
                            size_t topics_len, uint16_t message_id);
 ---
 
-Unsubscribe from a bunch of topics. 
+Unsubscribes from a bunch of topics. 
 

docs/c-api/mqtt.h/mg_send_mqtt_handshake.md

@@ -6,5 +6,5 @@ signature: |
   void mg_send_mqtt_handshake(struct mg_connection *nc, const char *client_id);
 ---
 
-Send MQTT handshake. 
+Sends an MQTT handshake. 
 

docs/c-api/mqtt.h/mg_send_mqtt_handshake_opt.md

@@ -7,5 +7,5 @@ signature: |
                                   struct mg_send_mqtt_handshake_opts);
 ---
 
-Send MQTT handshake with optional parameters. 
+Sends an MQTT handshake with optional parameters. 
 

docs/c-api/mqtt.h/mg_set_protocol_mqtt.md

@@ -6,7 +6,7 @@ signature: |
   void mg_set_protocol_mqtt(struct mg_connection *nc);
 ---
 
-Attach built-in MQTT event handler to the given connection.
+Attaches a built-in MQTT event handler to the given connection.
 
 The user-defined event handler will receive following extra events:
 

docs/c-api/mqtt.h/struct_mg_mqtt_proto_data.md

@@ -0,0 +1,12 @@
+---
+title: "struct mg_mqtt_proto_data"
+decl_name: "struct mg_mqtt_proto_data"
+symbol_kind: "struct"
+signature: |
+  struct mg_mqtt_proto_data {
+    uint16_t keep_alive;
+  };
+---
+
+mg_mqtt_proto_data should be in header to allow external access to it 
+

docs/c-api/mqtt.h/struct_mg_mqtt_topic_expression.md

@@ -1,13 +0,0 @@
----
-title: "struct mg_mqtt_topic_expression"
-decl_name: "struct mg_mqtt_topic_expression"
-symbol_kind: "struct"
-signature: |
-  struct mg_mqtt_topic_expression {
-    const char *topic;
-    uint8_t qos;
-  };
----
-
-puback 
-

docs/c-api/mqtt_server.h/LIST_ENTRY.md

@@ -0,0 +1,10 @@
+---
+title: "LIST_ENTRY()"
+decl_name: "LIST_ENTRY"
+symbol_kind: "func"
+signature: |
+    LIST_ENTRY(mg_mqtt_session);
+---
+
+Broker 
+

docs/c-api/mqtt_server.h/intro.md

@@ -0,0 +1,12 @@
+---
+title: "MQTT Server API reference"
+symbol_kind: "intro"
+decl_name: "mqtt_server.h"
+items:
+  - { name: LIST_ENTRY.md }
+  - { name: struct_mg_mqtt_broker.md }
+  - { name: struct_mg_mqtt_session.md }
+---
+
+
+