releng for 1.5.0-beta2

rail44 · Sep 16, 2015 · d681a40 · d681a40
1 parent f3e1548
commit d681a40
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,7 +26,7 @@ PROJECT(h2o C)
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "5")
 SET(VERSION_PATCH "0")
-SET(VERSION_PRERELEASE "-beta1")
+SET(VERSION_PRERELEASE "-beta2")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_PRERELEASE}")
 SET(LIBRARY_VERSION_MAJOR "0")
 SET(LIBRARY_VERSION_MINOR "9")

diff --git a/Changes b/Changes
@@ -1,6 +1,11 @@
 Revision history for H2O.
 
-1.5.0-beta1 TBD
+1.5.0-beta2 2015-09-16 07:00:00+0000
+	- [serurity fix][file] fix directory traversal (CVE-2015-5638) (Kazuho Oku)
+	- [mruby] fix build failure when oniguruma is already installed #501 #506 (Kazuho Oku)
+	- [mruby] update sample mruby app to use rack-based API #498 (Masayoshi Takahashi)
+
+1.5.0-beta1 2015-09-11 06:15:49+0000
 	- [core] introduce `is_compressible` and `priority` attributes to MIME map #436 #496 (Kazuho Oku)
 	- [access-log] fix bug that emitted unnecessary NUL char in certain conditions #462 #463 (Kazuho Oku)
 	- [fastcgi] support for http2 server-push using `link: rel=preload` header #446 (Kazuho Oku)

diff --git a/include/h2o/version.h b/include/h2o/version.h
@@ -22,7 +22,7 @@
 #ifndef h2o__version_h
 #define h2o__version_h
 
-#define H2O_VERSION "1.5.0-beta1"
+#define H2O_VERSION "1.5.0-beta2"
 
 #define H2O_VERSION_MAJOR 1
 #define H2O_VERSION_MINOR 5