diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-07-25 14:45:00 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-07-25 14:45:00 +0200 |
commit | db800351f55cc85dbe682b3d09f912cf32bd946c (patch) | |
tree | eb28dfbd2de764b668a1d94a1aea2f667ca24ff0 | |
parent | eca0f2871b4a4e6d062a7141b1609a2825d7c008 (diff) | |
download | libmicrohttpd-db800351f55cc85dbe682b3d09f912cf32bd946c.tar.gz libmicrohttpd-db800351f55cc85dbe682b3d09f912cf32bd946c.zip |
revert last patch, should be only on master for now
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | src/include/microhttpd.h | 2 | ||||
-rw-r--r-- | src/microhttpd/connection.c | 4 |
3 files changed, 6 insertions, 11 deletions
@@ -1,11 +1,6 @@ | |||
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 | |||
6 | Tue Jul 16 19:56:14 CEST 2019 | 1 | Tue Jul 16 19:56:14 CEST 2019 |
7 | Add MHD_OPTION_HTTPS_CERT_CALLBACK2 to allow OCSP stapling | 2 | Add MHD_OPTION_HTTPS_CERT_CALLBACK2 to allow OCSP stapling |
8 | and MHD_FEATURE_HTTPS_CERT_CALLBACK2 to check for. -TR | 3 | and MHD_FEATURE_HTTPS_CERT_CALLBACK2 to check for. -TR |
9 | 4 | ||
10 | Fri Jul 05 2019 22:30:40 MSK | 5 | Fri Jul 05 2019 22:30:40 MSK |
11 | Releasing libmicrohttpd 0.9.65. -EG | 6 | Releasing libmicrohttpd 0.9.65. -EG |
@@ -107,7 +102,7 @@ Sun Apr 21 16:40:00 MSK 2019 | |||
107 | 102 | ||
108 | Fri Apr 19 23:00:00 MSK 2019 | 103 | Fri Apr 19 23:00:00 MSK 2019 |
109 | Rewritten SHA-256 calculations from scratch to avoid changing LGPL version; | 104 | Rewritten SHA-256 calculations from scratch to avoid changing LGPL version; |
110 | Added usage of GCC/Clang built-ins for bytes swap to significantly improve | 105 | Added usage of GCC/Clang built-ins for bytes swap to significantly improve |
111 | speed of MD5 and SHA-256 calculation on platforms with known endianness. | 106 | speed of MD5 and SHA-256 calculation on platforms with known endianness. |
112 | Added test for SHA-256 calculations. -EG | 107 | Added test for SHA-256 calculations. -EG |
113 | 108 | ||
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index 4c05ffac..9d28cdb1 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 0x00096503 | 135 | #define MHD_VERSION 0x00096502 |
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 87c77c29..8cc3490b 100644 --- a/src/microhttpd/connection.c +++ b/src/microhttpd/connection.c | |||
@@ -1040,7 +1040,7 @@ MHD_lookup_connection_value_n (struct MHD_Connection *connection, | |||
1040 | { | 1040 | { |
1041 | for (pos = connection->headers_received; NULL != pos; pos = pos->next) | 1041 | for (pos = connection->headers_received; NULL != pos; pos = pos->next) |
1042 | { | 1042 | { |
1043 | if ( (0 != (kind & pos->kind)) && | 1043 | if ( (kind == pos->kind) && |
1044 | (NULL == pos->header) ) | 1044 | (NULL == pos->header) ) |
1045 | break; | 1045 | break; |
1046 | } | 1046 | } |
@@ -1049,7 +1049,7 @@ MHD_lookup_connection_value_n (struct MHD_Connection *connection, | |||
1049 | { | 1049 | { |
1050 | for (pos = connection->headers_received; NULL != pos; pos = pos->next) | 1050 | for (pos = connection->headers_received; NULL != pos; pos = pos->next) |
1051 | { | 1051 | { |
1052 | if ( (0 != (kind & pos->kind)) && | 1052 | if ( (kind == pos->kind) && |
1053 | (key_size == pos->header_size) && | 1053 | (key_size == pos->header_size) && |
1054 | ( (key == pos->header) || | 1054 | ( (key == pos->header) || |
1055 | (MHD_str_equal_caseless_bin_n_ (key, | 1055 | (MHD_str_equal_caseless_bin_n_ (key, |