aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac8
-rw-r--r--src/include/microhttpd.h2
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index cbd5ea38..57dd440f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
1Wed May 13 11:49:09 CEST 2015
2 Releasing libmicrohttpd 0.9.42. -CG
3
1Wed May 13 11:33:59 CEST 2015 4Wed May 13 11:33:59 CEST 2015
2 Fix off-by-one in MHD_start_daemon_va() error handling logic 5 Fix off-by-one in MHD_start_daemon_va() error handling logic
3 when initialization of threads for thread pool fails for some 6 when initialization of threads for thread pool fails for some
diff --git a/configure.ac b/configure.ac
index 64c2fca9..3f7fb8f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,15 +22,15 @@
22# 22#
23AC_PREREQ([2.60]) 23AC_PREREQ([2.60])
24LT_PREREQ([2.4.0]) 24LT_PREREQ([2.4.0])
25AC_INIT([libmicrohttpd],[0.9.41],[libmicrohttpd@gnu.org]) 25AC_INIT([libmicrohttpd],[0.9.42],[libmicrohttpd@gnu.org])
26AM_INIT_AUTOMAKE([silent-rules] [subdir-objects]) 26AM_INIT_AUTOMAKE([silent-rules] [subdir-objects])
27AC_CONFIG_HEADERS([MHD_config.h]) 27AC_CONFIG_HEADERS([MHD_config.h])
28AC_CONFIG_MACRO_DIR([m4]) 28AC_CONFIG_MACRO_DIR([m4])
29AH_TOP([#define _GNU_SOURCE 1]) 29AH_TOP([#define _GNU_SOURCE 1])
30 30
31LIB_VERSION_CURRENT=41 31LIB_VERSION_CURRENT=42
32LIB_VERSION_REVISION=0 32LIB_VERSION_REVISION=0
33LIB_VERSION_AGE=31 33LIB_VERSION_AGE=32
34AC_SUBST(LIB_VERSION_CURRENT) 34AC_SUBST(LIB_VERSION_CURRENT)
35AC_SUBST(LIB_VERSION_REVISION) 35AC_SUBST(LIB_VERSION_REVISION)
36AC_SUBST(LIB_VERSION_AGE) 36AC_SUBST(LIB_VERSION_AGE)
@@ -293,7 +293,7 @@ if test "$enable_poll" != "no"; then
293 AC_LINK_IFELSE([ 293 AC_LINK_IFELSE([
294 AC_LANG_PROGRAM([[#include <winsock2.h>]], [[ 294 AC_LANG_PROGRAM([[#include <winsock2.h>]], [[
295WSAPOLLFD fda[2]; 295WSAPOLLFD fda[2];
296WSAPoll(fda, 2, 0);]])], 296WSAPoll(fda, 2, 0);]])],
297 [ 297 [
298 have_poll='yes' 298 have_poll='yes'
299 AC_DEFINE([HAVE_POLL],[1]) 299 AC_DEFINE([HAVE_POLL],[1])
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index f6157bee..ca3bb869 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -130,7 +130,7 @@ typedef intptr_t ssize_t;
130 * Current version of the library. 130 * Current version of the library.
131 * 0x01093001 = 1.9.30-1. 131 * 0x01093001 = 1.9.30-1.
132 */ 132 */
133#define MHD_VERSION 0x00094103 133#define MHD_VERSION 0x00094200
134 134
135/** 135/**
136 * MHD-internal return code for "YES". 136 * MHD-internal return code for "YES".