From bbb338bf12abed17c97ef9b2fba4584600001ed6 Mon Sep 17 00:00:00 2001
From: An Tao <antao2002@gmail.com>
Date: Sun, 27 Sep 2020 22:51:09 +0800
Subject: [PATCH] Bump version to 1.0.0 (#584)

---
 CMakeLists.txt                            |  2 +-
 ChangeLog.md                              | 38 ++++++++++++++++++++++-
 orm_lib/src/mysql_impl/MysqlConnection.cc |  1 -
 trantor                                   |  2 +-
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0df11f1d..cf3c30d3 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(DROGON_MINOR_VERSION 0)
 set(DROGON_PATCH_VERSION 0)
 set(DROGON_VERSION
     ${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
-set(DROGON_VERSION_STRING "${DROGON_VERSION}.beta21")
+set(DROGON_VERSION_STRING "${DROGON_VERSION}")
 
 # Offer the user the choice of overriding the installation directories
 set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
diff --git a/ChangeLog.md b/ChangeLog.md
index e8cebe2b..5e19eae8 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -4,6 +4,40 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.0] - 2020-09-27
+
+### Fixed
+
+- Fix an issue of simple_reverse_proxy when handling chunked transfer-encoding.
+
+- Fix a bug when losting connection to MySQL server during query.
+
+- Remove the expired std::iterator template.
+
+- Fix a bug when creating models in some special cases.
+
+### API changes list
+
+- Modify methods related to headers.
+
+- Remove the expired std::iterator template.
+
+- Add getListeners() method to the HttpAppFramework class.
+
+- Remove the useless method stat() from the PluginBase class.
+
+- Add ConfigLoader::ConfigLoader(const Json::Value &data).
+
+### Changed
+
+- Add support for status code 418.
+
+- Modify session handling.
+
+- Modify the FileUpload.csp in simple_example to avoid CORS.
+
+- remove execution permission on /tmp/drogon.lock.
+
 ## [1.0.0-beta21] - 2020-08-19
 
 ### Changed
@@ -502,7 +536,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.0.0-beta21...HEAD
+[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0...HEAD
+
+[1.0.0]: https://github.com/an-tao/drogon/compare/v1.0.0-beta21...v1.0.0
 
 [1.0.0-beta21]: https://github.com/an-tao/drogon/compare/v1.0.0-beta20...v1.0.0-beta21
 
diff --git a/orm_lib/src/mysql_impl/MysqlConnection.cc b/orm_lib/src/mysql_impl/MysqlConnection.cc
index db0a9548..1cda2296 100644
--- a/orm_lib/src/mysql_impl/MysqlConnection.cc
+++ b/orm_lib/src/mysql_impl/MysqlConnection.cc
@@ -181,7 +181,6 @@ void MysqlConnection::disconnect()
 }
 void MysqlConnection::handleTimeout()
 {
-    LOG_TRACE << "channel index:" << channelPtr_->index();
     int status = 0;
     status |= MYSQL_WAIT_TIMEOUT;
     MYSQL *ret;
diff --git a/trantor b/trantor
index 8ca21f12..fe0c4d02 160000
--- a/trantor
+++ b/trantor
@@ -1 +1 @@
-Subproject commit 8ca21f124d4d6b75fded94d28b69d1448c286cbd
+Subproject commit fe0c4d02f211778197e9b7dc142f32fcce06983d