diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ea5b6c7e0..c28225513b 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}.beta18") +set(DROGON_VERSION_STRING "${DROGON_VERSION}.beta19") # 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 21fe60e649..4cbc42fbc9 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -4,6 +4,38 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [1.0.0-beta19] - 2020-07-16 + +### API change list + +- Add a method to disable unicode escaping in json string. + +- Add a timeout parameter when sending HTTP requests. + +- Add the getJsonError method. + +### Changed + +- Remove the restriction on the location of layout tags in views. + +- Add a way to set the character set when creating DbClient objects. + +- Make `GET` as the only method for accessing static files. + +- Modify the 404 pages generator. + +- Modify the DbClient class. + +- Optimize the HttpResponse class. + +### Fixed + +- Properly handle chunked encoding requests. + +- Destroy DNS resolver of HttpClient in the correct thread. + +- Add the header to resolve build errors in VS2017. + ## [1.0.0-beta18] - 2020-06-14 ### API change list @@ -426,7 +458,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-beta18...HEAD +[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0-beta19...HEAD + +[1.0.0-beta19]: https://github.com/an-tao/drogon/compare/v1.0.0-beta18...v1.0.0-beta19 [1.0.0-beta18]: https://github.com/an-tao/drogon/compare/v1.0.0-beta17...v1.0.0-beta18 diff --git a/README.md b/README.md index f5830a30a7..324ed92e5c 100755 --- a/README.md +++ b/README.md @@ -7,12 +7,13 @@ [![Join the chat at https://gitter.im/drogon-web/community](https://badges.gitter.im/drogon-web/community.svg)](https://gitter.im/drogon-web/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker image](https://img.shields.io/badge/Docker-image-blue.svg)](https://cloud.docker.com/u/drogonframework/repository/docker/drogonframework/drogon) +English | [简体中文](./README.zh-CN.md) ### Overview **Drogon** is a C++14/17-based HTTP application framework. Drogon can be used to easily build various types of web application server programs using C++. **Drogon** is the name of a dragon in the American TV series "Game of Thrones" that I really like. Drogon is a cross-platform framework, It supports Linux, macOS, FreeBSD, and Windows. Its main features are as follows: -* Use a non-blocking I/O network lib based on epoll (kqueue under macOS/FreeBSD) to provide high-concurrency, high-performance network IO, please visit the [benchmarks](https://github.com/an-tao/drogon/wiki/13-Benchmarks) page and [TFB Live Results](https://tfb-status.techempower.com/) for more details; +* Use a non-blocking I/O network lib based on epoll (kqueue under macOS/FreeBSD) to provide high-concurrency, high-performance network IO, please visit the [TFB Tests Results](https://www.techempower.com/benchmarks/#section=data-r19&hw=ph&test=composite) for more details; * Provide a completely asynchronous programming mode; * Support Http1.0/1.1 (server side and client side); * Based on template, a simple reflection mechanism is implemented to completely decouple the main program framework, controllers and views. diff --git a/README.zh-CN.md b/README.zh-CN.md index 9994845ecf..b093ff658c 100755 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -6,12 +6,14 @@ [![Join the chat at https://gitter.im/drogon-web/community](https://badges.gitter.im/drogon-web/community.svg)](https://gitter.im/drogon-web/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker image](https://img.shields.io/badge/Docker-image-blue.svg)](https://cloud.docker.com/u/drogonframework/repository/docker/drogonframework/drogon) +[English](./README.md) | 简体中文 + **Drogon**是一个基于C++14/17的Http应用框架,使用Drogon可以方便的使用C++构建各种类型的Web应用服务端程序。 本版本库是github上[Drogon工程](https://github.com/an-tao/drogon)的镜像库。**Drogon**是作者非常喜欢的美剧《权力的游戏》中的一条龙的名字(汉译作卓耿),和龙有关但并不是dragon的误写,为了不至于引起不必要的误会这里说明一下。 Drogon是一个跨平台框架,它支持Linux,也支持macOS、FreeBSD,和Windows。它的主要特点如下: -* 网络层使用基于epoll(macOS/FreeBSD下是kqueue)的非阻塞IO框架,提供高并发、高性能的网络IO。详细请见[性能测试](https://github.com/an-tao/drogon/wiki/13-%E6%80%A7%E8%83%BD%E6%B5%8B%E8%AF%95)和[TFB Live Results](https://tfb-status.techempower.com/); +* 网络层使用基于epoll(macOS/FreeBSD下是kqueue)的非阻塞IO框架,提供高并发、高性能的网络IO。详细请见[TFB Tests Results](https://www.techempower.com/benchmarks/#section=data-r19&hw=ph&test=composite); * 全异步编程模式; * 支持Http1.0/1.1(server端和client端); * 基于template实现了简单的反射机制,使主程序框架、控制器(controller)和视图(view)完全解耦; @@ -187,3 +189,7 @@ class User : public drogon::HttpController ## 贡献方式 欢迎您的贡献。 请阅读[贡献指南](CONTRIBUTING.md)以获取更多的信息。 + +## QQ交流群:1137909452 + +欢迎交流探讨。 \ No newline at end of file diff --git a/trantor b/trantor index d814acd672..13c659a7e0 160000 --- a/trantor +++ b/trantor @@ -1 +1 @@ -Subproject commit d814acd672516d60d8f8377d175f2ba319b05719 +Subproject commit 13c659a7e0ae2ae2e96f50f726d77c483b861dd8