Merge tag '1.2.14' into develop
v1.2.14 SECURITY UPDATE
diff --git a/ChangeLog b/ChangeLog
index 41a388a..1f03277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+v1.2.14 - !!!! SECURITY UPDATE !!!!
+ o Added doxygen tags. Updated Doxyfile to include more sources and headers. (50ab41d Dan Henderson)
+ o SSL logging on handshake errors (0fff6bc Nathan French)
+ o Remove built-in Oniguruma, now rely on system only (a31601c Nathan French)
+ o FindLibevent now displays all deps (02a9e6c Nathan French)
+
+ * THIS IS PRIMARILY A SECURITY UPDATE:
+ Oniguruma (the regex library used by libevhtp) was packaged with the source;
+ this was dumb. There were several CVE's recently published that made evhtp
+ insecure.
+
+ NOTE TO USERS:
+
+ Libevhtp will no longer ship Oniguruma with the source. Instead, the build
+ process will attempt and find a system-installed version instead. There is
+ a big red warning if it is not found.
+
+ A big thanks must go to @flokli (github) for pointing this out to me.
+
v1.2.13
o Rename test->test_general (test is reservet target name in cmake) (d18c6d0 Vladimir Romanov)
o Fix CMake files (a2fcb3d Vladimir Romanov)
diff --git a/cmake/version.cmake b/cmake/version.cmake
index 4d1a0ed..d7c14ed 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -1,5 +1,5 @@
set (PROJECT_MAJOR_VERSION 1)
set (PROJECT_MINOR_VERSION 2)
-set (PROJECT_PATCH_VERSION 13)
+set (PROJECT_PATCH_VERSION 14)
set (PROJECT_VERSION
"${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}")
diff --git a/include/evhtp/evhtp.h b/include/evhtp/evhtp.h
index c1e3af4..0c66428 100644
--- a/include/evhtp/evhtp.h
+++ b/include/evhtp/evhtp.h
@@ -186,10 +186,10 @@
typedef void * (* evhtp_ssl_scache_init)(evhtp_t *);
#endif
-#define EVHTP_VERSION "1.2.13"
+#define EVHTP_VERSION "1.2.14"
#define EVHTP_VERSION_MAJOR 1
#define EVHTP_VERSION_MINOR 2
-#define EVHTP_VERSION_PATCH 13
+#define EVHTP_VERSION_PATCH 14
#define evhtp_headers_iterator evhtp_kvs_iterator
