浏览代码

Merge branch 'master' of https://github.com/civetweb/civetweb

bel2125 5 年之前
父节点
当前提交
4b440a3399
共有 2 个文件被更改,包括 15 次插入2 次删除
  1. 10 1
      CREDITS.md
  2. 5 1
      RELEASE_NOTES.md

+ 10 - 1
CREDITS.md

@@ -22,6 +22,7 @@
 * cdbishop
 * celeron55
 * Charles Olivi
+* Chris Han
 * Chris Jones
 * Chris Rehn
 * Christian Mauderer
@@ -42,6 +43,7 @@
 * Drew Wells
 * duong2179
 * ehlertjd
+* eugene
 * Eric Tsau
 * Erick Vieyra
 * Erik Beran
@@ -56,6 +58,7 @@
 * Gregor Jasny
 * grenclave
 * grunk
+* guangqing.chen
 * Guilherme Amadio
 * hansipie
 * HariKamath Kamath
@@ -102,6 +105,7 @@
 * Li Peng
 * Lianghui
 * Luka Rahne
+* Lukas Martanovic
 * Maarten Fremouw
 * makrsmark
 * marco
@@ -114,6 +118,7 @@
 * mingodad
 * Morgan McGuire
 * mrdvlpr.xnu
+* Nat!
 * Neil Jensen
 * newsoft
 * nfrmtkr
@@ -149,6 +154,8 @@
 * Sergey Linev
 * sgmesservey
 * shantanugadgil
+* Sherwyn Sen
+* shreyajaggi8
 * Simon Hailes
 * slidertom
 * SpaceLord
@@ -171,6 +178,7 @@
 * Uilian Ries
 * Ulrich Hertlein
 * Walt Steverson
+* wangli28
 * webxer
 * William Greathouse
 * xeoshow
@@ -179,6 +187,8 @@
 * Yury Z
 * zhen.wang
 
+and others.
+
 # Mongoose Contributors
 CivetWeb is based on the Mongoose code.  The following users contributed to the original Mongoose release between 2010 and 2013.  This list was generated from the Mongoose GIT logs.  It does not contain contributions from the Mongoose mailing list.  There is no record for contributors prior to 2010.
 
@@ -230,4 +240,3 @@ CivetWeb is based on the Mongoose code.  The following users contributed to the
 * tayS
 * test
 * valenok
-

+ 5 - 1
RELEASE_NOTES.md

@@ -1,10 +1,14 @@
 Release Notes v1.12
 ===
-### Objectives: *TO BE DEFINED*
+### Objectives: *Multiple improvements and extensions in various areas, including compatibility, Lua scripting, documentation*
 
 Changes
 -------
 
+- Updates/improvements for LuaXML
+- Updates and tests for JSON for Lua
+- BoringSSL support
+- Add Remark: Do not use Git for Windows V2.24 (but <= V2.23 or >= V2.25)
 - Format configuration dialogs for Windows
 - Add option "hide_tray" to start without Windows systray icon
 - URI checking according to "remove_dot_segments" algorithm from RFC