Bläddra i källkod

Updated README

Thomas Davis 12 år sedan
förälder
incheckning
1322964416
1 ändrade filer med 28 tillägg och 20 borttagningar
  1. 28 20
      README.md

+ 28 - 20
README.md

@@ -9,25 +9,19 @@ simplicity by carefully selected list of features:
 
 
 - Liberal, commercial-friendly
 - Liberal, commercial-friendly
   [MIT license](http://en.wikipedia.org/wiki/MIT_License)
   [MIT license](http://en.wikipedia.org/wiki/MIT_License)
+- NO GPL!!!
+- Base on [Mongoose](https://code.google.com/p/mongoose/)
 - Works on Windows, Mac, UNIX, iPhone, Android, and many other platforms
 - Works on Windows, Mac, UNIX, iPhone, Android, and many other platforms
-- Scripting and database support (Lua Server Pages + Sqlite, see
-  [page.lp](https://github.com/valenok/civetweb/blob/master/test/page.lp) ),
+- Scripting and database support (Lua Server Pages + Sqlite
   which provides ready to go, powerful web development platform in
   which provides ready to go, powerful web development platform in
   one single-click executable with **no dependencies**: forget LAMP!
   one single-click executable with **no dependencies**: forget LAMP!
 - Support for CGI, SSL, SSI, Digest (MD5) authorization, Websocket, WEbDAV
 - Support for CGI, SSL, SSI, Digest (MD5) authorization, Websocket, WEbDAV
 - Resumed download, URL rewrite, file blacklist, IP-based ACL, Windows service
 - Resumed download, URL rewrite, file blacklist, IP-based ACL, Windows service
 - Download speed limit based on client subnet or URI pattern
 - Download speed limit based on client subnet or URI pattern
 - Simple and clean embedding API,
 - Simple and clean embedding API,
-  [civetweb.h](https://github.com/valenok/civetweb/blob/master/civetweb.h).
-  The source is in single
-  [civetweb.c](https://github.com/valenok/civetweb/blob/master/civetweb.c) file
-  to make things easy. Embedding examples:
-  [hello.c](https://github.com/valenok/civetweb/blob/master/examples/hello.c),
-  [post.c](https://github.com/valenok/civetweb/blob/master/examples/post.c),
-  [upload.c](https://github.com/valenok/civetweb/blob/master/examples/upload.c),
-  [websocket.c](https://github.com/valenok/civetweb/blob/master/examples/websocket.c)
+  The source is in single file
+  to make things easy. Embedding examples included.
 - HTTP client capable of sending arbitrary HTTP/HTTPS requests
 - HTTP client capable of sending arbitrary HTTP/HTTPS requests
-- [User Manual](https://github.com/valenok/civetweb/blob/master/UserManual.md)
 
 
 Note that Windows and MacOS binaries have following 3rd party software
 Note that Windows and MacOS binaries have following 3rd party software
 compiled in:
 compiled in:
@@ -35,17 +29,31 @@ compiled in:
   <a href="http://sqlite.org">SQLite embedded database</a>,
   <a href="http://sqlite.org">SQLite embedded database</a>,
   <a href="http://lua.org">Lua embedded scripting engine</a>.
   <a href="http://lua.org">Lua embedded scripting engine</a>.
 
 
-Questions can be asked at
-[civetweb-users@google.com](http://groups.google.com/group/civetweb-users)
-mailing list.
+# Support
 
 
-[![&nbsp;](https://cruel-carlota.pagodabox.com/2a613890c1f4b60e5919a9c1dd3caca2 "githalytics.com")](http://githalytics.com/valenok/civetweb)
+The original Mongoose project is recommended if support is needed.  However,
+this is very easy to install and use. 
 
 
+# Contributions
+
+Contributions are welcome provided all contributions cairry the MIT license.
+
+DO NOT APPLY fixes copied from Mongoose to this project to prevent GPL tainting.
 
 
 # Author
 # Author
 
 
-I am Sergey Lyubka, a software engineer from Galway, Ireland. I started
-working on Civetweb in 2004, and since then continuously improve it,
-investing thousands of hours of work. My other project I'm contributing to the
-community for free is
-[Super Light Regular Expression library](http://code.google.com/p/slre).
+The original Author was Sergey Lyubka.  He still controls the original
+Mongoose project.  However, he has changed or said he would 
+change licences after writing and distributing the original code this
+project is based on.
+
+Using this project ensures the the MIT liences terms are applied and
+GPL cannot be imposed on any of this code as long as it is sourced from
+here.
+
+For the latest and greatest code and features, please use the Mongoose
+code from Sergey Lyubka.  However, doing so will require adherance to
+the new licenses.
+
+This project ensures that GPL license cannot be applied to this code.
+This code will remain free with the MIT license forever.