libmicrohttpd

commit f73873bc1925b1553effb57a1cc0dd19ad5e3302
parent 092b370587ff9dd258f52206e2ec58624f1cce5d
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 25 Jul 2019 14:42:56 +0200

fix regression introduced in cc5032b85

Diffstat:
M
ChangeLog
 | 
11
++++++++---
M
src/include/microhttpd.h
 | 
2
+-
M
src/microhttpd/connection.c
 | 
4
++--

3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,11 @@
+Thu 25 Jul 2019 02:40:12 PM CEST
+    Fixing regression introduced in cc5032b85 (bit mask matching
+    of the header kinds in MHD_lookup_connection_value()), as
+    reported by Jose Bollo on the mailinglist. -CG/JB
+
 Tue Jul 16 19:56:14 CEST 2019
-	Add MHD_OPTION_HTTPS_CERT_CALLBACK2 to allow OCSP stapling
-   and MHD_FEATURE_HTTPS_CERT_CALLBACK2 to check for. -TR
+    Add MHD_OPTION_HTTPS_CERT_CALLBACK2 to allow OCSP stapling
+    and MHD_FEATURE_HTTPS_CERT_CALLBACK2 to check for. -TR
 
 Fri Jul 05 2019 22:30:40 MSK
 	Releasing libmicrohttpd 0.9.65. -EG
@@ -102,7 +107,7 @@ Sun Apr 21 16:40:00 MSK 2019
 
 Fri Apr 19 23:00:00 MSK 2019
 	Rewritten SHA-256 calculations from scratch to avoid changing LGPL version;
-	Added usage of GCC/Clang built-ins for bytes swap to significantly improve 
+	Added usage of GCC/Clang built-ins for bytes swap to significantly improve
 	speed of MD5 and SHA-256 calculation on platforms with known endianness.
 	Added test for SHA-256 calculations. -EG
 
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
@@ -132,7 +132,7 @@ typedef intptr_t ssize_t;
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00096502
+#define MHD_VERSION 0x00096503
 
 /**
  * MHD-internal return code for "YES".
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
@@ -970,7 +970,7 @@ MHD_lookup_connection_value_n (struct MHD_Connection *connection,
     {
       for (pos = connection->headers_received; NULL != pos; pos = pos->next)
         {
-          if ( (kind == pos->kind) &&
+          if ( (0 != (kind & pos->kind)) &&
                (NULL == pos->header) )
             break;
         }
@@ -979,7 +979,7 @@ MHD_lookup_connection_value_n (struct MHD_Connection *connection,
     {
       for (pos = connection->headers_received; NULL != pos; pos = pos->next)
         {
-          if ( (kind == pos->kind) &&
+          if ( (0 != (kind & pos->kind)) &&
                (key_size == pos->header_size) &&
                ( (key == pos->header) ||
                  (MHD_str_equal_caseless_bin_n_ (key,