summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2016-01-03 14:48:04 +0000
committerStefan Bühler <stbuehler@web.de>2016-01-03 14:48:04 +0000
commit3dd2f66d1321025078938015bd20df2c69fd5e48 (patch)
tree62ec60420813ba886c95f4f5781ef4af1cc90bb5
parentc27e27a51bca703da6ff289d629956ae20699b0f (diff)
downloadlighttpd-git-3dd2f66d1321025078938015bd20df2c69fd5e48.tar.gz
- next is 1.4.40
From: Stefan Bühler <stbuehler@web.de> git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3068 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--CMakeLists.txt2
-rw-r--r--NEWS4
-rw-r--r--SConstruct2
-rw-r--r--configure.ac2
4 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abdcddc0..78342cc6 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 39)
+set(CPACK_PACKAGE_VERSION_PATCH 40)
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 102d6383..179bac04 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,9 @@
NEWS
====
-- 1.4.39
+- 1.4.40
+
+- 1.4.39 - 2016-01-02
* [core] fix memset_s call (fixes #2698)
* [chunk] fix use after free / double free (fixes #2700)
diff --git a/SConstruct b/SConstruct
index 6c0de6d2..db82ef56 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,7 +5,7 @@ import string
from stat import *
package = 'lighttpd'
-version = '1.4.39'
+version = '1.4.40'
def checkCHeaders(autoconf, hdrs):
p = re.compile('[^A-Z0-9]')
diff --git a/configure.ac b/configure.ac
index 25e6b711..94cd04e9 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.39], [contact@lighttpd.net])
+AC_INIT([lighttpd], [1.4.40], [contact@lighttpd.net])
AC_CONFIG_SRCDIR([src/server.c])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])