From d4fb1cf7f7d22c12e2e442ba5a5e98d09b0a28ab Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 26 Mar 2019 23:59:37 -0700 Subject: [PATCH] Mint v2.10.12. (#1089) --- Release/CMakeLists.txt | 2 +- Release/include/cpprest/version.h | 2 +- changelog.md | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt index 2c470a3946..5bf68a5e01 100644 --- a/Release/CMakeLists.txt +++ b/Release/CMakeLists.txt @@ -11,7 +11,7 @@ endif() set(CPPREST_VERSION_MAJOR 2) set(CPPREST_VERSION_MINOR 10) -set(CPPREST_VERSION_REVISION 11) +set(CPPREST_VERSION_REVISION 12) enable_testing() diff --git a/Release/include/cpprest/version.h b/Release/include/cpprest/version.h index 88fa4cacd7..fad8189203 100644 --- a/Release/include/cpprest/version.h +++ b/Release/include/cpprest/version.h @@ -5,6 +5,6 @@ */ #define CPPREST_VERSION_MINOR 10 #define CPPREST_VERSION_MAJOR 2 -#define CPPREST_VERSION_REVISION 11 +#define CPPREST_VERSION_REVISION 12 #define CPPREST_VERSION (CPPREST_VERSION_MAJOR * 100000 + CPPREST_VERSION_MINOR * 100 + CPPREST_VERSION_REVISION) diff --git a/changelog.md b/changelog.md index 6f373d1aad..b960986f64 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,11 @@ +cpprestsdk (2.10.12) +* PR#1088 Fix data race, GitHub #1085 +* PR#1084 Fix oauth nonces containing nulls. +* PR#1082 Workaround data-race on websocketpp's _htonll function +* PR#1080 Fix thread not joined +* PR#1076 Rewrite date formatting and parsing +-- cpprestsdk team TUE, 26 Mar 2019 11:57:00 -0800 + cpprestsdk (2.10.11) * PR##1073 Move get_jvm_env back into the crossplat namespace * PR##1049 Add the missing ssl::context callback in websocket_client_config