[GNUnet-SVN] [libmicrohttpd] 82/154: revert last patch, should be only on master for now

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository libmicrohttpd.

commit db800351f55cc85dbe682b3d09f912cf32bd946c
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Jul 25 14:45:00 2019 +0200

    revert last patch, should be only on master for now
---
 ChangeLog                   | 11 +++--------
 src/include/microhttpd.h    |  2 +-
 src/microhttpd/connection.c |  4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c45326df..6a057b73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,6 @@
-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
@@ -107,7 +102,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
index 4c05ffac..9d28cdb1 100644
--- 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 0x00096503
+#define MHD_VERSION 0x00096502
 
 /**
  * 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,
     {
       for (pos = connection->headers_received; NULL != pos; pos = pos->next)
         {
-          if ( (0 != (kind & pos->kind)) &&
+          if ( (kind == pos->kind) &&
                (NULL == pos->header) )
             break;
         }
@@ -1049,7 +1049,7 @@ MHD_lookup_connection_value_n (struct MHD_Connection 
*connection,
     {
       for (pos = connection->headers_received; NULL != pos; pos = pos->next)
         {
-          if ( (0 != (kind & pos->kind)) &&
+          if ( (kind == pos->kind) &&
                (key_size == pos->header_size) &&
                ( (key == pos->header) ||
                  (MHD_str_equal_caseless_bin_n_ (key,

-- 
To stop receiving notification emails like this one, please contact
address@hidden.