diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-07-25 14:42:56 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-07-25 14:42:56 +0200 |
commit | f73873bc1925b1553effb57a1cc0dd19ad5e3302 (patch) | |
tree | b4db0de3ee7e31785fc7434f59745837a919adf3 | |
parent | 092b370587ff9dd258f52206e2ec58624f1cce5d (diff) | |
download | libmicrohttpd-f73873bc1925b1553effb57a1cc0dd19ad5e3302.tar.gz libmicrohttpd-f73873bc1925b1553effb57a1cc0dd19ad5e3302.zip |
fix regression introduced in cc5032b85
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | src/include/microhttpd.h | 2 | ||||
-rw-r--r-- | src/microhttpd/connection.c | 4 |
3 files changed, 11 insertions, 6 deletions
@@ -1,6 +1,11 @@ | |||
1 | Thu 25 Jul 2019 02:40:12 PM CEST | ||
2 | Fixing regression introduced in cc5032b85 (bit mask matching | ||
3 | of the header kinds in MHD_lookup_connection_value()), as | ||
4 | reported by Jose Bollo on the mailinglist. -CG/JB | ||
5 | |||
1 | Tue Jul 16 19:56:14 CEST 2019 | 6 | Tue Jul 16 19:56:14 CEST 2019 |
2 | Add MHD_OPTION_HTTPS_CERT_CALLBACK2 to allow OCSP stapling | 7 | Add MHD_OPTION_HTTPS_CERT_CALLBACK2 to allow OCSP stapling |
3 | and MHD_FEATURE_HTTPS_CERT_CALLBACK2 to check for. -TR | 8 | and MHD_FEATURE_HTTPS_CERT_CALLBACK2 to check for. -TR |
4 | 9 | ||
5 | Fri Jul 05 2019 22:30:40 MSK | 10 | Fri Jul 05 2019 22:30:40 MSK |
6 | Releasing libmicrohttpd 0.9.65. -EG | 11 | Releasing libmicrohttpd 0.9.65. -EG |
@@ -102,7 +107,7 @@ Sun Apr 21 16:40:00 MSK 2019 | |||
102 | 107 | ||
103 | Fri Apr 19 23:00:00 MSK 2019 | 108 | Fri Apr 19 23:00:00 MSK 2019 |
104 | Rewritten SHA-256 calculations from scratch to avoid changing LGPL version; | 109 | Rewritten SHA-256 calculations from scratch to avoid changing LGPL version; |
105 | Added usage of GCC/Clang built-ins for bytes swap to significantly improve | 110 | Added usage of GCC/Clang built-ins for bytes swap to significantly improve |
106 | speed of MD5 and SHA-256 calculation on platforms with known endianness. | 111 | speed of MD5 and SHA-256 calculation on platforms with known endianness. |
107 | Added test for SHA-256 calculations. -EG | 112 | Added test for SHA-256 calculations. -EG |
108 | 113 | ||
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index 9d28cdb1..4c05ffac 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -132,7 +132,7 @@ typedef intptr_t ssize_t; | |||
132 | * Current version of the library. | 132 | * Current version of the library. |
133 | * 0x01093001 = 1.9.30-1. | 133 | * 0x01093001 = 1.9.30-1. |
134 | */ | 134 | */ |
135 | #define MHD_VERSION 0x00096502 | 135 | #define MHD_VERSION 0x00096503 |
136 | 136 | ||
137 | /** | 137 | /** |
138 | * MHD-internal return code for "YES". | 138 | * MHD-internal return code for "YES". |
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c index 877f514b..fd977708 100644 --- a/src/microhttpd/connection.c +++ b/src/microhttpd/connection.c | |||
@@ -970,7 +970,7 @@ MHD_lookup_connection_value_n (struct MHD_Connection *connection, | |||
970 | { | 970 | { |
971 | for (pos = connection->headers_received; NULL != pos; pos = pos->next) | 971 | for (pos = connection->headers_received; NULL != pos; pos = pos->next) |
972 | { | 972 | { |
973 | if ( (kind == pos->kind) && | 973 | if ( (0 != (kind & pos->kind)) && |
974 | (NULL == pos->header) ) | 974 | (NULL == pos->header) ) |
975 | break; | 975 | break; |
976 | } | 976 | } |
@@ -979,7 +979,7 @@ MHD_lookup_connection_value_n (struct MHD_Connection *connection, | |||
979 | { | 979 | { |
980 | for (pos = connection->headers_received; NULL != pos; pos = pos->next) | 980 | for (pos = connection->headers_received; NULL != pos; pos = pos->next) |
981 | { | 981 | { |
982 | if ( (kind == pos->kind) && | 982 | if ( (0 != (kind & pos->kind)) && |
983 | (key_size == pos->header_size) && | 983 | (key_size == pos->header_size) && |
984 | ( (key == pos->header) || | 984 | ( (key == pos->header) || |
985 | (MHD_str_equal_caseless_bin_n_ (key, | 985 | (MHD_str_equal_caseless_bin_n_ (key, |