summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2012-08-31 14:11:37 +0000
committerStefan Bühler <stbuehler@web.de>2012-08-31 14:11:37 +0000
commitb6b694df3d9c0b4a4c68eb29a4776960a65bce18 (patch)
tree7e97a526420658ee999de14402db3f4020dfbab1
parent100ed91f2d87b784e850688cc6f1c3ff62a67efd (diff)
downloadlighttpd-git-b6b694df3d9c0b4a4c68eb29a4776960a65bce18.tar.gz
- next is 1.4.32
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2841 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--CMakeLists.txt2
-rw-r--r--NEWS5
-rw-r--r--SConstruct2
-rw-r--r--configure.ac2
4 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33caed83..29ce04e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ ENABLE_TESTING()
SET(CPACK_PACKAGE_VERSION_MAJOR 1)
SET(CPACK_PACKAGE_VERSION_MINOR 4)
-SET(CPACK_PACKAGE_VERSION_PATCH 31)
+SET(CPACK_PACKAGE_VERSION_PATCH 32)
SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
diff --git a/NEWS b/NEWS
index 7d555fa6..ff0c3065 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,10 @@
NEWS
====
-- 1.4.31 -
+- 1.4.32 -
+ *
+
+- 1.4.31 - 2012-05-31
* [ssl] fix segfault in counting renegotiations for openssl versions without TLSEXT/SNI (thx carpii for reporting)
* Move fdevent subsystem includes to implementation files to reduce conflicts (fixes #2373)
* [mod_compress] fix handling if etags are disabled but cache-dir is set - may lead to double response
diff --git a/SConstruct b/SConstruct
index 42239300..eb70cd2a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,7 +5,7 @@ import string
from stat import *
package = 'lighttpd'
-version = '1.4.31'
+version = '1.4.32'
def checkCHeaders(autoconf, hdrs):
p = re.compile('[^A-Z0-9]')
diff --git a/configure.ac b/configure.ac
index 04f1eaf0..afdf67fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl -*- Autoconf -*-
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT([lighttpd], [1.4.31], [contact@lighttpd.net])
+AC_INIT([lighttpd], [1.4.32], [contact@lighttpd.net])
AC_CONFIG_SRCDIR([src/server.c])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])