aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-12-03 20:33:47 +0000
committerChristian Grothoff <christian@grothoff.org>2013-12-03 20:33:47 +0000
commitd9999d665031980a27b30246b40ce45d8813c82f (patch)
treed0d5f3bd1a0eec2d2d5e93b5dcdbd6cbfd0004bb
parent1be2534e86598800bf9f82164f859326fb63ff41 (diff)
downloadlibmicrohttpd-d9999d665031980a27b30246b40ce45d8813c82f.tar.gz
libmicrohttpd-d9999d665031980a27b30246b40ce45d8813c82f.zip
-version bumps and chlogs for 0.9.32 release
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac86
-rw-r--r--src/include/microhttpd.h2
3 files changed, 49 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f71eeb1..ee7123c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
1Tue Dec 3 21:25:56 CET 2013
2 Security fix: do not read past 0-terminator when unescaping
3 strings (thanks to Florian Weimer for reporting).
4 Releasing 0.9.32. -CG
5
1Tue Dec 3 21:05:38 CET 2013 6Tue Dec 3 21:05:38 CET 2013
2 Signaling n times for shutdown works, but for resume we need to 7 Signaling n times for shutdown works, but for resume we need to
3 wake up the correct daemon. Even if we signal n times in that 8 wake up the correct daemon. Even if we signal n times in that
diff --git a/configure.ac b/configure.ac
index f387b9e2..e2a99157 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,15 +21,15 @@
21# 21#
22# 22#
23AC_PREREQ(2.57) 23AC_PREREQ(2.57)
24AC_INIT([libmicrohttpd], [0.9.31],[libmicrohttpd@gnu.org]) 24AC_INIT([libmicrohttpd], [0.9.32],[libmicrohttpd@gnu.org])
25AM_INIT_AUTOMAKE([silent-rules]) 25AM_INIT_AUTOMAKE([silent-rules])
26AC_CONFIG_HEADERS([MHD_config.h]) 26AC_CONFIG_HEADERS([MHD_config.h])
27AC_CONFIG_MACRO_DIR([m4]) 27AC_CONFIG_MACRO_DIR([m4])
28AH_TOP([#define _GNU_SOURCE 1]) 28AH_TOP([#define _GNU_SOURCE 1])
29 29
30LIB_VERSION_CURRENT=30 30LIB_VERSION_CURRENT=31
31LIB_VERSION_REVISION=0 31LIB_VERSION_REVISION=0
32LIB_VERSION_AGE=20 32LIB_VERSION_AGE=21
33AC_SUBST(LIB_VERSION_CURRENT) 33AC_SUBST(LIB_VERSION_CURRENT)
34AC_SUBST(LIB_VERSION_REVISION) 34AC_SUBST(LIB_VERSION_REVISION)
35AC_SUBST(LIB_VERSION_AGE) 35AC_SUBST(LIB_VERSION_AGE)
@@ -89,7 +89,7 @@ AM_CONDITIONAL(HAVE_CURL_BINARY,$HAVE_CURL_BINARY)
89 89
90# set GCC options 90# set GCC options
91# use '-fno-strict-aliasing', but only if the compiler can take it 91# use '-fno-strict-aliasing', but only if the compiler can take it
92if gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1; 92if gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1;
93then 93then
94 CFLAGS="-fno-strict-aliasing $CFLAGS" 94 CFLAGS="-fno-strict-aliasing $CFLAGS"
95fi 95fi
@@ -102,40 +102,40 @@ case "$host_os" in
102*darwin* | *rhapsody* | *macosx*) 102*darwin* | *rhapsody* | *macosx*)
103 AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system]) 103 AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
104 CFLAGS="-no-cpp-precomp -fno-common $CFLAGS" 104 CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
105 AM_CONDITIONAL(HAVE_GNU_LD, false) 105 AM_CONDITIONAL(HAVE_GNU_LD, false)
106 AM_CONDITIONAL(HAVE_W32, false) 106 AM_CONDITIONAL(HAVE_W32, false)
107 ;; 107 ;;
108freebsd*) 108freebsd*)
109 AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) 109 AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
110 AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system]) 110 AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
111 AM_CONDITIONAL(HAVE_GNU_LD, true) 111 AM_CONDITIONAL(HAVE_GNU_LD, true)
112 AM_CONDITIONAL(HAVE_W32, false) 112 AM_CONDITIONAL(HAVE_W32, false)
113 CFLAGS="-D_THREAD_SAFE $CFLAGS" 113 CFLAGS="-D_THREAD_SAFE $CFLAGS"
114 ;; 114 ;;
115openbsd*) 115openbsd*)
116 AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) 116 AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
117 AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system]) 117 AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system])
118 AM_CONDITIONAL(HAVE_GNU_LD, true) 118 AM_CONDITIONAL(HAVE_GNU_LD, true)
119 AM_CONDITIONAL(HAVE_W32, false) 119 AM_CONDITIONAL(HAVE_W32, false)
120 ;; 120 ;;
121netbsd*) 121netbsd*)
122 AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) 122 AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
123 AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system]) 123 AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
124 AM_CONDITIONAL(HAVE_GNU_LD, true) 124 AM_CONDITIONAL(HAVE_GNU_LD, true)
125 AM_CONDITIONAL(HAVE_W32, false) 125 AM_CONDITIONAL(HAVE_W32, false)
126 ;; 126 ;;
127*solaris*) 127*solaris*)
128 AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system]) 128 AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
129 AC_DEFINE_UNQUOTED(_REENTRANT,1,[Need with solaris or errno doesnt work]) 129 AC_DEFINE_UNQUOTED(_REENTRANT,1,[Need with solaris or errno doesnt work])
130 AM_CONDITIONAL(HAVE_GNU_LD, false) 130 AM_CONDITIONAL(HAVE_GNU_LD, false)
131 AM_CONDITIONAL(HAVE_W32, false) 131 AM_CONDITIONAL(HAVE_W32, false)
132 LDFLAGS="$LDFLAGS -lpthread" 132 LDFLAGS="$LDFLAGS -lpthread"
133 ;; 133 ;;
134*arm-linux*) 134*arm-linux*)
135 AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel]) 135 AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel])
136 AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen sockets]) 136 AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen sockets])
137 CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS" 137 CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS"
138 AM_CONDITIONAL(HAVE_GNU_LD, true) 138 AM_CONDITIONAL(HAVE_GNU_LD, true)
139 AM_CONDITIONAL(HAVE_W32, false) 139 AM_CONDITIONAL(HAVE_W32, false)
140 AC_MSG_CHECKING(whether to support epoll) 140 AC_MSG_CHECKING(whether to support epoll)
141 AC_ARG_ENABLE([epoll], 141 AC_ARG_ENABLE([epoll],
@@ -148,8 +148,8 @@ netbsd*)
148*linux*) 148*linux*)
149 AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel]) 149 AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel])
150 AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen sockets]) 150 AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen sockets])
151 AM_CONDITIONAL(HAVE_GNU_LD, true) 151 AM_CONDITIONAL(HAVE_GNU_LD, true)
152 AM_CONDITIONAL(HAVE_W32, false) 152 AM_CONDITIONAL(HAVE_W32, false)
153 AC_MSG_CHECKING(whether to support epoll) 153 AC_MSG_CHECKING(whether to support epoll)
154 AC_ARG_ENABLE([epoll], 154 AC_ARG_ENABLE([epoll],
155 AS_HELP_STRING([--disable-epoll], 155 AS_HELP_STRING([--disable-epoll],
@@ -161,15 +161,15 @@ netbsd*)
161*cygwin*) 161*cygwin*)
162 AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) 162 AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
163 AM_CONDITIONAL(HAVE_GNU_LD, false) 163 AM_CONDITIONAL(HAVE_GNU_LD, false)
164 AM_CONDITIONAL(HAVE_W32, false) 164 AM_CONDITIONAL(HAVE_W32, false)
165 LDFLAGS="$LDFLAGS -no-undefined" 165 LDFLAGS="$LDFLAGS -no-undefined"
166 ;; 166 ;;
167*mingw*) 167*mingw*)
168 AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) 168 AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
169 AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) 169 AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
170 AM_CONDITIONAL(HAVE_W32, true) 170 AM_CONDITIONAL(HAVE_W32, true)
171 LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols -lws2_32" 171 LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols -lws2_32"
172 AM_CONDITIONAL(HAVE_GNU_LD, true) 172 AM_CONDITIONAL(HAVE_GNU_LD, true)
173 # check if PlibC is available 173 # check if PlibC is available
174 CHECK_PLIBC 174 CHECK_PLIBC
175 LIBS="$PLIBC_LIBS $LIBS" 175 LIBS="$PLIBC_LIBS $LIBS"
@@ -179,8 +179,8 @@ netbsd*)
179 ;; 179 ;;
180*openedition*) 180*openedition*)
181 AC_DEFINE_UNQUOTED(OS390,1,[This is a OS/390 system]) 181 AC_DEFINE_UNQUOTED(OS390,1,[This is a OS/390 system])
182 AM_CONDITIONAL(HAVE_GNU_LD, false) 182 AM_CONDITIONAL(HAVE_GNU_LD, false)
183 AM_CONDITIONAL(HAVE_W32, false) 183 AM_CONDITIONAL(HAVE_W32, false)
184 ;; 184 ;;
185*) 185*)
186 AC_MSG_RESULT(Unrecognised OS $host_os) 186 AC_MSG_RESULT(Unrecognised OS $host_os)
@@ -189,16 +189,16 @@ netbsd*)
189# and extend the switch statement; if we do not have 'HAVE_LISTEN_SHUTDOWN', 189# and extend the switch statement; if we do not have 'HAVE_LISTEN_SHUTDOWN',
190# pipes are used instead to signal 'select'. 190# pipes are used instead to signal 'select'.
191# AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen sockets]) 191# AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen sockets])
192 AM_CONDITIONAL(HAVE_GNU_LD, false) 192 AM_CONDITIONAL(HAVE_GNU_LD, false)
193 AM_CONDITIONAL(HAVE_W32, false) 193 AM_CONDITIONAL(HAVE_W32, false)
194;; 194;;
195esac 195esac
196 196
197 197
198if test "$enable_epoll" = "yes" 198if test "$enable_epoll" = "yes"
199then 199then
200 AC_CHECK_HEADERS([sys/epoll.h], 200 AC_CHECK_HEADERS([sys/epoll.h],
201 [enable_epoll="yes"], 201 [enable_epoll="yes"],
202 [enable_epoll="no"]) 202 [enable_epoll="no"])
203fi 203fi
204 204
@@ -227,7 +227,7 @@ AC_CHECK_HEADERS([search.h], AM_CONDITIONAL(HAVE_TSEARCH, true), AM_CONDITIONAL(
227 227
228# Check for plibc.h from system, if not found, use our own 228# Check for plibc.h from system, if not found, use our own
229AC_CHECK_HEADERS([plibc.h],our_private_plibc_h=0,our_private_plibc_h=1) 229AC_CHECK_HEADERS([plibc.h],our_private_plibc_h=0,our_private_plibc_h=1)
230AM_CONDITIONAL(USE_PRIVATE_PLIBC_H, test x$our_private_plibc_h = x1) 230AM_CONDITIONAL(USE_PRIVATE_PLIBC_H, test x$our_private_plibc_h = x1)
231 231
232AC_CHECK_FUNCS_ONCE(memmem) 232AC_CHECK_FUNCS_ONCE(memmem)
233AC_CHECK_FUNCS_ONCE(accept4) 233AC_CHECK_FUNCS_ONCE(accept4)
@@ -236,7 +236,7 @@ AC_COMPILE_IFELSE(
236 [AC_LANG_PROGRAM( 236 [AC_LANG_PROGRAM(
237 [ 237 [
238 #if defined HAVE_SYS_TYPES_H 238 #if defined HAVE_SYS_TYPES_H
239 # include <sys/types.h> 239 # include <sys/types.h>
240 #endif 240 #endif
241 #if defined HAVE_SYS_SOCKET_H 241 #if defined HAVE_SYS_SOCKET_H
242 # include <sys/socket.h> 242 # include <sys/socket.h>
@@ -291,7 +291,7 @@ AC_MSG_RESULT($have_inet6)
291AC_CHECK_DECLS([TCP_CORK], [], [], [[#include <netinet/tcp.h>]]) 291AC_CHECK_DECLS([TCP_CORK], [], [], [[#include <netinet/tcp.h>]])
292 292
293# TCP_NOPUSH 293# TCP_NOPUSH
294AC_CHECK_DECLS([TCP_NOPUSH], [], [], [[#include <netinet/tcp.h>]]) 294AC_CHECK_DECLS([TCP_NOPUSH], [], [], [[#include <netinet/tcp.h>]])
295 295
296# libcurl (required for testing) 296# libcurl (required for testing)
297SAVE_LIBS=$LIBS 297SAVE_LIBS=$LIBS
@@ -338,10 +338,10 @@ AC_MSG_RESULT($enable_spdy)
338 338
339if test "$enable_spdy" = "yes" 339if test "$enable_spdy" = "yes"
340then 340then
341 AC_CHECK_HEADERS([openssl/err.h], 341 AC_CHECK_HEADERS([openssl/err.h],
342 AC_CHECK_LIB(ssl, SSL_CTX_set_next_protos_advertised_cb, 342 AC_CHECK_LIB(ssl, SSL_CTX_set_next_protos_advertised_cb,
343 [AM_CONDITIONAL(HAVE_OPENSSL, true) 343 [AM_CONDITIONAL(HAVE_OPENSSL, true)
344 enable_spdy="yes"], 344 enable_spdy="yes"],
345 [AM_CONDITIONAL(HAVE_OPENSSL, false) 345 [AM_CONDITIONAL(HAVE_OPENSSL, false)
346 enable_spdy="no"]), 346 enable_spdy="no"]),
347 [AM_CONDITIONAL(HAVE_OPENSSL, false) 347 [AM_CONDITIONAL(HAVE_OPENSSL, false)
@@ -365,10 +365,10 @@ spdy_OPENSSL
365SPDY_LIBDEPS="" 365SPDY_LIBDEPS=""
366 366
367 367
368AC_CHECK_HEADERS([spdylay/spdylay.h], 368AC_CHECK_HEADERS([spdylay/spdylay.h],
369 [AM_CONDITIONAL(HAVE_SPDYLAY, true) 369 [AM_CONDITIONAL(HAVE_SPDYLAY, true)
370 have_spdylay="yes"], 370 have_spdylay="yes"],
371 [AM_CONDITIONAL(HAVE_SPDYLAY, false) 371 [AM_CONDITIONAL(HAVE_SPDYLAY, false)
372 have_spdylay="no"]) 372 have_spdylay="no"])
373 373
374AC_SUBST(SPDY_LIB_LDFLAGS) 374AC_SUBST(SPDY_LIB_LDFLAGS)
@@ -423,10 +423,10 @@ AM_CONDITIONAL(HAVE_ZZUF, test 0 != $HAVE_ZZUF)
423AM_CONDITIONAL(HAVE_SOCAT, test 0 != $HAVE_SOCAT) 423AM_CONDITIONAL(HAVE_SOCAT, test 0 != $HAVE_SOCAT)
424 424
425 425
426# libgcrypt linkage: required for HTTPS support 426# libgcrypt linkage: required for HTTPS support
427AM_PATH_LIBGCRYPT(1.2.2, gcrypt=true) 427AM_PATH_LIBGCRYPT(1.2.2, gcrypt=true)
428 428
429# define the minimal version of libgcrypt required 429# define the minimal version of libgcrypt required
430MHD_GCRYPT_VERSION=1:1.2.2 430MHD_GCRYPT_VERSION=1:1.2.2
431AC_DEFINE_UNQUOTED([MHD_GCRYPT_VERSION], "$MHD_GCRYPT_VERSION", [gcrypt lib version]) 431AC_DEFINE_UNQUOTED([MHD_GCRYPT_VERSION], "$MHD_GCRYPT_VERSION", [gcrypt lib version])
432 432
@@ -527,7 +527,7 @@ MHD_LIB_LDFLAGS="-export-dynamic -no-undefined"
527 527
528# TODO insert a proper check here 528# TODO insert a proper check here
529AC_CACHE_CHECK([whether -export-symbols-regex works], 529AC_CACHE_CHECK([whether -export-symbols-regex works],
530 gn_cv_export_symbols_regex_works, 530 gn_cv_export_symbols_regex_works,
531 [ 531 [
532 case "$host_os" in 532 case "$host_os" in
533 mingw*) gn_cv_export_symbols_regex_works=no;; 533 mingw*) gn_cv_export_symbols_regex_works=no;;
@@ -538,10 +538,10 @@ AC_CACHE_CHECK([whether -export-symbols-regex works],
538 538
539# gcov compilation 539# gcov compilation
540AC_MSG_CHECKING(whether to compile with support for code coverage analysis) 540AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
541AC_ARG_ENABLE([coverage], 541AC_ARG_ENABLE([coverage],
542 AS_HELP_STRING([--enable-coverage], 542 AS_HELP_STRING([--enable-coverage],
543 [compile the library with code coverage support]), 543 [compile the library with code coverage support]),
544 [use_gcov=${enableval}], 544 [use_gcov=${enableval}],
545 [use_gcov=no]) 545 [use_gcov=no])
546AC_MSG_RESULT($use_gcov) 546AC_MSG_RESULT($use_gcov)
547AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) 547AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
@@ -558,7 +558,7 @@ AC_SUBST(LDFLAGS)
558AC_SUBST(EXT_LIB_PATH) 558AC_SUBST(EXT_LIB_PATH)
559AC_SUBST(EXT_LIBS) 559AC_SUBST(EXT_LIBS)
560 560
561AC_CONFIG_FILES([ 561AC_CONFIG_FILES([
562libmicrohttpd.pc 562libmicrohttpd.pc
563Makefile 563Makefile
564contrib/Makefile 564contrib/Makefile
@@ -598,7 +598,7 @@ else
598 MSG_GCRYPT="yes" 598 MSG_GCRYPT="yes"
599fi 599fi
600 600
601AC_MSG_NOTICE([Configuration Summary: 601AC_MSG_NOTICE([Configuration Summary:
602 Operating System: ${host_os} 602 Operating System: ${host_os}
603 libgcrypt: ${MSG_GCRYPT} 603 libgcrypt: ${MSG_GCRYPT}
604 libcurl (testing): ${MSG_CURL} 604 libcurl (testing): ${MSG_CURL}
@@ -622,4 +622,4 @@ else
622 AC_MSG_NOTICE([ 622 AC_MSG_NOTICE([
623 License : LGPL or eCos 623 License : LGPL or eCos
624]) 624])
625fi 625fi
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 16107fff..e6a7532c 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -121,7 +121,7 @@ extern "C"
121 * Current version of the library. 121 * Current version of the library.
122 * 0x01093001 = 1.9.30-1. 122 * 0x01093001 = 1.9.30-1.
123 */ 123 */
124#define MHD_VERSION 0x00093102 124#define MHD_VERSION 0x00093200
125 125
126/** 126/**
127 * MHD-internal return code for "YES". 127 * MHD-internal return code for "YES".