aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac6
-rw-r--r--m4/pkg.m4217
-rw-r--r--src/include/Makefile.am2
-rw-r--r--src/include/microhttpd.h2
-rw-r--r--src/microhttpd/Makefile.am1
6 files changed, 87 insertions, 146 deletions
diff --git a/ChangeLog b/ChangeLog
index b23667c2..7d61213c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
1Sat Aug 27 18:20:38 CEST 2016
2 Releasing libmicrohttpd 0.9.51. -CG
3
1Tue Aug 23 22:54:07 MSK 2016 4Tue Aug 23 22:54:07 MSK 2016
2 Internal refactoring: W32 compatibility layer was finally 5 Internal refactoring: W32 compatibility layer was finally
3 replaced with several specialized abstraction layers for 6 replaced with several specialized abstraction layers for
@@ -25,7 +28,7 @@ Mon Aug 15 13:06:52 CEST 2016
25 our connection limit. 28 our connection limit.
26 Avoid even accept()ing connections in certain thread modes 29 Avoid even accept()ing connections in certain thread modes
27 if we are at the connection limit and 30 if we are at the connection limit and
28 MHD_USE_PIPE_FOR_SHUTDOWN is available. 31 MHD_USE_PIPE_FOR_SHUTDOWN is available. -CG
29 32
30Wed Aug 10 16:42:57 MSK 2016 33Wed Aug 10 16:42:57 MSK 2016
31 Moved threads, locks and mutex abstraction to separate files, 34 Moved threads, locks and mutex abstraction to separate files,
diff --git a/configure.ac b/configure.ac
index 3c528754..c5b7e095 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.50],[libmicrohttpd@gnu.org]) 25AC_INIT([libmicrohttpd],[0.9.51],[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])
29AC_DEFINE([[_GNU_SOURCE]], [[1]], [Enable GNU-specific header features]) 29AC_DEFINE([[_GNU_SOURCE]], [[1]], [Enable GNU-specific header features])
30 30
31LIB_VERSION_CURRENT=50 31LIB_VERSION_CURRENT=51
32LIB_VERSION_REVISION=0 32LIB_VERSION_REVISION=0
33LIB_VERSION_AGE=38 33LIB_VERSION_AGE=39
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)
diff --git a/m4/pkg.m4 b/m4/pkg.m4
index 82bea96e..c5b26b52 100644
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -1,60 +1,29 @@
1dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 1# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
2dnl serial 11 (pkg-config-0.29.1) 2# serial 1 (pkg-config-0.24)
3dnl 3#
4dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 4# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
5dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> 5#
6dnl 6# This program is free software; you can redistribute it and/or modify
7dnl This program is free software; you can redistribute it and/or modify 7# it under the terms of the GNU General Public License as published by
8dnl it under the terms of the GNU General Public License as published by 8# the Free Software Foundation; either version 2 of the License, or
9dnl the Free Software Foundation; either version 2 of the License, or 9# (at your option) any later version.
10dnl (at your option) any later version. 10#
11dnl 11# This program is distributed in the hope that it will be useful, but
12dnl This program is distributed in the hope that it will be useful, but 12# WITHOUT ANY WARRANTY; without even the implied warranty of
13dnl WITHOUT ANY WARRANTY; without even the implied warranty of 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14# General Public License for more details.
15dnl General Public License for more details. 15#
16dnl 16# You should have received a copy of the GNU General Public License
17dnl You should have received a copy of the GNU General Public License 17# along with this program; if not, write to the Free Software
18dnl along with this program; if not, write to the Free Software 18# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 19#
20dnl 02111-1307, USA. 20# As a special exception to the GNU General Public License, if you
21dnl 21# distribute this file as part of a program that contains a
22dnl As a special exception to the GNU General Public License, if you 22# configuration script generated by Autoconf, you may include it under
23dnl distribute this file as part of a program that contains a 23# the same distribution terms that you use for the rest of that program.
24dnl configuration script generated by Autoconf, you may include it under 24
25dnl the same distribution terms that you use for the rest of that 25# PKG_PROG_PKG_CONFIG([MIN-VERSION])
26dnl program. 26# ----------------------------------
27
28dnl PKG_PREREQ(MIN-VERSION)
29dnl -----------------------
30dnl Since: 0.29
31dnl
32dnl Verify that the version of the pkg-config macros are at least
33dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
34dnl installed version of pkg-config, this checks the developer's version
35dnl of pkg.m4 when generating configure.
36dnl
37dnl To ensure that this macro is defined, also add:
38dnl m4_ifndef([PKG_PREREQ],
39dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
40dnl
41dnl See the "Since" comment for each macro you use to see what version
42dnl of the macros you require.
43m4_defun([PKG_PREREQ],
44[m4_define([PKG_MACROS_VERSION], [0.29.1])
45m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
46 [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
47])dnl PKG_PREREQ
48
49dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
50dnl ----------------------------------
51dnl Since: 0.16
52dnl
53dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
54dnl first found in the path. Checks that the version of pkg-config found
55dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
56dnl used since that's the first version where most current features of
57dnl pkg-config existed.
58AC_DEFUN([PKG_PROG_PKG_CONFIG], 27AC_DEFUN([PKG_PROG_PKG_CONFIG],
59[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 28[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
60m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) 29m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -76,19 +45,18 @@ if test -n "$PKG_CONFIG"; then
76 PKG_CONFIG="" 45 PKG_CONFIG=""
77 fi 46 fi
78fi[]dnl 47fi[]dnl
79])dnl PKG_PROG_PKG_CONFIG 48])# PKG_PROG_PKG_CONFIG
80 49
81dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 50# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
82dnl ------------------------------------------------------------------- 51#
83dnl Since: 0.18 52# Check to see whether a particular set of modules exists. Similar
84dnl 53# to PKG_CHECK_MODULES(), but does not set variables or print errors.
85dnl Check to see whether a particular set of modules exists. Similar to 54#
86dnl PKG_CHECK_MODULES(), but does not set variables or print errors. 55# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
87dnl 56# only at the first occurence in configure.ac, so if the first place
88dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 57# it's called might be skipped (such as if it is within an "if", you
89dnl only at the first occurence in configure.ac, so if the first place 58# have to call PKG_CHECK_EXISTS manually
90dnl it's called might be skipped (such as if it is within an "if", you 59# --------------------------------------------------------------
91dnl have to call PKG_CHECK_EXISTS manually
92AC_DEFUN([PKG_CHECK_EXISTS], 60AC_DEFUN([PKG_CHECK_EXISTS],
93[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 61[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
94if test -n "$PKG_CONFIG" && \ 62if test -n "$PKG_CONFIG" && \
@@ -98,10 +66,8 @@ m4_ifvaln([$3], [else
98 $3])dnl 66 $3])dnl
99fi]) 67fi])
100 68
101dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 69# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
102dnl --------------------------------------------- 70# ---------------------------------------------
103dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
104dnl pkg_failed based on the result.
105m4_define([_PKG_CONFIG], 71m4_define([_PKG_CONFIG],
106[if test -n "$$1"; then 72[if test -n "$$1"; then
107 pkg_cv_[]$1="$$1" 73 pkg_cv_[]$1="$$1"
@@ -113,11 +79,10 @@ m4_define([_PKG_CONFIG],
113 else 79 else
114 pkg_failed=untried 80 pkg_failed=untried
115fi[]dnl 81fi[]dnl
116])dnl _PKG_CONFIG 82])# _PKG_CONFIG
117 83
118dnl _PKG_SHORT_ERRORS_SUPPORTED 84# _PKG_SHORT_ERRORS_SUPPORTED
119dnl --------------------------- 85# -----------------------------
120dnl Internal check to see if pkg-config supports short errors.
121AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], 86AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
122[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 87[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
123if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 88if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -125,17 +90,19 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
125else 90else
126 _pkg_short_errors_supported=no 91 _pkg_short_errors_supported=no
127fi[]dnl 92fi[]dnl
128])dnl _PKG_SHORT_ERRORS_SUPPORTED 93])# _PKG_SHORT_ERRORS_SUPPORTED
129 94
130 95
131dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 96# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
132dnl [ACTION-IF-NOT-FOUND]) 97# [ACTION-IF-NOT-FOUND])
133dnl -------------------------------------------------------------- 98#
134dnl Since: 0.4.0 99#
135dnl 100# Note that if there is a possibility the first call to
136dnl Note that if there is a possibility the first call to 101# PKG_CHECK_MODULES might not happen, you should be sure to include an
137dnl PKG_CHECK_MODULES might not happen, you should be sure to include an 102# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
138dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 103#
104#
105# --------------------------------------------------------------
139AC_DEFUN([PKG_CHECK_MODULES], 106AC_DEFUN([PKG_CHECK_MODULES],
140[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 107[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
141AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl 108AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -189,40 +156,16 @@ else
189 AC_MSG_RESULT([yes]) 156 AC_MSG_RESULT([yes])
190 $3 157 $3
191fi[]dnl 158fi[]dnl
192])dnl PKG_CHECK_MODULES 159])# PKG_CHECK_MODULES
193
194
195dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
196dnl [ACTION-IF-NOT-FOUND])
197dnl ---------------------------------------------------------------------
198dnl Since: 0.29
199dnl
200dnl Checks for existence of MODULES and gathers its build flags with
201dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
202dnl and VARIABLE-PREFIX_LIBS from --libs.
203dnl
204dnl Note that if there is a possibility the first call to
205dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
206dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
207dnl configure.ac.
208AC_DEFUN([PKG_CHECK_MODULES_STATIC],
209[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
210_save_PKG_CONFIG=$PKG_CONFIG
211PKG_CONFIG="$PKG_CONFIG --static"
212PKG_CHECK_MODULES($@)
213PKG_CONFIG=$_save_PKG_CONFIG[]dnl
214])dnl PKG_CHECK_MODULES_STATIC
215 160
216 161
217dnl PKG_INSTALLDIR([DIRECTORY]) 162# PKG_INSTALLDIR(DIRECTORY)
218dnl ------------------------- 163# -------------------------
219dnl Since: 0.27 164# Substitutes the variable pkgconfigdir as the location where a module
220dnl 165# should install pkg-config .pc files. By default the directory is
221dnl Substitutes the variable pkgconfigdir as the location where a module 166# $libdir/pkgconfig, but the default can be changed by passing
222dnl should install pkg-config .pc files. By default the directory is 167# DIRECTORY. The user can override through the --with-pkgconfigdir
223dnl $libdir/pkgconfig, but the default can be changed by passing 168# parameter.
224dnl DIRECTORY. The user can override through the --with-pkgconfigdir
225dnl parameter.
226AC_DEFUN([PKG_INSTALLDIR], 169AC_DEFUN([PKG_INSTALLDIR],
227[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) 170[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
228m4_pushdef([pkg_description], 171m4_pushdef([pkg_description],
@@ -233,18 +176,16 @@ AC_ARG_WITH([pkgconfigdir],
233AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) 176AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
234m4_popdef([pkg_default]) 177m4_popdef([pkg_default])
235m4_popdef([pkg_description]) 178m4_popdef([pkg_description])
236])dnl PKG_INSTALLDIR 179]) dnl PKG_INSTALLDIR
237 180
238 181
239dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) 182# PKG_NOARCH_INSTALLDIR(DIRECTORY)
240dnl -------------------------------- 183# -------------------------
241dnl Since: 0.27 184# Substitutes the variable noarch_pkgconfigdir as the location where a
242dnl 185# module should install arch-independent pkg-config .pc files. By
243dnl Substitutes the variable noarch_pkgconfigdir as the location where a 186# default the directory is $datadir/pkgconfig, but the default can be
244dnl module should install arch-independent pkg-config .pc files. By 187# changed by passing DIRECTORY. The user can override through the
245dnl default the directory is $datadir/pkgconfig, but the default can be 188# --with-noarch-pkgconfigdir parameter.
246dnl changed by passing DIRECTORY. The user can override through the
247dnl --with-noarch-pkgconfigdir parameter.
248AC_DEFUN([PKG_NOARCH_INSTALLDIR], 189AC_DEFUN([PKG_NOARCH_INSTALLDIR],
249[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) 190[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
250m4_pushdef([pkg_description], 191m4_pushdef([pkg_description],
@@ -255,15 +196,13 @@ AC_ARG_WITH([noarch-pkgconfigdir],
255AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) 196AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
256m4_popdef([pkg_default]) 197m4_popdef([pkg_default])
257m4_popdef([pkg_description]) 198m4_popdef([pkg_description])
258])dnl PKG_NOARCH_INSTALLDIR 199]) dnl PKG_NOARCH_INSTALLDIR
259 200
260 201
261dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, 202# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
262dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 203# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
263dnl ------------------------------------------- 204# -------------------------------------------
264dnl Since: 0.28 205# Retrieves the value of the pkg-config variable for the given module.
265dnl
266dnl Retrieves the value of the pkg-config variable for the given module.
267AC_DEFUN([PKG_CHECK_VAR], 206AC_DEFUN([PKG_CHECK_VAR],
268[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 207[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
269AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl 208AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -272,4 +211,4 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2])
272AS_VAR_COPY([$1], [pkg_cv_][$1]) 211AS_VAR_COPY([$1], [pkg_cv_][$1])
273 212
274AS_VAR_IF([$1], [""], [$5], [$4])dnl 213AS_VAR_IF([$1], [""], [$5], [$4])dnl
275])dnl PKG_CHECK_VAR 214])# PKG_CHECK_VAR
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 24102d94..a2222a7c 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -3,4 +3,4 @@ SUBDIRS = .
3 3
4include_HEADERS = microhttpd.h 4include_HEADERS = microhttpd.h
5 5
6EXTRA_DIST = platform.h autoinit_funcs.h 6EXTRA_DIST = platform.h autoinit_funcs.h mhd_options.h
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 27576f5f..ff292280 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -126,7 +126,7 @@ typedef intptr_t ssize_t;
126 * Current version of the library. 126 * Current version of the library.
127 * 0x01093001 = 1.9.30-1. 127 * 0x01093001 = 1.9.30-1.
128 */ 128 */
129#define MHD_VERSION 0x00095009 129#define MHD_VERSION 0x00095100
130 130
131/** 131/**
132 * MHD-internal return code for "YES". 132 * MHD-internal return code for "YES".
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index cfd4799f..34a89984 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -58,7 +58,6 @@ libmicrohttpd_la_SOURCES = \
58 daemon.c \ 58 daemon.c \
59 internal.c internal.h \ 59 internal.c internal.h \
60 memorypool.c memorypool.h \ 60 memorypool.c memorypool.h \
61 mhd_options.h \
62 mhd_mono_clock.c mhd_mono_clock.h \ 61 mhd_mono_clock.c mhd_mono_clock.h \
63 mhd_limits.h mhd_byteorder.h \ 62 mhd_limits.h mhd_byteorder.h \
64 sysfdsetsize.c sysfdsetsize.h \ 63 sysfdsetsize.c sysfdsetsize.h \