[GNUnet-SVN] [libmicrohttpd] branch master updated (0ebdff94 -> 10fcdb1e)

[gnunet]

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

grothoff pushed a change to branch master
in repository libmicrohttpd.

    from 0ebdff94 fix test_upgrade transient failures (#5189)
     new 7710e63c work around silly address sanitizer alignment warning
     new 10fcdb1e update .gitignore file

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:
 doc/.gitignore                | 23 ++++++++++++-----------
 src/microhttpd/test_upgrade.c | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/doc/.gitignore b/doc/.gitignore
index 6c0bae11..b904aac5 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -25,19 +25,20 @@
 /microhttpd-tutorial.fn
 /microhttpd-tutorial.cp
 /microhttpd-tutorial.aux
-/tutorial.vr
-/tutorial.tp
-/tutorial.pg
-/tutorial.pdf
-/tutorial.log
-/tutorial.ky
-/tutorial.html
-/tutorial.fn
-/tutorial.cp
+/libmicrohttpd-tutorial.vr
+/libmicrohttpd-tutorial.tp
+/libmicrohttpd-tutorial.pg
+/libmicrohttpd-tutorial.pdf
+/libmicrohttpd-tutorial.log
+/libmicrohttpd-tutorial.ky
+/libmicrohttpd-tutorial.html
+/libmicrohttpd-tutorial.fn
+/libmicrohttpd-tutorial.cp
+/libmicrohttpd-tutorial.cps
 /microhttpd.html
 /version.texi.orig
-/tutorial.toc
-/tutorial.aux
+/libmicrohttpd-tutorial.toc
+/libmicrohttpd-tutorial.aux
 /stamp-vti.orig
 /microhttpd.info.orig
 /microhttpd.vr
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 6c26104e..7b542aff 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -1047,13 +1047,14 @@ test_upgrade (int flags,
 #endif /* HTTPS_SUPPORT */
   if (NULL == d)
     return 2;
-  real_flags = MHD_get_daemon_info(d,
-                                   MHD_DAEMON_INFO_FLAGS);
+  real_flags = MHD_get_daemon_info (d,
+                                    MHD_DAEMON_INFO_FLAGS);
   if (NULL == real_flags)
     abort ();
   dinfo = MHD_get_daemon_info (d,
                                MHD_DAEMON_INFO_BIND_PORT);
-  if (NULL == dinfo || 0 == dinfo->port)
+  if ( (NULL == dinfo) ||
+       (0 == dinfo->port) )
     abort ();
   if (!test_tls || TLS_LIB_GNUTLS == use_tls_tool)
     {
@@ -1072,12 +1073,19 @@ test_upgrade (int flags,
     {
 #if defined(HTTPS_SUPPORT) && defined(HAVE_FORK) && defined(HAVE_WAITPID)
       MHD_socket tls_fork_sock;
+      uint16_t port;
+
+      /* make address sanitizer happy */
+      memcpy (&port,
+              &dinfo->port,
+              sizeof (port));
       if (-1 == (pid = gnutlscli_connect (&tls_fork_sock,
-                                          dinfo->port)))
+                                          port)))
         {
           MHD_stop_daemon (d);
           return 4;
         }
+
       sock =  wr_create_from_plain_sckt (tls_fork_sock);
       if (NULL == sock)
         abort ();

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