releng for 2.2.6

h2o · Aug 12, 2019 · 7359e98 · 7359e98
1 parent 743d6b6
commit 7359e98
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,12 +26,12 @@ PROJECT(h2o)
 
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "2")
-SET(VERSION_PATCH "5")
+SET(VERSION_PATCH "6")
 SET(VERSION_PRERELEASE "")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_PRERELEASE}")
 SET(LIBRARY_VERSION_MAJOR "0")
 SET(LIBRARY_VERSION_MINOR "13")
-SET(LIBRARY_VERSION_PATCH "5")
+SET(LIBRARY_VERSION_PATCH "6")
 SET(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}${VERSION_PRERELEASE}")
 SET(LIBRARY_SOVERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}")
 

diff --git a/Changes b/Changes
@@ -1,5 +1,8 @@
 Revision history for H2O.
 
+2.2.6 2019-08-13 17:00:00+0000
+	- [security fix][http2] fix HTTP/2 DoS attack vectors CVE-2019-9512 CVE-2019-9514 CVE-2019-9515 #2090 (Kazuho Oku)
+
 2.2.5 2018-06-01 08:00:00+0000
 	- [security fix][access-log] fix buffer overflow CVE-2018-0608 #1775 (Frederik Deweerdt)
 	- [fastcgi] index file name must be part of SCRIPT_NAME #1650 (Ichito Nagata)

diff --git a/include/h2o/version.h b/include/h2o/version.h
@@ -22,14 +22,14 @@
 #ifndef h2o__version_h
 #define h2o__version_h
 
-#define H2O_VERSION "2.2.5"
+#define H2O_VERSION "2.2.6"
 
 #define H2O_VERSION_MAJOR 2
 #define H2O_VERSION_MINOR 2
-#define H2O_VERSION_PATCH 5
+#define H2O_VERSION_PATCH 6
 
 #define H2O_LIBRARY_VERSION_MAJOR 0
 #define H2O_LIBRARY_VERSION_MINOR 13
-#define H2O_LIBRARY_VERSION_PATCH 5
+#define H2O_LIBRARY_VERSION_PATCH 6
 
 #endif