summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2011-12-18 16:35:12 +0000
committerStefan Bühler <stbuehler@web.de>2011-12-18 16:35:12 +0000
commitbeb6709b6c7f54e04574cca389eef4a3602bdd93 (patch)
tree36490baa3736c38083856346087ae9b7dcf07a98
parent13d0440ac5799953d92f34a9191d3894b71802d4 (diff)
downloadlighttpd-git-beb6709b6c7f54e04574cca389eef4a3602bdd93.tar.gz
- next is 1.4.31
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2820 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 7d997332..33caed83 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 30)
+SET(CPACK_PACKAGE_VERSION_PATCH 31)
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 ee532a0d..fc9d62f8 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,10 @@
NEWS
====
-- 1.4.30 -
+- 1.4.31 -
+ *
+
+- 1.4.30 - 2011-12-18
* Always use our 'own' md5 implementation, fixes linking issues on MacOS (fixes #2331)
* Limit amount of bytes we send in one go; fixes stalling in one connection and timeouts on slow systems.
* [ssl] fix build errors when Elliptic-Curve Diffie-Hellman is disabled
diff --git a/SConstruct b/SConstruct
index d8b92060..42239300 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,7 +5,7 @@ import string
from stat import *
package = 'lighttpd'
-version = '1.4.30'
+version = '1.4.31'
def checkCHeaders(autoconf, hdrs):
p = re.compile('[^A-Z0-9]')
diff --git a/configure.ac b/configure.ac
index bbbe2f37..344bfb76 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.30], [contact@lighttpd.net])
+AC_INIT([lighttpd], [1.4.31], [contact@lighttpd.net])
AC_CONFIG_SRCDIR([src/server.c])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])