Change license to the Mozilla Public License, version 2.0

Why am I relicensing to MPL v2? I have a range of improvements that I'll be making to
the library for use in a project I'm working on. I think it's fair that people be able to use
these improvements in their applications, even for commercial applications, and that any
improvements they make are shared back so everyone else can make use of them.

The MPL v2 allows for static linking, something that is typically done for embedded applications,
while also ensuring that the source code must be disclosed when the binary
is distributed.

README.md

@@ -325,3 +325,17 @@ This will result in a page stating *Welcome, John Doe, to the ESP8266/ESP32 webs
 ## Websocket functionality
 
 ToDo: document this
+
+# Licensing
+
+libesphttpd is licensed under the MPLv2. It was originally licensed under a 'Beer-ware' license by Jeroen Domburg
+but was re-licensed with the blessing of most of the projects contributors.
+
+The topic of licenses can be controversial. The original license was more free in that it allowed users to use the code
+in any way, including relicensing it to any license they chose. The MPLv2 restricts freedom in that it requires
+modifications to be given back to the community. This license establishes the agreement that in exchange for using
+this great library that users are required to give back their changes to let others benefit.
+
+While the 'Beer-ware' license text was removed to avoid license confusion the authors of this great library,
+especially Jeroen, deserve a beer. If you appreciate the library and you meet them in person some day please consider
+buying them a beer to say thanks!

core/auth.c

@@ -1,16 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 HTTP auth implementation. Only does basic authentication for now.
 */
 
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * Jeroen Domburg <[email protected]> wrote this file. As long as you retain 
- * this notice you can do whatever you want with this stuff. If we meet some day, 
- * and you think this stuff is worth it, you can buy me a beer in return. 
- * ----------------------------------------------------------------------------
- */
-
 
 #include <libesphttpd/esp8266.h>
 #include "libesphttpd/auth.h"

core/base64.c

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /* base64.c : base-64 / MIME encode/decode */
 /* PUBLIC DOMAIN - Jon Mayo - November 13, 2003 */
 #include <libesphttpd/esp8266.h>

core/httpd-freertos.c

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 ESP8266 web server - platform-dependent routines, FreeRTOS version
 

core/httpd-nonos.c

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 ESP8266 web server - platform-dependent routines, nonos version
 */

core/httpd.c

@@ -1,17 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 Esp8266 http server - core routines
 */
 
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * Jeroen Domburg <[email protected]> wrote this file. As long as you retain 
- * this notice you can do whatever you want with this stuff. If we meet some day, 
- * and you think this stuff is worth it, you can buy me a beer in return. 
- * ----------------------------------------------------------------------------
- */
-
-
 #include <libesphttpd/esp8266.h>
 #include "libesphttpd/httpd.h"
 #include "httpd-platform.h"

core/httpdespfs.c

@@ -1,16 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 Connector to let httpd use the espfs filesystem to serve the files in it.
 */
 
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * Jeroen Domburg <[email protected]> wrote this file. As long as you retain 
- * this notice you can do whatever you want with this stuff. If we meet some day, 
- * and you think this stuff is worth it, you can buy me a beer in return. 
- * ----------------------------------------------------------------------------
- */
-
 #include <libesphttpd/esp8266.h>
 #include "libesphttpd/httpdespfs.h"
 #include "libesphttpd/espfs.h"

core/sha1.c

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /* This code is public-domain - it is based on libcrypt
  * placed in the public domain by Wei Dai and other contributors.
  */

espfs/espfs.c

@@ -1,19 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 This is a simple read-only implementation of a file system. It uses a block of data coming from the
 mkespfsimg tool, and can use that block to do abstracted operations on the files that are in there.
 It's written for use with httpd, but doesn't need to be used as such.
 */
 
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * Jeroen Domburg <[email protected]> wrote this file. As long as you retain 
- * this notice you can do whatever you want with this stuff. If we meet some day, 
- * and you think this stuff is worth it, you can buy me a beer in return. 
- * ----------------------------------------------------------------------------
- */
-
-
 //These routines can also be tested by comping them in with the espfstest tool. This
 //simplifies debugging, but needs some slightly different headers. The #ifdef takes
 //care of that.

espfs/espfstest/main.c

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 Simple and stupid file decompressor for an espfs image. Mostly used as a testbed for espfs.c and 
 the decompressors: code compiled natively is way easier to debug using gdb et all :)

espfs/heatshrink_decoder.c

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include "libesphttpd/espfs.h"
 #ifdef ESPFS_HEATSHRINK
 //Stupid wrapper so we don't have to move c-files around

espfs/mkespfsimage/heatshrink_encoder.c

@@ -1,4 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 //Stupid wraparound include to make sure object file doesn't end up in heatshrink dir
 #ifdef ESPFS_HEATSHRINK
 #include "../lib/heatshrink/heatshrink_encoder.c"
-#endif
+#endif

espfs/mkespfsimage/main.c

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include <stdint.h>
 #include <unistd.h>
 #include <sys/types.h>

mkupgimg/mkupgimg.c

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include <stdio.h>
 #include <stdint.h>
 #include <sys/types.h>

util/captdns.c

@@ -1,11 +1,6 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * Jeroen Domburg <[email protected]> wrote this file. As long as you retain 
- * this notice you can do whatever you want with this stuff. If we meet some day, 
- * and you think this stuff is worth it, you can buy me a beer in return. 
- * ----------------------------------------------------------------------------
- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
 /*

util/cgiflash.c

@@ -1,16 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 Some flash handling cgi routines. Used for updating the ESPFS/OTA image.
 */
 
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * Jeroen Domburg <[email protected]> wrote this file. As long as you retain 
- * this notice you can do whatever you want with this stuff. If we meet some day, 
- * and you think this stuff is worth it, you can buy me a beer in return. 
- * ----------------------------------------------------------------------------
- */
-
 #include <libesphttpd/esp8266.h>
 #include "libesphttpd/cgiflash.h"
 #include "libesphttpd/espfs.h"

util/cgiwebsocket.c

@@ -1,16 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 Websocket support for esphttpd. Inspired by https://github.com/dangrie158/ESP-8266-WebSocket
 */
 
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * Jeroen Domburg <[email protected]> wrote this file. As long as you retain 
- * this notice you can do whatever you want with this stuff. If we meet some day, 
- * and you think this stuff is worth it, you can buy me a beer in return. 
- * ----------------------------------------------------------------------------
- */
-
 
 #include <libesphttpd/esp8266.h>
 #include "libesphttpd/httpd.h"

util/cgiwifi.c

@@ -1,16 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 Cgi/template routines for the /wifi url.
 */
 
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * Jeroen Domburg <[email protected]> wrote this file. As long as you retain 
- * this notice you can do whatever you want with this stuff. If we meet some day, 
- * and you think this stuff is worth it, you can buy me a beer in return. 
- * ----------------------------------------------------------------------------
- */
-
 
 #include <libesphttpd/esp8266.h>
 #include "libesphttpd/cgiwifi.h"

util/esp32_flash.c

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
 Routines for handling the (slightly more complicated) esp32 flash.
 Broken out because esp-idf is expected to get better routines for this.