commit 14873b8fa867ac91860cbb85342511a55041611c
parent 775b19917e81d629119e0ae9ef5601849c498cf8
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 2 Sep 2013 21:10:11 +0000
releasing 0.9.30
Diffstat:
8 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
Mon Sep 2 22:59:45 CEST 2013
- Fix use-after-free in epoll()-mode on read error. -CG
+ Fix use-after-free in epoll()-mode on read error.
+ Releasing libmicrohttpd 0.9.30. -CG
Sun Sep 1 21:55:53 CEST 2013
Fixing build issues on FreeBSD. -CG
diff --git a/configure.ac b/configure.ac
@@ -21,15 +21,15 @@
#
#
AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.9.29],[libmicrohttpd@gnu.org])
+AC_INIT([libmicrohttpd], [0.9.30],[libmicrohttpd@gnu.org])
AM_INIT_AUTOMAKE([silent-rules])
AC_CONFIG_HEADERS([MHD_config.h])
AC_CONFIG_MACRO_DIR([m4])
AH_TOP([#define _GNU_SOURCE 1])
-LIB_VERSION_CURRENT=28
+LIB_VERSION_CURRENT=29
LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=18
+LIB_VERSION_AGE=19
AC_SUBST(LIB_VERSION_CURRENT)
AC_SUBST(LIB_VERSION_REVISION)
AC_SUBST(LIB_VERSION_AGE)
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
@@ -119,8 +119,9 @@ extern "C"
/**
* Current version of the library.
+ * 0x01093001 = 1.9.30-1.
*/
-#define MHD_VERSION 0x00092203
+#define MHD_VERSION 0x00093000
/**
* MHD-internal return code for "YES".
diff --git a/src/microhttpd/connection_https.c b/src/microhttpd/connection_https.c
@@ -38,8 +38,8 @@
* Give gnuTLS chance to work on the TLS handshake.
*
* @param connection connection to handshake on
- * @return MHD_YES on error or if the handshake is progressing
- * MHD_NO if the handshake has completed successfully
+ * @return #MHD_YES on error or if the handshake is progressing
+ * #MHD_NO if the handshake has completed successfully
* and we should start to read/write data
*/
static int
@@ -90,7 +90,7 @@ run_tls_handshake (struct MHD_Connection *connection)
* processing.
*
* @param connection the source connection
- * @return always MHD_YES (we should continue to process the connection)
+ * @return always #MHD_YES (we should continue to process the connection)
*/
static int
MHD_tls_connection_handle_read (struct MHD_Connection *connection)
@@ -107,7 +107,7 @@ MHD_tls_connection_handle_read (struct MHD_Connection *connection)
* will forward all write requests to the underlying daemon unless
* the connection has been marked for closing.
*
- * @return always MHD_YES (we should continue to process the connection)
+ * @return always #MHD_YES (we should continue to process the connection)
*/
static int
MHD_tls_connection_handle_write (struct MHD_Connection *connection)
@@ -125,8 +125,8 @@ MHD_tls_connection_handle_write (struct MHD_Connection *connection)
* call this function.
*
* @param connection being handled
- * @return MHD_YES if we should continue to process the
- * connection (not dead yet), MHD_NO if it died
+ * @return #MHD_YES if we should continue to process the
+ * connection (not dead yet), #MHD_NO if it died
*/
static int
MHD_tls_connection_handle_idle (struct MHD_Connection *connection)
@@ -167,6 +167,8 @@ MHD_tls_connection_handle_idle (struct MHD_Connection *connection)
/**
* Set connection callback function to be used through out
* the processing of this secure connection.
+ *
+ * @param connection which callbacks should be modified
*/
void
MHD_set_https_callbacks (struct MHD_Connection *connection)
diff --git a/src/microhttpd/connection_https.h b/src/microhttpd/connection_https.h
@@ -29,7 +29,14 @@
#include "internal.h"
#if HTTPS_SUPPORT
-void MHD_set_https_callbacks (struct MHD_Connection *connection);
+/**
+ * Set connection callback function to be used through out
+ * the processing of this secure connection.
+ *
+ * @param connection which callbacks should be modified
+ */
+void
+MHD_set_https_callbacks (struct MHD_Connection *connection);
#endif
#endif
diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c
@@ -144,7 +144,7 @@ MHD_pool_destroy (struct MemoryPool *pool)
*
* @param pool memory pool to use for the operation
* @param size number of bytes to allocate
- * @param from_end allocate from end of pool (set to MHD_YES);
+ * @param from_end allocate from end of pool (set to #MHD_YES);
* use this for small, persistent allocations that
* will never be reallocated
* @return NULL if the pool cannot support size more
@@ -187,8 +187,8 @@ MHD_pool_allocate (struct MemoryPool *pool,
* @param old_size the size of the existing block
* @param new_size the new size of the block
* @return new address of the block, or
- * NULL if the pool cannot support new_size
- * bytes (old continues to be valid for old_size)
+ * NULL if the pool cannot support @a new_size
+ * bytes (old continues to be valid for @a old_size)
*/
void *
MHD_pool_reallocate (struct MemoryPool *pool,
@@ -234,12 +234,12 @@ MHD_pool_reallocate (struct MemoryPool *pool,
/**
* Clear all entries from the memory pool except
- * for "keep" of the given "size".
+ * for @a keep of the given @a size.
*
* @param pool memory pool to use for the operation
* @param keep pointer to the entry to keep (maybe NULL)
* @param size how many bytes need to be kept at this address
- * @return addr new address of "keep" (if it had to change)
+ * @return addr new address of @a keep (if it had to change)
*/
void *
MHD_pool_reset (struct MemoryPool *pool,
diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c
@@ -208,8 +208,8 @@ struct MHD_PostProcessor
/**
* Do we have to call the 'ikvi' callback when processing the
* multipart post body even if the size of the payload is zero?
- * Set to MHD_YES whenever we parse a new multiparty entry header,
- * and to MHD_NO the first time we call the 'ikvi' callback.
+ * Set to #MHD_YES whenever we parse a new multiparty entry header,
+ * and to #MHD_NO the first time we call the 'ikvi' callback.
* Used to ensure that we do always call 'ikvi' even if the
* payload is empty (but not more than once).
*/
@@ -336,8 +336,8 @@ MHD_create_post_processor (struct MHD_Connection *connection,
*
* @param pp post processor context
* @param post_data upload data
- * @param post_data_len number of bytes in upload_data
- * @return MHD_YES on success, MHD_NO if there was an error processing the data
+ * @param post_data_len number of bytes in @a post_data
+ * @return #MHD_YES on success, #MHD_NO if there was an error processing the data
*/
static int
post_process_urlencoded (struct MHD_PostProcessor *pp,
@@ -492,7 +492,7 @@ post_process_urlencoded (struct MHD_PostProcessor *pp,
* @param prefix prefix to match
* @param line line to match prefix in
* @param suffix set to a copy of the rest of the line, starting at the end of the match
- * @return MHD_YES if there was a match, MHD_NO if not
+ * @return #MHD_YES if there was a match, #MHD_NO if not
*/
static int
try_match_header (const char *prefix, char *line, char **suffix)
@@ -523,7 +523,7 @@ try_match_header (const char *prefix, char *line, char **suffix)
* if the boundary is found
* @param next_dash_state dash_state to which we should advance the
* post processor if the boundary is found
- * @return MHD_NO if the boundary is not found, MHD_YES if we did find it
+ * @return #MHD_NO if the boundary is not found, #MHD_YES if we did find it
*/
static int
find_boundary (struct MHD_PostProcessor *pp,
@@ -561,8 +561,7 @@ find_boundary (struct MHD_PostProcessor *pp,
* In buf, there maybe an expression '$key="$value"'. If that is the
* case, copy a copy of $value to destination.
*
- * If destination is already non-NULL,
- * do nothing.
+ * If destination is already non-NULL, do nothing.
*/
static void
try_get_value (const char *buf,
@@ -613,8 +612,8 @@ try_get_value (const char *buf,
* processed
* @param next_state state to which the post processor should
* be advanced if we find the end of the headers
- * @return MHD_YES if we can continue processing,
- * MHD_NO on error or if we do not have
+ * @return #MHD_YES if we can continue processing,
+ * #MHD_NO on error or if we do not have
* enough data yet
*/
static int
@@ -794,8 +793,8 @@ free_unmarked (struct MHD_PostProcessor *pp)
*
* @param pp post processor context
* @param post_data data to decode
- * @param post_data_len number of bytes in 'post_data'
- * @return MHD_NO on error,
+ * @param post_data_len number of bytes in @a post_data
+ * @return #MHD_NO on error,
*/
static int
post_process_multipart (struct MHD_PostProcessor *pp,
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
@@ -35,7 +35,7 @@
* @param kind header or footer
* @param header the header to add
* @param content value to add
- * @return MHD_NO on error (i.e. invalid header or content format).
+ * @return #MHD_NO on error (i.e. invalid header or content format).
*/
static int
add_response_entry (struct MHD_Response *response,
