Parcourir la source

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

bel2125 il y a 5 ans
Parent
commit
4b440a3399
2 fichiers modifiés avec 15 ajouts et 2 suppressions
  1. 10 1
      CREDITS.md
  2. 5 1
      RELEASE_NOTES.md

+ 10 - 1
CREDITS.md

@@ -22,6 +22,7 @@
 * cdbishop
 * cdbishop
 * celeron55
 * celeron55
 * Charles Olivi
 * Charles Olivi
+* Chris Han
 * Chris Jones
 * Chris Jones
 * Chris Rehn
 * Chris Rehn
 * Christian Mauderer
 * Christian Mauderer
@@ -42,6 +43,7 @@
 * Drew Wells
 * Drew Wells
 * duong2179
 * duong2179
 * ehlertjd
 * ehlertjd
+* eugene
 * Eric Tsau
 * Eric Tsau
 * Erick Vieyra
 * Erick Vieyra
 * Erik Beran
 * Erik Beran
@@ -56,6 +58,7 @@
 * Gregor Jasny
 * Gregor Jasny
 * grenclave
 * grenclave
 * grunk
 * grunk
+* guangqing.chen
 * Guilherme Amadio
 * Guilherme Amadio
 * hansipie
 * hansipie
 * HariKamath Kamath
 * HariKamath Kamath
@@ -102,6 +105,7 @@
 * Li Peng
 * Li Peng
 * Lianghui
 * Lianghui
 * Luka Rahne
 * Luka Rahne
+* Lukas Martanovic
 * Maarten Fremouw
 * Maarten Fremouw
 * makrsmark
 * makrsmark
 * marco
 * marco
@@ -114,6 +118,7 @@
 * mingodad
 * mingodad
 * Morgan McGuire
 * Morgan McGuire
 * mrdvlpr.xnu
 * mrdvlpr.xnu
+* Nat!
 * Neil Jensen
 * Neil Jensen
 * newsoft
 * newsoft
 * nfrmtkr
 * nfrmtkr
@@ -149,6 +154,8 @@
 * Sergey Linev
 * Sergey Linev
 * sgmesservey
 * sgmesservey
 * shantanugadgil
 * shantanugadgil
+* Sherwyn Sen
+* shreyajaggi8
 * Simon Hailes
 * Simon Hailes
 * slidertom
 * slidertom
 * SpaceLord
 * SpaceLord
@@ -171,6 +178,7 @@
 * Uilian Ries
 * Uilian Ries
 * Ulrich Hertlein
 * Ulrich Hertlein
 * Walt Steverson
 * Walt Steverson
+* wangli28
 * webxer
 * webxer
 * William Greathouse
 * William Greathouse
 * xeoshow
 * xeoshow
@@ -179,6 +187,8 @@
 * Yury Z
 * Yury Z
 * zhen.wang
 * zhen.wang
 
 
+and others.
+
 # Mongoose Contributors
 # 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.
 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
 * tayS
 * test
 * test
 * valenok
 * valenok
-

+ 5 - 1
RELEASE_NOTES.md

@@ -1,10 +1,14 @@
 Release Notes v1.12
 Release Notes v1.12
 ===
 ===
-### Objectives: *TO BE DEFINED*
+### Objectives: *Multiple improvements and extensions in various areas, including compatibility, Lua scripting, documentation*
 
 
 Changes
 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
 - Format configuration dialogs for Windows
 - Add option "hide_tray" to start without Windows systray icon
 - Add option "hide_tray" to start without Windows systray icon
 - URI checking according to "remove_dot_segments" algorithm from RFC
 - URI checking according to "remove_dot_segments" algorithm from RFC