diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-23 08:50:45 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-23 08:50:45 +0000 |
commit | e2b97b7e9c8577a58e22432529d935f189f51c02 (patch) | |
tree | 97952bc3e64164fcb162899df3812ac295af3c9b | |
parent | 92b638cf8467f90b6e345046bedd627bf00b8707 (diff) | |
download | libmicrohttpd-e2b97b7e9c8577a58e22432529d935f189f51c02.tar.gz libmicrohttpd-e2b97b7e9c8577a58e22432529d935f189f51c02.zip |
release, testcase clean up
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | src/include/microhttpd.h | 2 | ||||
-rw-r--r-- | src/testcurl/daemontest_get_sendfile.c | 7 | ||||
-rw-r--r-- | src/testcurl/https/mhds_get_test.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/mhds_get_test_select.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/tls_test_common.h | 4 |
7 files changed, 18 insertions, 10 deletions
@@ -1,3 +1,6 @@ | |||
1 | Tue Nov 23 09:41:00 CET 2010 | ||
2 | Releasing libmicrohttpd 0.9.3. -CG | ||
3 | |||
1 | Thu Nov 18 23:10:36 CET 2010 | 4 | Thu Nov 18 23:10:36 CET 2010 |
2 | Fixing #1619 (testcases not working with NSS on Fedora). -CG/timn | 5 | Fixing #1619 (testcases not working with NSS on Fedora). -CG/timn |
3 | 6 | ||
diff --git a/configure.ac b/configure.ac index 877eab1d..61a731dd 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.2],[libmicrohttpd@gnu.org]) | 24 | AC_INIT([libmicrohttpd], [0.9.3],[libmicrohttpd@gnu.org]) |
25 | AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.2]) | 25 | AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.3]) |
26 | AM_CONFIG_HEADER([MHD_config.h]) | 26 | AM_CONFIG_HEADER([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=10 | 30 | LIB_VERSION_CURRENT=11 |
31 | LIB_VERSION_REVISION=0 | 31 | LIB_VERSION_REVISION=0 |
32 | LIB_VERSION_AGE=0 | 32 | LIB_VERSION_AGE=1 |
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 ded6ef78..de8468b0 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -106,7 +106,7 @@ extern "C" | |||
106 | /** | 106 | /** |
107 | * Current version of the library. | 107 | * Current version of the library. |
108 | */ | 108 | */ |
109 | #define MHD_VERSION 0x00090203 | 109 | #define MHD_VERSION 0x00090300 |
110 | 110 | ||
111 | /** | 111 | /** |
112 | * MHD-internal return code for "YES". | 112 | * MHD-internal return code for "YES". |
diff --git a/src/testcurl/daemontest_get_sendfile.c b/src/testcurl/daemontest_get_sendfile.c index 44a1825d..622b7af2 100644 --- a/src/testcurl/daemontest_get_sendfile.c +++ b/src/testcurl/daemontest_get_sendfile.c | |||
@@ -89,7 +89,12 @@ ahc_echo (void *cls, | |||
89 | *unused = NULL; | 89 | *unused = NULL; |
90 | fd = open ("daemontest_get_sendfile.c", O_RDONLY); | 90 | fd = open ("daemontest_get_sendfile.c", O_RDONLY); |
91 | if (fd == -1) | 91 | if (fd == -1) |
92 | abort (); | 92 | { |
93 | fprintf (stderr, "Failed to open `%s': %s\n", | ||
94 | "daemontest_get_sendfile.c", | ||
95 | STRERROR (errno)); | ||
96 | exit (1); | ||
97 | } | ||
93 | response = MHD_create_response_from_fd (strlen (TESTSTR), fd); | 98 | response = MHD_create_response_from_fd (strlen (TESTSTR), fd); |
94 | ret = MHD_queue_response (connection, MHD_HTTP_OK, response); | 99 | ret = MHD_queue_response (connection, MHD_HTTP_OK, response); |
95 | MHD_destroy_response (response); | 100 | MHD_destroy_response (response); |
diff --git a/src/testcurl/https/mhds_get_test.c b/src/testcurl/https/mhds_get_test.c index 4b065fae..4eefb8ff 100644 --- a/src/testcurl/https/mhds_get_test.c +++ b/src/testcurl/https/mhds_get_test.c | |||
@@ -32,8 +32,6 @@ | |||
32 | #include <gcrypt.h> | 32 | #include <gcrypt.h> |
33 | #include "tls_test_common.h" | 33 | #include "tls_test_common.h" |
34 | 34 | ||
35 | int curl_check_version (const char *req_version, ...); | ||
36 | int curl_uses_nss_ssl (); | ||
37 | extern const char srv_key_pem[]; | 35 | extern const char srv_key_pem[]; |
38 | extern const char srv_self_signed_cert_pem[]; | 36 | extern const char srv_self_signed_cert_pem[]; |
39 | extern const char srv_signed_cert_pem[]; | 37 | extern const char srv_signed_cert_pem[]; |
diff --git a/src/testcurl/https/mhds_get_test_select.c b/src/testcurl/https/mhds_get_test_select.c index 323a18a1..b31db5cc 100644 --- a/src/testcurl/https/mhds_get_test_select.c +++ b/src/testcurl/https/mhds_get_test_select.c | |||
@@ -32,8 +32,6 @@ | |||
32 | #include <gcrypt.h> | 32 | #include <gcrypt.h> |
33 | #include "tls_test_common.h" | 33 | #include "tls_test_common.h" |
34 | 34 | ||
35 | int curl_check_version (const char *req_version, ...); | ||
36 | int curl_uses_nss_ssl (); | ||
37 | extern const char srv_key_pem[]; | 35 | extern const char srv_key_pem[]; |
38 | extern const char srv_self_signed_cert_pem[]; | 36 | extern const char srv_self_signed_cert_pem[]; |
39 | extern const char srv_signed_cert_pem[]; | 37 | extern const char srv_signed_cert_pem[]; |
diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h index 07a87f3a..24e86ebb 100644 --- a/src/testcurl/https/tls_test_common.h +++ b/src/testcurl/https/tls_test_common.h | |||
@@ -69,6 +69,10 @@ struct CipherDef | |||
69 | }; | 69 | }; |
70 | 70 | ||
71 | 71 | ||
72 | int curl_check_version (const char *req_version, ...); | ||
73 | int curl_uses_nss_ssl (); | ||
74 | |||
75 | |||
72 | FILE * | 76 | FILE * |
73 | setup_ca_cert (); | 77 | setup_ca_cert (); |
74 | 78 | ||