Merge tag '1.2.18' into develop

v1.2.18
Yellow-Camper · Feb 6, 2019 · c7cd83b · c7cd83b
2 parents 874a225 + e200bfa
commit c7cd83b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-project(libevhtp VERSION "1.2.17")
+project(libevhtp VERSION "1.2.18")
 
 # For us YCM users.
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,14 @@
-v1.2.17
+v1.2.18
+ o Add htp__evbuffer_add_iovec_ helper for libevent < 2.1 (8991567 Nathan French)
+ o [#122] Fix compilation without deprecated OpenSSL 1.1 APIs (78e8e41 Rosen Penev)
+ o [#122] Reorganize OpenSSL < 1.0.0 compatibility for greater readability. (8e543fe Rosen Penev)
+ o [#123] add missing include <sys/types.h> for ssize_t (6a74ec7 maxice8)
+ o [#123] include sys/types only if EVHTP_HAS_SYS_TYPES is set (0839f8e Nathan French)
+ o [#122] cleanup for ssl locking changes (7d0fd5d Nathan French)
+ o better get0_notBefore ssl defs (8ae5cdd Nathan French)
+ o cleanup / optimization for iovec operations (874a225 Nathan French)
+
+v1.2.17 (alpha/beta)
  o [#111] assert frontends not compiled with -DNDEBUG (07d6f5f Nathan French)
  o [#111] Remove asserts for alloc functions. (#112) (114bf53 Nathan French)
  o [#108] do not include content-length with chunked (#113) (73255df Nathan French)

diff --git a/include/evhtp/evhtp.h b/include/evhtp/evhtp.h
@@ -189,10 +189,10 @@ typedef evhtp_ssl_sess_t * (* evhtp_ssl_scache_get)(evhtp_connection_t * connect
 typedef void * (* evhtp_ssl_scache_init)(evhtp_t *);
 #endif
 
-#define EVHTP_VERSION           "1.2.17"
+#define EVHTP_VERSION           "1.2.18"
 #define EVHTP_VERSION_MAJOR     1
 #define EVHTP_VERSION_MINOR     2
-#define EVHTP_VERSION_PATCH     17
+#define EVHTP_VERSION_PATCH     18
 
 #define evhtp_headers_iterator  evhtp_kvs_iterator