commit ba9c5760a590a3cdbaeed755b5c71dcb51829cc1
parent 41d87442e62ab5b26420dc8e6e72303b3d1fe474
Author: Christian Grothoff <christian@grothoff.org>
Date: Wed, 28 Oct 2009 19:46:30 +0000
releasing 0.4.4
Diffstat:
6 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,14 +1,17 @@
+Wed Oct 28 20:26:00 CET 2009
+ Releasing libmicrohttpd 0.4.4. -CG
+
Wed Oct 14 14:37:37 CEST 2009
Fixing (rare) deadlock due to SELECT missing SIGALRM by
making all SELECT calls block for at most 1s. While this
can in (rare) situations delay the shutdown by 1s, I think
- this is prefereable (both performance and possibly portability-wise)
+ this is preferable (both performance and possibly portability-wise)
over using a pipe for the signal. -CG
Sun Oct 11 14:57:29 CEST 2009
Adding eCos license as an additional license for the
non-HTTPS code of MHD. -CG
-
+
Sun Oct 11 11:24:27 CEST 2009
Adding support for Symbian. -MR
diff --git a/README b/README
@@ -3,8 +3,9 @@ About
libmicrohttpd is a GNU library (part of the GNU project) written in C
that provides a compact API and implementation of an HTTP 1.1 web
-server. libmicrohttpd only implements the HTTP 1.1 protocol. The
-main application must still provide the content.
+server (HTTP 1.0 is also supported). libmicrohttpd only implements
+the HTTP 1.1 protocol. The main application must still provide the
+content.
Installation
@@ -38,10 +39,10 @@ main application should install a signal handler to handle SIGPIPE.
libmicrohttpd should work well on GNU/Linux, BSD, OS X, W32 and z/OS.
Note that HTTPS is not supported on z/OS (yet). We also have reports
-of users using it on vxWorks. Note that on platforms where the
-compiler does not support the "constructor" attribute, you must call
-"MHD_init" before using any MHD functions and "MHD_fini" after you are
-done using MHD.
+of users using it on vxWorks and Symbian. Note that on platforms
+where the compiler does not support the "constructor" attribute, you
+must call "MHD_init" before using any MHD functions and "MHD_fini"
+after you are done using MHD.
Notes on compiling on z/OS:
@@ -73,7 +74,7 @@ reasonably complete.
Missing features:
=================
-- MHD_get_daemon_info is not implemented (always returns NULL)
+- MHD_get_daemon_info options for SSL are not implemented (always return NULL)
- SSL support does not work with SELECT-based threading modes
(issue is that the gnutls state machine does not like EAGAIN/EINTR
return values from send/recv, despite having tons of
diff --git a/configure.ac b/configure.ac
@@ -21,15 +21,15 @@
#
#
AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.4.2],[libmicrohttpd@gnu.org])
-AM_INIT_AUTOMAKE([libmicrohttpd], [0.4.2])
+AC_INIT([libmicrohttpd], [0.4.4],[libmicrohttpd@gnu.org])
+AM_INIT_AUTOMAKE([libmicrohttpd], [0.4.4])
AM_CONFIG_HEADER([MHD_config.h])
AC_CONFIG_MACRO_DIR([m4])
AH_TOP([#define _GNU_SOURCE 1])
-LIB_VERSION_CURRENT=6
+LIB_VERSION_CURRENT=7
LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=1
+LIB_VERSION_AGE=2
AC_SUBST(LIB_VERSION_CURRENT)
AC_SUBST(LIB_VERSION_REVISION)
AC_SUBST(LIB_VERSION_AGE)
diff --git a/doc/libmicrohttpd.3 b/doc/libmicrohttpd.3
@@ -1,24 +1,26 @@
-.TH LIBMICROHTTPD "3" "14 Nov 2008" "libmicrohttpd"
+.TH LIBMICROHTTPD "3" "28 Oct 2009 "libmicrohttpd"
.SH "NAME"
GNU libmicrohttpd \- library for embedding HTTP servers
.SH "SYNOPSIS"
+\fB#include <sys/types.h>
+\fB#include <sys/select.h>
+\fB#include <sys/socket.h>
\fB#include <microhttpd.h>
.SH "DESCRIPTION"
.P
-GNU libmicrohttpd (short MHD) allows applications to easily integrate the functionality of a simple HTTP server.
+GNU libmicrohttpd (short MHD) allows applications to easily integrate the functionality of a simple HTTP server. MHD is a GNU package.
.P
-GNU libmicrohttpd is part of the GNU project.
-.P
-The details of the API are described in comments in the header file and on the webpage.
-
+The details of the API are described in comments in the header file, a detailed reference documentation and in brief on the MHD webpage.
.P
.SH "SEE ALSO"
\fBcurl\fP(1), \fBlibcurl\fP(3)
.SH "LEGAL NOTICE"
-libmicrohttpd is released under the LGPL Version 2 or higher.
+libmicrohttpd is released under both the LGPL Version 2 or higher and
+the GNU GPL with eCos extension. For details on both licenses please
+read the respective appendix in the manual.
.SH "FILES"
.TP
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
@@ -1600,7 +1600,7 @@ MHD_get_daemon_info (struct MHD_Daemon *daemon,
{
case MHD_DAEMON_INFO_LISTEN_FD:
return (const union MHD_DaemonInfo *) &daemon->socket_fd;
- default:
+ default:
return NULL;
};
}
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
@@ -81,17 +81,21 @@ extern "C"
/**
* Current version of the library.
*/
-#define MHD_VERSION 0x00040200
+#define MHD_VERSION 0x00040400
/**
- * MHD-internal return codes.
+ * MHD-internal return code for "YES".
*/
#define MHD_YES 1
+/**
+ * MHD-internal return code for "NO".
+ */
#define MHD_NO 0
/**
- * Constant used to indicate unknown size.
+ * Constant used to indicate unknown size (use when
+ * creating a response).
*/
#define MHD_SIZE_UNKNOWN ((uint64_t) -1LL)
