[libmicrohttpd] branch master updated (aef8f949 -> 54317e6e)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from aef8f949 Fixed grow buffer check on 32-bit platforms
     new 4b79f237 VS Projects: switched optimisation to "MaxSpeed"
     new 54317e6e Muted compiler warning

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/mhd_sockets.c           | 14 +++++++++-----
 w32/common/common-build-settings.props |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/microhttpd/mhd_sockets.c b/src/microhttpd/mhd_sockets.c
index 0b348d83..f6da7452 100644
--- a/src/microhttpd/mhd_sockets.c
+++ b/src/microhttpd/mhd_sockets.c
@@ -523,13 +523,13 @@ MHD_socket_create_listen_ (int pf)
 #if defined(MHD_POSIX_SOCKETS) && (defined(SOCK_CLOEXEC) || \
   defined(SOCK_NOSIGPIPE) )
 
+  fd = socket (pf,
+               SOCK_STREAM | SOCK_CLOEXEC | SOCK_NOSIGPIPE_OR_ZERO,
+               0);
   cloexec_set = (SOCK_CLOEXEC_OR_ZERO != 0);
 #if defined(SOCK_NOSIGPIPE) || defined(MHD_socket_nosignal_)
   nosigpipe_set = (SOCK_NOSIGPIPE_OR_ZERO != 0);
 #endif /* SOCK_NOSIGPIPE ||  MHD_socket_nosignal_ */
-  fd = socket (pf,
-               SOCK_STREAM | SOCK_CLOEXEC | SOCK_NOSIGPIPE_OR_ZERO,
-               0);
 #elif defined(MHD_WINSOCK_SOCKETS) && defined(WSA_FLAG_NO_HANDLE_INHERIT)
   fd = WSASocketW (pf,
                    SOCK_STREAM,
@@ -538,9 +538,13 @@ MHD_socket_create_listen_ (int pf)
                    0,
                    WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
   cloexec_set = ! 0;
-#else  /* !SOCK_CLOEXEC */
+#else  /* No special socket init function / flags */
   fd = MHD_INVALID_SOCKET;
-#endif /* !SOCK_CLOEXEC */
+  cloexec_set = 0;
+#if defined(SOCK_NOSIGPIPE) || defined(MHD_socket_nosignal_)
+  nosigpipe_set = 0;
+#endif /* SOCK_NOSIGPIPE ||  MHD_socket_nosignal_ */
+#endif /* No special socket init function / flags */
   if (MHD_INVALID_SOCKET == fd)
   {
     fd = socket (pf,
diff --git a/w32/common/common-build-settings.props 
b/w32/common/common-build-settings.props
index 9d79bfeb..8207511c 100644
--- a/w32/common/common-build-settings.props
+++ b/w32/common/common-build-settings.props
@@ -100,7 +100,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(UseDebugLibraries)'!='true'">
     <ClCompile>
-      <Optimization>Full</Optimization>
+      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.