[GNUnet-SVN] [libmicrohttpd] branch master updated (88863d4f -> 126b496e)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 88863d4f annotate arguments as in/out
     new 9e1db6c7 HTTPS: use sockets directly, without wrappers This should 
improve performance in HTTPS mode
     new 126b496e send_param_adapter(): removed branch for HTTPS handling

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/daemon.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 455539a9..cd7f7109 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2205,10 +2205,6 @@ send_param_adapter (struct MHD_Connection *connection,
   if (i > MHD_SCKT_SEND_MAX_SIZE_)
     i = MHD_SCKT_SEND_MAX_SIZE_; /* return value limit */
 
-  if (0 != (connection->daemon->options & MHD_USE_TLS))
-    return MHD_send_ (connection->socket_fd,
-                      other,
-                      i);
 #if LINUX
   if ( (connection->write_buffer_append_offset ==
        connection->write_buffer_send_offset) &&
@@ -2567,12 +2563,11 @@ internal_add_connection (struct MHD_Daemon *daemon,
 #endif
          return MHD_NO;
         }
-      gnutls_transport_set_ptr (connection->tls_session,
-                               (gnutls_transport_ptr_t) connection);
-      gnutls_transport_set_pull_function (connection->tls_session,
-                                         (gnutls_pull_func) 
&recv_param_adapter);
-      gnutls_transport_set_push_function (connection->tls_session,
-                                         (gnutls_push_func) 
&send_param_adapter);
+#if (GNUTLS_VERSION_NUMBER+0 >= 0x030109) && !defined(_WIN64)
+      gnutls_transport_set_int (connection->tls_session, (int)(client_socket));
+#else  /* GnuTLS before 3.1.9 or Win x64 */
+      gnutls_transport_set_ptr (connection->tls_session, 
(gnutls_transport_ptr_t)(intptr_t)(client_socket));
+#endif /* GnuTLS before 3.1.9 */
 
       if (daemon->https_mem_trust)
          gnutls_certificate_server_set_request (connection->tls_session,

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