From 35b4a86e060a8a0698a59a23f7f5418cc269def9 Mon Sep 17 00:00:00 2001
From: an-tao <antao2002@gmail.com>
Date: Sat, 12 Dec 2020 16:33:13 +0800
Subject: [PATCH] Bump version to 1.2.0

---
 .appveyor.yml                        | 80 ++++++++++++++--------------
 CMakeLists.txt                       |  2 +-
 ChangeLog.md                         | 30 ++++++++++-
 examples/simple_example_test/main.cc |  2 +-
 trantor                              |  2 +-
 5 files changed, 72 insertions(+), 44 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index dc8d3cd0..e033177a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,41 +1,41 @@
-version: 1.1.0.{build}
-configuration:
-- Release
-- Debug
-
-environment:
-  matrix:
-    - GENERATOR: Visual Studio 15 2017
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARCH: Win32
-      
-    - GENERATOR: Visual Studio 15 2017
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARCH: x64
-      
-init:
-- cmake --version
-install:
-- cd C:\Tools\vcpkg
-- git pull
-- .\bootstrap-vcpkg.bat
-- vcpkg install jsoncpp:x86-windows
-- vcpkg install jsoncpp:x64-windows
-- vcpkg install zlib:x86-windows
-- vcpkg install zlib:x64-windows
-- vcpkg install libpq:x86-windows
-- vcpkg install libpq:x64-windows
-- vcpkg integrate install
-- cd %APPVEYOR_BUILD_FOLDER%
-before_build:
-- git submodule update --init
-- md build
-- cd build
-- cmake --config "%CONFIGURATION%" -G "%GENERATOR%" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-build_script:
-- cmake --build . --config "%CONFIGURATION%"
-build:
-  project: build\ALL_BUILD.vcxproj
-  verbosity: minimal
-cache:
+version: 1.2.0.{build}
+configuration:
+- Release
+- Debug
+
+environment:
+  matrix:
+    - GENERATOR: Visual Studio 15 2017
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      ARCH: Win32
+      
+    - GENERATOR: Visual Studio 15 2017
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      ARCH: x64
+      
+init:
+- cmake --version
+install:
+- cd C:\Tools\vcpkg
+- git pull
+- .\bootstrap-vcpkg.bat
+- vcpkg install jsoncpp:x86-windows
+- vcpkg install jsoncpp:x64-windows
+- vcpkg install zlib:x86-windows
+- vcpkg install zlib:x64-windows
+- vcpkg install libpq:x86-windows
+- vcpkg install libpq:x64-windows
+- vcpkg integrate install
+- cd %APPVEYOR_BUILD_FOLDER%
+before_build:
+- git submodule update --init
+- md build
+- cd build
+- cmake --config "%CONFIGURATION%" -G "%GENERATOR%" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
+build_script:
+- cmake --build . --config "%CONFIGURATION%"
+build:
+  project: build\ALL_BUILD.vcxproj
+  verbosity: minimal
+cache:
 - c:\tools\vcpkg\installed\
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff013ad5..600d214b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ option(LIBPQ_BATCH_MODE "Use batch mode for libpq" ON)
 option(BUILD_DROGON_SHARED "Build drogon as a shared lib" OFF)
 
 set(DROGON_MAJOR_VERSION 1)
-set(DROGON_MINOR_VERSION 1)
+set(DROGON_MINOR_VERSION 2)
 set(DROGON_PATCH_VERSION 0)
 set(DROGON_VERSION
     ${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
diff --git a/ChangeLog.md b/ChangeLog.md
index bf5a3ae5..c1cc6c53 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -4,6 +4,32 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.2.0] - 2020-12-12
+
+### Fixed
+
+- Fix error when receiving response without content-length header.
+
+- Fix a stack-overflow error when high concurrency happening on sqlite3.
+
+- Fix MinGW ORM building by enabling htonll and ntohll.
+
+### Changed
+
+- Modify the WebSocketTest controller to create a simple chat room.
+
+- Add support for OpenBSD.
+
+- Return 400 if the content-length is invalid.
+
+- Don't send content type in a 304 response.
+
+- Add the reuse_port option to app() interface.
+
+- Add the 'std::optional' support in the SqlBinder class and the Session class.
+
+- Add implicit page resolving capability.
+
 ## [1.1.0] - 2020-10-31
 
 ### Fixed
@@ -566,7 +592,9 @@ All notable changes to this project will be documented in this file.
 
 ## [1.0.0-beta1] - 2019-06-11
 
-[Unreleased]: https://github.com/an-tao/drogon/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/an-tao/drogon/compare/v1.2.0...HEAD
+
+[1.2.0]: https://github.com/an-tao/drogon/compare/v1.1.0...v1.2.0
 
 [1.1.0]: https://github.com/an-tao/drogon/compare/v1.0.0...v1.1.0
 
diff --git a/examples/simple_example_test/main.cc b/examples/simple_example_test/main.cc
index 72774ada..56c8966a 100644
--- a/examples/simple_example_test/main.cc
+++ b/examples/simple_example_test/main.cc
@@ -1253,7 +1253,7 @@ void loadFileLengths()
         indexLen = std::filesystem::file_size("index.html");
         indexImplicitLen = std::filesystem::file_size("a-directory/page.html");
     }
-    catch (std::exception e)
+    catch (const std::exception &e)
     {
         LOG_ERROR << "Unable to retrieve HTML file sizes: " << e.what();
         exit(1);
diff --git a/trantor b/trantor
index b2902d21..8e0af4aa 160000
--- a/trantor
+++ b/trantor
@@ -1 +1 @@
-Subproject commit b2902d217b9f0a59c428bff1ca6ccfe024a86aa6
+Subproject commit 8e0af4aaa1bc2fb6eb1e1e2f310fa1d070c5e1d2