[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 90086f053104e7072ad141fe5132cd6256e2227f

[gitolite]

The branch, master has been updated
       via  90086f053104e7072ad141fe5132cd6256e2227f (commit)
       via  7055ebd931463d7bf0e4104c415d8ee60e21d83b (commit)
      from  101fa6ceed4baf7e03a2f24aca4beb6e03dbb9d6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 90086f053104e7072ad141fe5132cd6256e2227f
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Thu Nov 3 16:51:52 2016 +0300

    Added MHD_FEATURE_TLS with as synonym for MHD_FEATURE_SSL.

commit 7055ebd931463d7bf0e4104c415d8ee60e21d83b
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Thu Nov 3 16:49:24 2016 +0300

    Added MHD_FEATURE_UPGRADE for MHD_is_feature_supported()

-----------------------------------------------------------------------

Summary of changes:
 src/include/microhttpd.h | 11 ++++++++++-
 src/microhttpd/daemon.c  | 10 ++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 2a46c3e..7634897 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -2755,6 +2755,7 @@ enum MHD_FEATURE
    * #MHD_OPTION_HTTPS_MEM_DHPARAMS, #MHD_OPTION_HTTPS_CRED_TYPE,
    * #MHD_OPTION_HTTPS_PRIORITIES can be used.
    */
+  MHD_FEATURE_TLS = 2,
   MHD_FEATURE_SSL = 2,
 
   /**
@@ -2853,7 +2854,15 @@ enum MHD_FEATURE
   /**
    * Get whether MHD set names on generated threads.
    */
-  MHD_THREAD_NAMES = 16
+  MHD_FEATURE_THREAD_NAMES = 16,
+  MHD_THREAD_NAMES = 16,
+
+  /**
+   * Get whether HTTP "Upgrade" is supported.
+   * If supported then #MHD_ALLOW_UPGRADE, #MHD_upgrade_action() and
+   * #MHD_create_response_for_upgrade() can be used.
+   */
+  MHD_FEATURE_UPGRADE = 17
 };
 
 
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 4149bfc..944b038 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5862,7 +5862,7 @@ MHD_is_feature_supported(enum MHD_FEATURE feature)
 #else
       return MHD_NO;
 #endif
-    case MHD_FEATURE_SSL:
+    case MHD_FEATURE_TLS:
 #ifdef HTTPS_SUPPORT
       return MHD_YES;
 #else  /* ! HTTPS_SUPPORT */
@@ -5946,12 +5946,18 @@ MHD_is_feature_supported(enum MHD_FEATURE feature)
 #else
       return (sizeof(uint64_t) > sizeof(off_t)) ? MHD_NO : MHD_YES;
 #endif
-    case MHD_THREAD_NAMES:
+    case MHD_FEATURE_THREAD_NAMES:
 #if defined(MHD_USE_THREAD_NAME_)
       return MHD_YES;
 #else
       return MHD_NO;
 #endif
+    case MHD_FEATURE_UPGRADE:
+#if defined(UPGRADE_SUPPORT)
+      return MHD_YES;
+#else
+      return MHD_NO;
+#endif
     }
   return MHD_NO;
 }


hooks/post-receive
-- 
GNU libmicrohttpd