Better logic for port resolving

If the uri is something like '/js/...jquery.js', remove_double_dots_and_double_slashes will remove the 3 dots and the http server will serves the /js/jquery.js file.
remove_double_dots_and_double_slashes should check if a dot or double dots is followed by a slash (or backslash) and only remove this to avoid disclosure attack.

.travis.yml

@@ -1,20 +0,0 @@
-language: cpp
-
-env:
- matrix:
-  - MONGOOSE_NO_SOCKETPAIR
-  - MONGOOSE_NO_FILESYSTEM
-  - MONGOOSE_NO_AUTH
-  - MONGOOSE_NO_DAV
-  - MONGOOSE_NO_DIRECTORY_LISTING
-  - MONGOOSE_NO_LOGGING
-  - MONGOOSE_NO_SSI
-  - MONGOOSE_NO_DL
-  - MONGOOSE_NO_WEBSOCKET
-
-compiler:
-  - gcc
-  - clang
-
-script:
-  - cd test && make

LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2004-2013 Sergey Lyubka <valenok@gmail.com>
-Copyright (c) 2013 Cesanta Software Limited
+Copyright (c) 2013-2015 Cesanta Software Limited
 All rights reserved
 
 This code is dual-licensed: you can redistribute it and/or modify

README.md

@@ -11,9 +11,11 @@ manufacturing, finance, research, automotive, gaming, IT.
 
 
    * [Mailing list](http://groups.google.com/group/mongoose-users)
-   * [Downloads](http://cesanta.com/mongoose.shtml)
+   * [Downloads](http://cesanta.com/products.shtml)
    * [Documentation](http://cesanta.com/docs.shtml)
 
+Check out Fossa - our [embedded multi-protocol library](https://github.com/cesanta/fossa) with TCP,UDP,HTTP,Websocket,MQTT,DNS support, designed for Internet Of Things!
+
 # Features
 
 - Works on Windows, Mac, UNIX/Linux, iPhone, Android eCos, QNX
@@ -43,24 +45,13 @@ Download, double-click to start, run browser -- that's all!
 ![shot3](http://cesanta.com/images/tut_sharing/tut3.png)
 ![shot4](http://cesanta.com/images/tut_sharing/tut4.png)
 
-# Acknowledgements
+# Contributions
 
-Mongoose made better thanks to the contribution of following people:
+People who have agreed to the
-
+[Cesanta CLA](http://cesanta.com/contributors_la.html)
-Arnout Vandecappelle, Benoît Amiaux, Boris Pek, Cody Hanson, Colin Leitner,
+can make contributions. Note that the CLA isn't a copyright
-Daniel Oaks, Eric Bakan, Erik Oomen, Filipp Kovalev, Ger Hobbelt,
+_assigment_ but rather a copyright _license_.
-Hendrik Polczynski, Igor Okulist, Jay, Joe Mucchiello, John Safranek,
+You retain the copyright on your contributions.
-José Miguel Gonçalves, Shueng Chuan, Katerina Blinova, Konstantin Sorokin,
-Marin Atanasov, Matt Healy, Mitch Hendrickson, Nigel Stewart, Pavel Khlebovich,
-Sebastian Reinhard, Stefan Doehla, abadc0de, nullable.type,
-T.Barmann, D.Hughes, J.C.Sloan, R.Romeo, L.E.Spencer, S.Kotay, R.M.Shorter,
-W.Mar, J.Wilander, Santa from Memphis, S.Davies, C.Beck,
-O.M.Vilhunen, C.Radik, G.Woodcock, M.Szczepkowski,
-Eternal Lands Dev Team, T.Tollet, C.Tangerino, G.Karsai, A.Bourgett,
-C.Blakemore, D.Fonaryov, T.Andrle, O.IJsselmuiden, R.Womack, M.Tomlinson,
-A.Slåttå, L.Farrell, J.D.P.Ballestero, V.Albaev, B.Harker, T.Scheffel, H.Klein,
-R.Merit, T.Bennett, H.Solis, A.Zincenko, M.S., S.Krul, K.Cooke, S.McCallum,
-F.Morenius, and 10 others.
 
 # Licensing
 
@@ -70,17 +61,16 @@ source licenses. The GPLv2 open source License does not generally permit
 incorporating this software into non-open source programs. 
 For those customers who do not wish to comply with the GPLv2 open
 source license requirements,
-[Cesanta Software](http://cesanta.com) offers a full,
+[Cesanta](http://cesanta.com) offers a full,
 royalty-free commercial license and professional support
 without any of the GPL restrictions.
 
-# Other products by Cesanta Software: simple and effective
+# Other products by Cesanta
 
+- [Fossa](http://github.com/cesanta/fossa) - Multi-protocol networking library
 - [SSL Wrapper](https://github.com/cesanta/ssl_wrapper) - application to
   secure network communications
 - [Frozen](https://github.com/cesanta/frozen) - JSON parser and generator
 - [SLRE](https://github.com/cesanta/slre) - Super Light Regular Expression
   library
-- [Net Skeleton](https://github.com/cesanta/net_skeleton) - framework for
+- [V7](https://github.com/cesanta/v7) - Embedded JavaScript engine
-  building network applications
-- [SLDR](https://github.com/cesanta/sldr) - Super Light DNS Resolver

android_build/jni/Android.mk

@@ -1,12 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../..
-include $(CLEAR_VARS)
-
-# To build with lua support, uncomment two lines below:
-#LUA_SOURCES := build/lua_5.2.1.c build/sqlite3.c build/lsqlite3.c
-#LUA_FLAGS := -I$(LOCAL_PATH)/build -DTHREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DUSE_LUA -DUSE_LUA_SQLITE3 -DLUA_COMPAT_ALL -D"getlocaledecpoint() ='.'"
-
-LOCAL_CFLAGS    := -std=c99 -O2 -W -Wall -pthread -pipe $(LUA_FLAGS) $(COPT)
-LOCAL_MODULE    := mongoose
-LOCAL_SRC_FILES := examples/server.c mongoose.c $(LUA_SOURCES)
-
-include $(BUILD_EXECUTABLE)

docs/API.md

@@ -1,6 +1,6 @@
 # Mongoose API Reference
 
-    struct mg_server *mg_create_server(void *server_param);
+    struct mg_server *mg_create_server(void *server_param, mg_handler_t handler);
 
 Creates web server instance. Returns opaque instance pointer, or NULL if
 there is not enough memory. `server_param`: Could be any pointer, or NULL.
@@ -173,7 +173,7 @@ a response body.  Mongoose provides functions for all three parts:
      Mongoose will call a handler repeatedly after each socket write.
 
 <!-- -->
-     
+
      void mg_send_file(struct mg_connection *, const char *path);
 
 Tells Mongoose to serve given file. Mongoose handles file according to
@@ -183,11 +183,14 @@ points to a directory, Mongoose will show directory listing. If this function
 is used, no calls to `mg_send*` or `mg_printf*` functions must be made, and
 event handler must return `MG_MORE`.
 
-    int mg_websocket_write(struct mg_connection* conn, int opcode,
+    size_t mg_websocket_write(struct mg_connection* conn, int opcode,
-                           const char *data, size_t data_len);
+                              const char *data, size_t data_len);
+    size_t mg_websocket_printf(struct mg_connection* conn, int opcode,
+                               const char *fmt, ...);
 
-Similar to `mg_write()`, but wraps the data into a websocket frame with a
+
-given websocket `opcode`.  
+Similar to `mg_write()` and `mg_printf()`, but wraps the data into a
+websocket frame with a given websocket `opcode`.
 
     const char *mg_get_header(const struct mg_connection *, const char *name);
 
@@ -219,15 +222,15 @@ the length of the fetched value, or 0 if variable not found.
                                  const char *user,
                                  const char *password);
 
-Add, edit or delete the entry in the passwords file.  
+Add, edit or delete the entry in the passwords file.
 This function allows an application to manipulate .htpasswd files on the
 fly by adding, deleting and changing user records. This is one of the
-several ways of implementing authentication on the server side.  
+several ways of implementing authentication on the server side.
 If password is not NULL, entry is added (or modified if already exists).
-If password is NULL, entry is deleted.  
+If password is NULL, entry is deleted.
 Return: 1 on success, 0 on error.
 
-   
+
     int mg_parse_multipart(const char *buf, int buf_len,
                            char *var_name, int var_name_len,
                            char *file_name, int file_name_len,

docs/AndroidBuild.md

@@ -7,7 +7,7 @@ Note : You dont need root access to run mongoose on Android.
 
 - Clone Mongoose Git repo
 - Download the Android NDK from [http://developer.android.com/tools/sdk/ndk/index.html](http://developer.android.com/tools/sdk/ndk/index.html)
-- Run `/path-to-ndk/ndk-build -C /path-to-mongoose/examples`
+- Run `/path-to-ndk/ndk-build -C /path/to/mongoose`
   That should generate mongoose/lib/armeabi/mongoose
 - Using the adb tool (you need to have Android SDK installed for that),
   push the generated mongoose binary to `/data/local` folder on device.

docs/Embed.md

@@ -149,8 +149,10 @@ all Net Skeleton functions will be available too.
     -DMONGOOSE_NO_DIRECTORY_LISTING  Disable directory listing
     -DMONGOOSE_NO_FILESYSTEM    Disables all file IO, serving from memory only
     -DMONGOOSE_NO_LOGGING       Disable access/error logging
-    -DMONGOOSE_NO_THREADS
+    -DMONGOOSE_ENABLE_THREADS   Enable mg_start_thread() function
     -DMONGOOSE_NO_WEBSOCKET     Disable WebSocket support
+    -DMONGOOSE_NO_USER          No concept of a user on used platform.
+                                (Platform does not provide getpwnam, setgid or setuid)
 
     -DMONGOOSE_USE_IDLE_TIMEOUT_SECONDS=X Idle connection timeout, default is 30
     -DMONGOOSE_USE_LUA          Enable Lua scripting

docs/LuaSqlite.md

@@ -1,51 +0,0 @@
-# Mongoose Lua Server Pages
-
-Pre-built Windows and Mac mongoose binaries support Lua Server Pages
-functionality.
-That means it is possible to write PHP-like scripts with mongoose
-using Lua programming language instead of PHP. Lua is known
-for it's speed and small size. Mongoose uses Lua version 5.2.3, the
-documentation for it can be found at
-[Lua 5.2 reference manual](http://www.lua.org/manual/5.2/).
-
-To create a Lua Page, make a file that is called `ANY_NAME.lp`. For example,
-`my_page.lp`. It is important to have a file
-name that ends up with `.lp`, cause this is the way mongoose recognises
-Lua Page file. The contents of the file, just like
-with PHP, is HTML with embedded Lua code. Lua code must be enclosed within
-`<?  ?>` blocks, and can appear anywhere on the page.
-
-Mongoose does not send HTTP headers for Lua pages. Therefore,
-every Lua Page must begin with HTTP status line and headers, like this:
-
-    <? mg.write('HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n') ?>
-    <html><body>
-      <span>Today is:</span> <? mg.write(os.date("%A")) ?>
-    </body></html>
-
-Note that this example uses function `mg.write()`, which prints data to the
-web page. Using function `mg.write()` is the way to generate web content from
-inside Lua code. In addition to `mg.write()`, all standard library functions
-are accessible from the Lua code (please check reference manual for details).
-Information about the request is available via the `mg.request_info` object.
-I contains request method, all headers, etcetera. Please refer to
-`struct mg_request_info` definition in
-[mongoose.h](https://github.com/cesanta/mongoose/blob/master/mongoose.h)
-to see what is available via the `mg.request_info` object.
-Check out [prime_numbers.lp](https://github.com/cesanta/mongoose/blob/master/examples/lua/prime_numbers.lp) for some example.
-
-Mongoose exports the following to the Lua Server Page:
-
-    mg.write(str)     -- writes string to the client
-    mg.onerror(msg)   -- error handler, can be overridden
-    mg.request_info   -- a table with request information
-
-Using Lua scripting it is easy to emulate SSI functionality. For example,
-to include the content of another file, one can write:
-
-    <? mg.write(io.open('MY_FILE.TXT'):read('*all')) ?>
-
-To serve a Lua Page, mongoose creates Lua context. That context is used for
-all Lua blocks within the page. That means, all Lua blocks on the same page
-share the same context. If one block defines a variable, for example, that
-variable is visible in all following blocks.

docs/ReleaseNotes.md

@@ -1,12 +1,37 @@
 # Mongoose Release Notes
 
+## Release 5.6, 2015-03-17
+
+Changes in Libmongoose library:
+
+- Added `-dav_root` configuration option that gives an ability to mount
+  a different root directory (not document_root)
+- Fixes for build under Win23 and MinGW
+- Bugfix: Double dots removal
+- Bugfix: final chunked response double-send
+- Fixed compilation in 64-bit environments
+- Added OS/2 compatibility
+- Added `getaddrinfo()` call and `NS_ENABLE_GETADDRINFO`
+- Various SSL-related fixes
+- Added integer overflow protection in `iobuf_append()` and `deliver_websocket_frame()`
+- Fixed NetBSD build
+- Enabled `NS_ENABLE_IPV6` build for Visual Studio 2008+
+- Enhanced comma detection in `parse_header()`
+- Fixed unchanged memory accesses on ARM
+- Added ability to use custom memory allocator through NS_MALLOC, NS_FREE, NS_REALLOC
+
+Changes in Mongoose binary:
+
+- Added `-start_browser` option to disable automatic browser launch
+- Added experimental SSL support. To listen on HTTPS port, use `ssl://PORT:SSL_CERT` format. For example, to listen on HTTP port 8080 and HTTPS port 8043, use `-listening_port 8080,ssl://8043:ssl_cert.pem`
+
 ## Release 5.5, October 28 2014
 
 Changes in Libmongoose library:
 
 - Added new API function: `mg_forward()` for proxying functionality
 - Added new API function: `mg_send_file_data()` for sending file data
-- Added new utility API functions: `mg_mmap() and mg_munpap()`
+- Added new utility API functions: `mg_mmap() and mg_munmap()`
 - Changed the way SSL settings are handled: removed `ssl_certificate` and
   `ssl_ca_certificate` options, and instead made `listening_port` accept
   `ssl://PORT:SSL_CERT:CA_CERT` notation
@@ -82,7 +107,7 @@ Changes in Libmongoose library:
 
 Changes in pre-compiled binaries:
 
-   *  New awesome Mongoose logos buy our designer Katrin - thanks Katrin!
+   *  New awesome Mongoose logos by our designer Katrin - thanks Katrin!
         Check them out at http://cesanta.com/products.shtml
    *  Added Lua Server Pages support to the free version, quick intro is at
         http://cesanta.com/docs/Lua.shtml

docs/SSL.md

@@ -1,20 +1,15 @@
 # Mongoose SSL guide
 
 SSL is a protocol that makes web communication secure. To enable SSL
-in mongoose, 3 steps are required:
+in mongoose, 2 steps are required:
 
-   1. Valid certificate file must be created
+   1. Create valid SSL certificate file
-   2. `ssl_certificate` options must be set to contain path to the
+   2. Append SSL certificate file path to the `listening_ports` option
-       certificate file.
-   3. `listening_ports` option must contain a port number with letter `s`
-        appended to it, which instructs Mongoose to use SSL for all connections
-        made to that port.
 
 Below is the `mongoose.conf` file snippet for typical SSL setup:
 
-    document_root     www_root        # Serve files in www_root directory
+    document_root     www_root         # Serve files in www_root directory
-    listening_ports   80r,443s        # Redirect all HTTP requests to HTTPS
+    listening_ports   80,443:cert.pem  # Listen on ports 80 and 443
-    ssl_certificate   ssl_cert.pem    # Location of certificate file
 
 ## How to create SSL certificate file
 

examples/.gitignore

@@ -0,0 +1 @@
+*.exe

examples/Makefile

@@ -3,13 +3,18 @@
 
 SUBDIRS = $(sort $(filter-out csharp/, $(dir $(wildcard */))))
 X = $(SUBDIRS)
+ifdef WINDIR
+    # appending the Winsock2 library at the end of the compiler
+	# invocation
+    CFLAGS_EXTRA += -lws2_32
+endif
 
 .PHONY: $(SUBDIRS)
 
 all: $(SUBDIRS)
 
 $(SUBDIRS):
-	@$(MAKE) -C $@
+	@$(MAKE) CFLAGS_EXTRA="$(CFLAGS_EXTRA)" -C $@
 
 clean:
-	for d in $(SUBDIRS) ; do $(MAKE) -C $$d clean ; done
+	for d in $(SUBDIRS) ; do $(MAKE) -C $$d clean ; done

examples/http_client/Makefile

@@ -9,4 +9,4 @@ unix: $(SOURCES)
 	$(CC) -o $(PROG) $(SOURCES) $(CFLAGS)
 
 clean:
-	rm -rf $(PROG) *.exe *.dSYM *.obj *.exp .*o *.lib
+	rm -rf $(PROG) *.exe *.dSYM *.obj *.exp *.o *.lib

examples/multi_threaded_server/Makefile

@@ -2,7 +2,7 @@
 # All rights reserved
 
 PROG = multi_threaded_server
-CFLAGS = -W -Wall -I../.. -pthread -g -O0 $(CFLAGS_EXTRA)
+CFLAGS = -W -Wall -I../.. -pthread -g -O0 -DMONGOOSE_ENABLE_THREADS $(CFLAGS_EXTRA)
 SOURCES = $(PROG).c ../../mongoose.c
 
 $(PROG): $(SOURCES)

examples/proxy_server/Makefile

@@ -3,7 +3,7 @@
 
 PROG = proxy_server
 FLAGS = -I../..  -DNS_ENABLE_SSL
-CFLAGS = -W -Wall -g -O0 -pthread  -lssl $(FLAGS) $(CFLAGS_EXTRA)
+CFLAGS = -W -Wall -g -O0 -pthread  -lssl -DMONGOOSE_ENABLE_THREADS $(FLAGS) $(CFLAGS_EXTRA)
 SOURCES = $(PROG).c ../../mongoose.c
 
 unix: $(SOURCES)

examples/proxy_server/proxy_server.c

@@ -160,20 +160,13 @@ static void setopt(struct mg_server *s, const char *opt, const char *val) {
 }
 
 int main(int argc, char *argv[]) {
-  const char *cert = NULL, *ca_cert = NULL, *port = "2014";
+  const char *port = "2014", *dump = NULL, *root = "proxy_web_root";
-  const char *mitm = NULL, *dump = NULL, *root = "proxy_web_root";
   int i;
 
   // Parse command line options
   for (i = 1; i < argc; i++) {
-    if (strcmp(argv[i], "-ca_cert") == 0 && i + 1 < argc) {
+    if (strcmp(argv[i], "-port") == 0 && i + 1 < argc) {
-      ca_cert = argv[++i];
-    } else if (strcmp(argv[i], "-cert") == 0 && i + 1 < argc) {
-      cert = argv[++i];
-    } else if (strcmp(argv[i], "-port") == 0 && i + 1 < argc) {
       port = argv[++i];
-    } else if (strcmp(argv[i], "-mitm") == 0 && i + 1 < argc) {
-      mitm = argv[++i];
     } else if (strcmp(argv[i], "-root") == 0 && i + 1 < argc) {
       root = argv[++i];
     } else if (strcmp(argv[i], "-dump") == 0 && i + 1 < argc) {
@@ -191,10 +184,7 @@ int main(int argc, char *argv[]) {
   setopt(s_server, "enable_proxy",        "yes");
   setopt(s_server, "document_root",       root);
   setopt(s_server, "listening_port",      port);
-  setopt(s_server, "ssl_certificate",     cert);
-  setopt(s_server, "ssl_ca_certificate",  ca_cert);
   setopt(s_server, "hexdump_file",        dump);
-  setopt(s_server, "ssl_mitm_certs",      mitm);
 
   // Start two SSE pushing threads
   mg_start_thread(sse_pusher_thread_func, (void *) "sse_pusher_thread_1");

examples/web_server/Makefile

@@ -2,11 +2,27 @@
 # All rights reserved
 
 PROG = web_server
-CFLAGS = -W -Wall -I../.. -pthread -g -O0 $(CFLAGS_EXTRA)
+CFLAGS = -W -Wall -I../.. -pthread -g -O0 -DMONGOOSE_ENABLE_THREADS $(CFLAGS_EXTRA)
 SOURCES = $(PROG).c ../../mongoose.c
+OPENSSL_FLAGS = -DNS_ENABLE_SSL -lssl
+
+# PolarSSL paths and flags
+POLARSSL_PATH = /usr/local
+POLARSSLCOMPAT_PATH = ./../../../polar
+SOURCES_POLAR = $(SOURCES) $(POLARSSLCOMPAT_PATH)/polarssl_compat.c
+INCDIR_POLAR = -I$(POLARSSLCOMPAT_PATH) -I$(POLARSSL_PATH)/include
+LDFLAGS_POLAR = -L$(POLARSSL_PATH)/lib -lmbedtls
+CFLAGS_POLAR = $(CFLAGS) $(INCDIR_POLAR) -DNS_ENABLE_SSL
+#
 
 $(PROG): $(SOURCES)
 	$(CC) -o $(PROG) $(SOURCES) $(CFLAGS)
 
+openssl:
+	$(CC) -o $(PROG) $(SOURCES) $(CFLAGS) $(OPENSSL_FLAGS)
+
+polarssl:
+	$(CC) -o $(PROG) $(SOURCES_POLAR) $(LDFLAGS_POLAR) $(CFLAGS_POLAR)
+	
 clean:
 	rm -rf $(PROG) *.exe *.dSYM *.obj *.exp .*o *.lib

examples/web_server/certs/cert.pem

@@ -0,0 +1,46 @@
+-----BEGIN CERTIFICATE-----
+MIIC+zCCAeOgAwIBAgIJAPhB8jbL+G82MA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCTEyNy4wLjAuMTAeFw0xNTAzMDYxMjQzMzNaFw0yNTAzMDMxMjQzMzNaMBQx
+EjAQBgNVBAMMCTEyNy4wLjAuMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALi3b3daMgzUEROKob1Caf68i+//cTRkPdBJv2cOBak21CdQzY0Nvx73GLzf
+5TKB347BCHNbYRKGJXDbYdmFp20/WeBHkY7RS3Ad2Q5lzyx66u9PxNx7hJIiqBgF
+58VU+E3o/I+o8QNIoOT+wtCiq3Nwkp+zGBJmS32rzMEV9bcKxSzMrkfRhF+XAREd
+DwM9vfPg6WRb/b+vv06uvVwcw390RprLautGfBdaRddVYkIAKJGRRTqZAvTRFW1J
+FcIVOxlN+iA7qP7xjr3tUP78qMmlu0MXsHrUR2cgfveZK2sdUW5G804yHsU5sC8l
+FbtLKMEOyLsk2bEIScOXgum7g2sCAwEAAaNQME4wHQYDVR0OBBYEFHtLzUqAsXkH
+Il8S5sMhJuVhRJLdMB8GA1UdIwQYMBaAFHtLzUqAsXkHIl8S5sMhJuVhRJLdMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAEzHc0AOr+qs0OFvWMfcSMi7
+O/aYlLS6f7Sos+lli69+61EcmCTJVarVeAVUsAoqmzBKDbeOpAK1hGX6/GGcXjR2
+BmuU0hUKyX9l1lwdMKU45BayH/riElwnvAyj2GxKoPpdIjlHns4SAITOCUx9NfpM
+agd7kjolton0ZQ5DI/2a43PkqHv1lY4Dp60wJlxit9U68bsGOycCJ/BsAyrPROb2
+D1MkpMBIdfHc8uxRywM3/l9buFX8yrrMUGOYKgfjDwdzbj0iwIixoGpHL7IfeBtu
+dvGO/g2rEhbtAP+xIgOR3GvzqjZh30er3no7zjDMn65tTME18Aq3tBQY7vPDKms=
+-----END CERTIFICATE-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC4t293WjIM1BET
+iqG9Qmn+vIvv/3E0ZD3QSb9nDgWpNtQnUM2NDb8e9xi83+Uygd+OwQhzW2EShiVw
+22HZhadtP1ngR5GO0UtwHdkOZc8seurvT8Tce4SSIqgYBefFVPhN6PyPqPEDSKDk
+/sLQoqtzcJKfsxgSZkt9q8zBFfW3CsUszK5H0YRflwERHQ8DPb3z4OlkW/2/r79O
+rr1cHMN/dEaay2rrRnwXWkXXVWJCACiRkUU6mQL00RVtSRXCFTsZTfogO6j+8Y69
+7VD+/KjJpbtDF7B61EdnIH73mStrHVFuRvNOMh7FObAvJRW7SyjBDsi7JNmxCEnD
+l4Lpu4NrAgMBAAECggEAaFuqbAHXOQwuwZ2XFzgIblTTsrncmT7w9VZU/sIbTKif
+X771AnX7vmDX5w2PjeN2DE7emV3NEAwd5w7qz1wFZWFfQ6jrgYaZWjRixxGZ5IVl
+aeLlU7OtCGrwEPJ1KTWCO3IgDoHh+Hr1+6o7Imhk+QlmrTcfqHWGvO9s9MGVWt2S
+RLAnSTFiOe5brdJnmlqq1sKZmnLmpydBaPUOYpZGAgRasrjdMZB+lZOazd1x23/5
+GAcm0rDREMnO9b2Jt+TNEZHT6d5KpVoExztZEZj8QCLXoic/SpFIqHGtpNlQXa+d
+BVqgQbIYjO8ldldxZ8YIyJDVF+9e/uBBwu6jBIIsEQKBgQDspEHCyyuh4LG+7BbZ
+eXlsfCxPTM6K9w31ZwHAwRtAuGqrOrE+pFJG9CEsFZbAI1aOGmZZdjexuSMcOlXl
+TIVJTQHoFtoGEsanYEXO4O1t02Ab/DCYSpXusXUraRBRPpsTC77Sh5mxLUNd23d9
+NhnDBuwChAmC+IYexjkXeqPYFwKBgQDH08PEd+2PVo4MD8UVKUlEcgoyCr6ESiyp
+HfYyhhfd5x3DbZLoKCkunDfBs/hakQk8DA2nn4tl4ZjfmzXmX0EBx+E5YTdYshW7
+ZcjN5x64B5PEOAR/NZA6agNlp3XGXXXgX+gnN6pgE49eVU22nZ4G+QBKD6NcCviB
+LBPUxMbvzQKBgHgZYRqonGtaqzsXfP1AjmSFnMNeWtDiU95BOf2Gw/sT3WcrsXr2
+UJ+cFR3XkxvOk4YpVdp/igKT0ILqBGAMdvTdtWMB/gLpEpMt5B/7veRoS7XIRy1z
+ZSawP6QZfWOOX4vKAT29/j2SmEcRNFKC245EfBFGy8EBuqfxuFX3MyJfAoGBAJ0y
+tjsErVmpma1baosvI3g4zlR3p1CimWehLmCopHXorr1iocMIdP0535L+ZU258y3N
+vaA0HpFTW9PsYgaMwLMJ7uAY3lVkIzx84e849i2HqHMgLkl0dbW+WFXL2xblxylv
+yU2wuNNED/EB4lTawcpycAvTKYvrBXt4lVE4S9exAoGAGl6vZV3zyw4jpIw4uDfk
+LTPYUrghFDDGKExyeOnC/W9pqR2veqzfBz02C3jqwhewoqgAcnNc2sg0rJmM+6Oz
+Z2mmGZTHO9xR++7+W7e8AkQBbS6TB8a+7yNcM4USLP+b9sX5N+8gFhFs9tG7j/no
+G44qLsJ/yve7/QsOA37uEMs=
+-----END PRIVATE KEY-----

examples/web_server/web_server.c

@@ -96,11 +96,8 @@ static void __cdecl signal_handler(int sig_num) {
 }
 
 static void vnotify(const char *fmt, va_list ap, int must_exit) {
-  char msg[200];
+  vfprintf(stderr, fmt, ap);
-
+  fputc('\n', stderr);
-  vsnprintf(msg, sizeof(msg), fmt, ap);
-  fprintf(stderr, "%s\n", msg);
-
   if (must_exit) {
     exit(EXIT_FAILURE);
   }

examples/websocket_ssl_proxy/Makefile

@@ -2,14 +2,26 @@
 # All rights reserved
 
 PROG = ws_ssl
-CFLAGS = -W -Wall -I../.. -I. -pthread -g -O0 $(CFLAGS_EXTRA)
+CFLAGS = -W -Wall -I../.. -I. -pthread -g -O0 -DMONGOOSE_ENABLE_THREADS -DNS_ENABLE_SSL -DSSL_WRAPPER_USE_AS_LIBRARY $(CFLAGS_EXTRA)
+LDFLAGS = -lssl
 SOURCES = ws_ssl.c ../../mongoose.c ssl_wrapper.c
 
+# PolarSSL paths and flags
+POLARSSL_PATH = /usr/local
+POLARSSLCOMPAT_PATH = ./../../../polar
+SOURCES_POLAR = $(SOURCES) $(POLARSSLCOMPAT_PATH)/polarssl_compat.c
+INCDIR_POLAR = -I$(POLARSSLCOMPAT_PATH) -I$(POLARSSL_PATH)/include
+LDFLAGS_POLAR = -L$(POLARSSL_PATH)/lib -lmbedtls
+CFLAGS_POLAR = $(CFLAGS) $(INCDIR_POLAR)
+#
+
 all: $(PROG)
 
 $(PROG): $(SOURCES)
-	$(CC) -o $(PROG) $(SOURCES) \
+	$(CC) -o $(PROG) $(SOURCES) $(LDFLAGS) $(CFLAGS)
-		-DNS_ENABLE_SSL -DSSL_WRAPPER_USE_AS_LIBRARY -lssl $(CFLAGS)
+
+polarssl: $(SOURCES_POLAR)
+	$(CC) -o $(PROG) $(SOURCES_POLAR) $(LDFLAGS_POLAR) $(CFLAGS_POLAR)
 
 clean:
 	rm -rf $(PROG) *.exe *.dSYM *.obj *.exp .*o *.lib

jni/Android.mk

@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)/..
+include $(CLEAR_VARS)
+
+LOCAL_CFLAGS    := -std=c99 -O2 -W -Wall -pthread -pipe $(COPT)
+LOCAL_MODULE    := mongoose
+LOCAL_SRC_FILES := examples/web_server/web_server.c mongoose.c
+
+include $(BUILD_EXECUTABLE)

mongoose.h

@@ -2,28 +2,27 @@
 // Copyright (c) 2013-2014 Cesanta Software Limited
 // All rights reserved
 //
-// This library is dual-licensed: you can redistribute it and/or modify
+// This software is dual-licensed: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
 // published by the Free Software Foundation. For the terms of this
 // license, see <http://www.gnu.org/licenses/>.
 //
-// You are free to use this library under the terms of the GNU General
+// You are free to use this software under the terms of the GNU General
 // Public License, but WITHOUT ANY WARRANTY; without even the implied
 // warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details.
 //
-// Alternatively, you can license this library under a commercial
+// Alternatively, you can license this software under a commercial
 // license, as set out in <http://cesanta.com/>.
-//
-// $Date: 2014-09-09 17:07:55 UTC $
 
 #ifndef MONGOOSE_HEADER_INCLUDED
 #define  MONGOOSE_HEADER_INCLUDED
 
-#define MONGOOSE_VERSION "5.5"
+#define MONGOOSE_VERSION "5.6"
 
 #include <stdio.h>      // required for FILE
 #include <stddef.h>     // required for size_t
+#include <sys/types.h>  // required for time_t
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,7 +52,7 @@ struct mg_connection {
   int is_websocket;           // Connection is a websocket connection
   int status_code;            // HTTP status code for HTTP error handler
   int wsbits;                 // First byte of the websocket frame
-  void *server_param;         // Parameter passed to mg_add_uri_handler()
+  void *server_param;         // Parameter passed to mg_create_server()
   void *connection_param;     // Placeholder for connection-specific data
   void *callback_param;
 };
@@ -90,7 +89,7 @@ enum {
 struct mg_server *mg_create_server(void *server_param, mg_handler_t handler);
 void mg_destroy_server(struct mg_server **);
 const char *mg_set_option(struct mg_server *, const char *opt, const char *val);
-int mg_poll_server(struct mg_server *, int milliseconds);
+time_t mg_poll_server(struct mg_server *, int milliseconds);
 const char **mg_get_valid_option_names(void);
 const char *mg_get_option(const struct mg_server *server, const char *name);
 void mg_copy_listeners(struct mg_server *from, struct mg_server *to);
@@ -104,7 +103,7 @@ void mg_send_status(struct mg_connection *, int status_code);
 void mg_send_header(struct mg_connection *, const char *name, const char *val);
 size_t mg_send_data(struct mg_connection *, const void *data, int data_len);
 size_t mg_printf_data(struct mg_connection *, const char *format, ...);
-size_t mg_write(struct mg_connection *, const void *buf, int len);
+size_t mg_write(struct mg_connection *, const void *buf, size_t len);
 size_t mg_printf(struct mg_connection *conn, const char *fmt, ...);
 
 size_t mg_websocket_write(struct mg_connection *, int opcode,
@@ -130,8 +129,8 @@ int mg_parse_multipart(const char *buf, int buf_len,
 void *mg_start_thread(void *(*func)(void *), void *param);
 char *mg_md5(char buf[33], ...);
 int mg_authorize_digest(struct mg_connection *c, FILE *fp);
-int mg_url_encode(const char *src, size_t s_len, char *dst, size_t dst_len);
+size_t mg_url_encode(const char *src, size_t s_len, char *dst, size_t dst_len);
-int mg_url_decode(const char *src, int src_len, char *dst, int dst_len, int);
+int mg_url_decode(const char *src, size_t src_len, char *dst, size_t dst_len, int);
 int mg_terminate_ssl(struct mg_connection *c, const char *cert);
 int mg_forward(struct mg_connection *c, const char *addr);
 void *mg_mmap(FILE *fp, size_t size);

test/unit_test.c

@@ -120,8 +120,8 @@ static const char *test_parse_http_message() {
   ASSERT(strcmp(ri.http_version, "1.1") == 0);
   ASSERT(ri.num_headers == 0);
 
-  ASSERT(parse_http_message(req2, sizeof(req2) - 1, &ri) == -1);
+  ASSERT(parse_http_message(req2, sizeof(req2) - 1, &ri) == (size_t) ~0);
-  ASSERT(parse_http_message(req6, 0, &ri) == -1);
+  ASSERT(parse_http_message(req6, 0, &ri) == (size_t) ~0);
   ASSERT(parse_http_message(req8, sizeof(req8) - 1, &ri) == sizeof(req8) - 1);
 
   // TODO(lsm): Fix this. Header value may span multiple lines.
@@ -198,17 +198,19 @@ static const char *test_match_prefix(void) {
 }
 
 static const char *test_remove_double_dots() {
-  struct { char before[20], after[20]; } data[] = {
+  struct { char before[30], after[30]; } data[] = {
     {"////a", "/a"},
-    {"/.....", "/."},
+    {"/.....", "/....."},
-    {"/......", "/"},
+    {"/......", "/......"},
     {"...", "..."},
-    {"/...///", "/./"},
+    {"/...///", "/.../"},
     {"/a...///", "/a.../"},
     {"/.x", "/.x"},
     {"/\\", "/"},
     {"/a\\", "/a\\"},
-    {"/a\\\\...", "/a\\."},
+    {"/a\\\\...", "/a\\..."},
+    {"foo/x..y/././y/../../..", "foo/x..y/y/"},
+    {"foo/..x", "foo/..x"},
   };
   size_t i;
 
@@ -261,6 +263,7 @@ static const char *test_url_decode(void) {
   ASSERT(strcmp(buf, "a ") == 0);
 
   ASSERT(mg_url_decode("%61", 1, buf, sizeof(buf), 1) == 1);
+  printf("[%s]\n", buf);
   ASSERT(strcmp(buf, "%") == 0);
 
   ASSERT(mg_url_decode("%61", 2, buf, sizeof(buf), 1) == 2);
@@ -306,9 +309,9 @@ static const char *test_base64_encode(void) {
 }
 
 static const char *test_mg_parse_header(void) {
-  const char *str = "xx=1 kl yy, ert=234 kl=123, "
+  const char *str = "xx=1 kl yy, ert=234 kl=123, uri=\"/?name=x,y\", "
     "ii=\"12\\\"34\" zz='aa bb',tt=2,gf=\"xx d=1234";
-  char buf[10];
+  char buf[20];
   ASSERT(mg_parse_header(str, "yy", buf, sizeof(buf)) == 0);
   ASSERT(mg_parse_header(str, "ert", buf, sizeof(buf)) == 3);
   ASSERT(strcmp(buf, "234") == 0);
@@ -331,6 +334,7 @@ static const char *test_mg_parse_header(void) {
   ASSERT(strcmp(buf, "12\"34") == 0);
   ASSERT(mg_parse_header(str, "tt", buf, sizeof(buf)) == 1);
   ASSERT(strcmp(buf, "2") == 0);
+  ASSERT(mg_parse_header(str, "uri", buf, sizeof(buf)) == 10);
   return NULL;
 }