diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-02 21:10:11 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-02 21:10:11 +0000 |
commit | 14873b8fa867ac91860cbb85342511a55041611c (patch) | |
tree | b24cb61ee56b30e61430c22e1f520024aab87f7a | |
parent | 775b19917e81d629119e0ae9ef5601849c498cf8 (diff) | |
download | libmicrohttpd-14873b8fa867ac91860cbb85342511a55041611c.tar.gz libmicrohttpd-14873b8fa867ac91860cbb85342511a55041611c.zip |
releasing 0.9.30
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | src/include/microhttpd.h | 3 | ||||
-rw-r--r-- | src/microhttpd/connection_https.c | 14 | ||||
-rw-r--r-- | src/microhttpd/connection_https.h | 9 | ||||
-rw-r--r-- | src/microhttpd/memorypool.c | 10 | ||||
-rw-r--r-- | src/microhttpd/postprocessor.c | 23 | ||||
-rw-r--r-- | src/microhttpd/response.c | 2 |
8 files changed, 40 insertions, 30 deletions
@@ -1,5 +1,6 @@ | |||
1 | Mon Sep 2 22:59:45 CEST 2013 | 1 | Mon Sep 2 22:59:45 CEST 2013 |
2 | Fix use-after-free in epoll()-mode on read error. -CG | 2 | Fix use-after-free in epoll()-mode on read error. |
3 | Releasing libmicrohttpd 0.9.30. -CG | ||
3 | 4 | ||
4 | Sun Sep 1 21:55:53 CEST 2013 | 5 | Sun Sep 1 21:55:53 CEST 2013 |
5 | Fixing build issues on FreeBSD. -CG | 6 | Fixing build issues on FreeBSD. -CG |
diff --git a/configure.ac b/configure.ac index 793bca52..9e22a881 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -21,15 +21,15 @@ | |||
21 | # | 21 | # |
22 | # | 22 | # |
23 | AC_PREREQ(2.57) | 23 | AC_PREREQ(2.57) |
24 | AC_INIT([libmicrohttpd], [0.9.29],[libmicrohttpd@gnu.org]) | 24 | AC_INIT([libmicrohttpd], [0.9.30],[libmicrohttpd@gnu.org]) |
25 | AM_INIT_AUTOMAKE([silent-rules]) | 25 | AM_INIT_AUTOMAKE([silent-rules]) |
26 | AC_CONFIG_HEADERS([MHD_config.h]) | 26 | AC_CONFIG_HEADERS([MHD_config.h]) |
27 | AC_CONFIG_MACRO_DIR([m4]) | 27 | AC_CONFIG_MACRO_DIR([m4]) |
28 | AH_TOP([#define _GNU_SOURCE 1]) | 28 | AH_TOP([#define _GNU_SOURCE 1]) |
29 | 29 | ||
30 | LIB_VERSION_CURRENT=28 | 30 | LIB_VERSION_CURRENT=29 |
31 | LIB_VERSION_REVISION=0 | 31 | LIB_VERSION_REVISION=0 |
32 | LIB_VERSION_AGE=18 | 32 | LIB_VERSION_AGE=19 |
33 | AC_SUBST(LIB_VERSION_CURRENT) | 33 | AC_SUBST(LIB_VERSION_CURRENT) |
34 | AC_SUBST(LIB_VERSION_REVISION) | 34 | AC_SUBST(LIB_VERSION_REVISION) |
35 | AC_SUBST(LIB_VERSION_AGE) | 35 | AC_SUBST(LIB_VERSION_AGE) |
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index 275f361c..d06c0f92 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -119,8 +119,9 @@ extern "C" | |||
119 | 119 | ||
120 | /** | 120 | /** |
121 | * Current version of the library. | 121 | * Current version of the library. |
122 | * 0x01093001 = 1.9.30-1. | ||
122 | */ | 123 | */ |
123 | #define MHD_VERSION 0x00092203 | 124 | #define MHD_VERSION 0x00093000 |
124 | 125 | ||
125 | /** | 126 | /** |
126 | * MHD-internal return code for "YES". | 127 | * MHD-internal return code for "YES". |
diff --git a/src/microhttpd/connection_https.c b/src/microhttpd/connection_https.c index a03b45e2..0eea4837 100644 --- a/src/microhttpd/connection_https.c +++ b/src/microhttpd/connection_https.c | |||
@@ -38,8 +38,8 @@ | |||
38 | * Give gnuTLS chance to work on the TLS handshake. | 38 | * Give gnuTLS chance to work on the TLS handshake. |
39 | * | 39 | * |
40 | * @param connection connection to handshake on | 40 | * @param connection connection to handshake on |
41 | * @return MHD_YES on error or if the handshake is progressing | 41 | * @return #MHD_YES on error or if the handshake is progressing |
42 | * MHD_NO if the handshake has completed successfully | 42 | * #MHD_NO if the handshake has completed successfully |
43 | * and we should start to read/write data | 43 | * and we should start to read/write data |
44 | */ | 44 | */ |
45 | static int | 45 | static int |
@@ -90,7 +90,7 @@ run_tls_handshake (struct MHD_Connection *connection) | |||
90 | * processing. | 90 | * processing. |
91 | * | 91 | * |
92 | * @param connection the source connection | 92 | * @param connection the source connection |
93 | * @return always MHD_YES (we should continue to process the connection) | 93 | * @return always #MHD_YES (we should continue to process the connection) |
94 | */ | 94 | */ |
95 | static int | 95 | static int |
96 | MHD_tls_connection_handle_read (struct MHD_Connection *connection) | 96 | MHD_tls_connection_handle_read (struct MHD_Connection *connection) |
@@ -107,7 +107,7 @@ MHD_tls_connection_handle_read (struct MHD_Connection *connection) | |||
107 | * will forward all write requests to the underlying daemon unless | 107 | * will forward all write requests to the underlying daemon unless |
108 | * the connection has been marked for closing. | 108 | * the connection has been marked for closing. |
109 | * | 109 | * |
110 | * @return always MHD_YES (we should continue to process the connection) | 110 | * @return always #MHD_YES (we should continue to process the connection) |
111 | */ | 111 | */ |
112 | static int | 112 | static int |
113 | MHD_tls_connection_handle_write (struct MHD_Connection *connection) | 113 | MHD_tls_connection_handle_write (struct MHD_Connection *connection) |
@@ -125,8 +125,8 @@ MHD_tls_connection_handle_write (struct MHD_Connection *connection) | |||
125 | * call this function. | 125 | * call this function. |
126 | * | 126 | * |
127 | * @param connection being handled | 127 | * @param connection being handled |
128 | * @return MHD_YES if we should continue to process the | 128 | * @return #MHD_YES if we should continue to process the |
129 | * connection (not dead yet), MHD_NO if it died | 129 | * connection (not dead yet), #MHD_NO if it died |
130 | */ | 130 | */ |
131 | static int | 131 | static int |
132 | MHD_tls_connection_handle_idle (struct MHD_Connection *connection) | 132 | MHD_tls_connection_handle_idle (struct MHD_Connection *connection) |
@@ -167,6 +167,8 @@ MHD_tls_connection_handle_idle (struct MHD_Connection *connection) | |||
167 | /** | 167 | /** |
168 | * Set connection callback function to be used through out | 168 | * Set connection callback function to be used through out |
169 | * the processing of this secure connection. | 169 | * the processing of this secure connection. |
170 | * | ||
171 | * @param connection which callbacks should be modified | ||
170 | */ | 172 | */ |
171 | void | 173 | void |
172 | MHD_set_https_callbacks (struct MHD_Connection *connection) | 174 | MHD_set_https_callbacks (struct MHD_Connection *connection) |
diff --git a/src/microhttpd/connection_https.h b/src/microhttpd/connection_https.h index 8a5cf380..fe7e7b0f 100644 --- a/src/microhttpd/connection_https.h +++ b/src/microhttpd/connection_https.h | |||
@@ -29,7 +29,14 @@ | |||
29 | #include "internal.h" | 29 | #include "internal.h" |
30 | 30 | ||
31 | #if HTTPS_SUPPORT | 31 | #if HTTPS_SUPPORT |
32 | void MHD_set_https_callbacks (struct MHD_Connection *connection); | 32 | /** |
33 | * Set connection callback function to be used through out | ||
34 | * the processing of this secure connection. | ||
35 | * | ||
36 | * @param connection which callbacks should be modified | ||
37 | */ | ||
38 | void | ||
39 | MHD_set_https_callbacks (struct MHD_Connection *connection); | ||
33 | #endif | 40 | #endif |
34 | 41 | ||
35 | #endif | 42 | #endif |
diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c index db347056..29ccae23 100644 --- a/src/microhttpd/memorypool.c +++ b/src/microhttpd/memorypool.c | |||
@@ -144,7 +144,7 @@ MHD_pool_destroy (struct MemoryPool *pool) | |||
144 | * | 144 | * |
145 | * @param pool memory pool to use for the operation | 145 | * @param pool memory pool to use for the operation |
146 | * @param size number of bytes to allocate | 146 | * @param size number of bytes to allocate |
147 | * @param from_end allocate from end of pool (set to MHD_YES); | 147 | * @param from_end allocate from end of pool (set to #MHD_YES); |
148 | * use this for small, persistent allocations that | 148 | * use this for small, persistent allocations that |
149 | * will never be reallocated | 149 | * will never be reallocated |
150 | * @return NULL if the pool cannot support size more | 150 | * @return NULL if the pool cannot support size more |
@@ -187,8 +187,8 @@ MHD_pool_allocate (struct MemoryPool *pool, | |||
187 | * @param old_size the size of the existing block | 187 | * @param old_size the size of the existing block |
188 | * @param new_size the new size of the block | 188 | * @param new_size the new size of the block |
189 | * @return new address of the block, or | 189 | * @return new address of the block, or |
190 | * NULL if the pool cannot support new_size | 190 | * NULL if the pool cannot support @a new_size |
191 | * bytes (old continues to be valid for old_size) | 191 | * bytes (old continues to be valid for @a old_size) |
192 | */ | 192 | */ |
193 | void * | 193 | void * |
194 | MHD_pool_reallocate (struct MemoryPool *pool, | 194 | MHD_pool_reallocate (struct MemoryPool *pool, |
@@ -234,12 +234,12 @@ MHD_pool_reallocate (struct MemoryPool *pool, | |||
234 | 234 | ||
235 | /** | 235 | /** |
236 | * Clear all entries from the memory pool except | 236 | * Clear all entries from the memory pool except |
237 | * for "keep" of the given "size". | 237 | * for @a keep of the given @a size. |
238 | * | 238 | * |
239 | * @param pool memory pool to use for the operation | 239 | * @param pool memory pool to use for the operation |
240 | * @param keep pointer to the entry to keep (maybe NULL) | 240 | * @param keep pointer to the entry to keep (maybe NULL) |
241 | * @param size how many bytes need to be kept at this address | 241 | * @param size how many bytes need to be kept at this address |
242 | * @return addr new address of "keep" (if it had to change) | 242 | * @return addr new address of @a keep (if it had to change) |
243 | */ | 243 | */ |
244 | void * | 244 | void * |
245 | MHD_pool_reset (struct MemoryPool *pool, | 245 | MHD_pool_reset (struct MemoryPool *pool, |
diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c index dfdf2a50..e6677b7f 100644 --- a/src/microhttpd/postprocessor.c +++ b/src/microhttpd/postprocessor.c | |||
@@ -208,8 +208,8 @@ struct MHD_PostProcessor | |||
208 | /** | 208 | /** |
209 | * Do we have to call the 'ikvi' callback when processing the | 209 | * Do we have to call the 'ikvi' callback when processing the |
210 | * multipart post body even if the size of the payload is zero? | 210 | * multipart post body even if the size of the payload is zero? |
211 | * Set to MHD_YES whenever we parse a new multiparty entry header, | 211 | * Set to #MHD_YES whenever we parse a new multiparty entry header, |
212 | * and to MHD_NO the first time we call the 'ikvi' callback. | 212 | * and to #MHD_NO the first time we call the 'ikvi' callback. |
213 | * Used to ensure that we do always call 'ikvi' even if the | 213 | * Used to ensure that we do always call 'ikvi' even if the |
214 | * payload is empty (but not more than once). | 214 | * payload is empty (but not more than once). |
215 | */ | 215 | */ |
@@ -336,8 +336,8 @@ MHD_create_post_processor (struct MHD_Connection *connection, | |||
336 | * | 336 | * |
337 | * @param pp post processor context | 337 | * @param pp post processor context |
338 | * @param post_data upload data | 338 | * @param post_data upload data |
339 | * @param post_data_len number of bytes in upload_data | 339 | * @param post_data_len number of bytes in @a post_data |
340 | * @return MHD_YES on success, MHD_NO if there was an error processing the data | 340 | * @return #MHD_YES on success, #MHD_NO if there was an error processing the data |
341 | */ | 341 | */ |
342 | static int | 342 | static int |
343 | post_process_urlencoded (struct MHD_PostProcessor *pp, | 343 | post_process_urlencoded (struct MHD_PostProcessor *pp, |
@@ -492,7 +492,7 @@ post_process_urlencoded (struct MHD_PostProcessor *pp, | |||
492 | * @param prefix prefix to match | 492 | * @param prefix prefix to match |
493 | * @param line line to match prefix in | 493 | * @param line line to match prefix in |
494 | * @param suffix set to a copy of the rest of the line, starting at the end of the match | 494 | * @param suffix set to a copy of the rest of the line, starting at the end of the match |
495 | * @return MHD_YES if there was a match, MHD_NO if not | 495 | * @return #MHD_YES if there was a match, #MHD_NO if not |
496 | */ | 496 | */ |
497 | static int | 497 | static int |
498 | try_match_header (const char *prefix, char *line, char **suffix) | 498 | try_match_header (const char *prefix, char *line, char **suffix) |
@@ -523,7 +523,7 @@ try_match_header (const char *prefix, char *line, char **suffix) | |||
523 | * if the boundary is found | 523 | * if the boundary is found |
524 | * @param next_dash_state dash_state to which we should advance the | 524 | * @param next_dash_state dash_state to which we should advance the |
525 | * post processor if the boundary is found | 525 | * post processor if the boundary is found |
526 | * @return MHD_NO if the boundary is not found, MHD_YES if we did find it | 526 | * @return #MHD_NO if the boundary is not found, #MHD_YES if we did find it |
527 | */ | 527 | */ |
528 | static int | 528 | static int |
529 | find_boundary (struct MHD_PostProcessor *pp, | 529 | find_boundary (struct MHD_PostProcessor *pp, |
@@ -561,8 +561,7 @@ find_boundary (struct MHD_PostProcessor *pp, | |||
561 | * In buf, there maybe an expression '$key="$value"'. If that is the | 561 | * In buf, there maybe an expression '$key="$value"'. If that is the |
562 | * case, copy a copy of $value to destination. | 562 | * case, copy a copy of $value to destination. |
563 | * | 563 | * |
564 | * If destination is already non-NULL, | 564 | * If destination is already non-NULL, do nothing. |
565 | * do nothing. | ||
566 | */ | 565 | */ |
567 | static void | 566 | static void |
568 | try_get_value (const char *buf, | 567 | try_get_value (const char *buf, |
@@ -613,8 +612,8 @@ try_get_value (const char *buf, | |||
613 | * processed | 612 | * processed |
614 | * @param next_state state to which the post processor should | 613 | * @param next_state state to which the post processor should |
615 | * be advanced if we find the end of the headers | 614 | * be advanced if we find the end of the headers |
616 | * @return MHD_YES if we can continue processing, | 615 | * @return #MHD_YES if we can continue processing, |
617 | * MHD_NO on error or if we do not have | 616 | * #MHD_NO on error or if we do not have |
618 | * enough data yet | 617 | * enough data yet |
619 | */ | 618 | */ |
620 | static int | 619 | static int |
@@ -794,8 +793,8 @@ free_unmarked (struct MHD_PostProcessor *pp) | |||
794 | * | 793 | * |
795 | * @param pp post processor context | 794 | * @param pp post processor context |
796 | * @param post_data data to decode | 795 | * @param post_data data to decode |
797 | * @param post_data_len number of bytes in 'post_data' | 796 | * @param post_data_len number of bytes in @a post_data |
798 | * @return MHD_NO on error, | 797 | * @return #MHD_NO on error, |
799 | */ | 798 | */ |
800 | static int | 799 | static int |
801 | post_process_multipart (struct MHD_PostProcessor *pp, | 800 | post_process_multipart (struct MHD_PostProcessor *pp, |
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c index f6db5326..e4eb9fd0 100644 --- a/src/microhttpd/response.c +++ b/src/microhttpd/response.c | |||
@@ -35,7 +35,7 @@ | |||
35 | * @param kind header or footer | 35 | * @param kind header or footer |
36 | * @param header the header to add | 36 | * @param header the header to add |
37 | * @param content value to add | 37 | * @param content value to add |
38 | * @return MHD_NO on error (i.e. invalid header or content format). | 38 | * @return #MHD_NO on error (i.e. invalid header or content format). |
39 | */ | 39 | */ |
40 | static int | 40 | static int |
41 | add_response_entry (struct MHD_Response *response, | 41 | add_response_entry (struct MHD_Response *response, |