aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-01-22 08:47:48 +0000
committerChristian Grothoff <christian@grothoff.org>2014-01-22 08:47:48 +0000
commitdd902f337ba25c4d0093e4a89bc4edf1fb897611 (patch)
tree177704a0f512081d333a6df140b828303a7bbc85 /AUTHORS
parent5534659f202f3ba5fe5b9155fc742e63518aefc9 (diff)
downloadlibmicrohttpd-dd902f337ba25c4d0093e4a89bc4edf1fb897611.tar.gz
libmicrohttpd-dd902f337ba25c4d0093e4a89bc4edf1fb897611.zip
Luke-Jr wrote:
MHD_USE_DUAL_STACK in libmicrohttpd currently just *inhibits setting* the IPV6_V6ONLY socket option, but per Microsoft's documentation http://msdn.microsoft.com/en-us/library/windows/desktop/bb513665(v=vs.85).aspx the default on Windows is that this is enabled, thus MHD_USE_DUAL_STACK will not work (since it leaves the default). libmicrohttpd should probably just unconditionally set IPV6_V6ONLY to the desired value when the option is available. diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 0a33b77..3cbf28e 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c @@ -3493,8 +3493,7 @@ MHD_start_daemon_va (unsigned int flags, } daemon->socket_fd = socket_fd; - if ( (0 != (flags & MHD_USE_IPv6)) && - (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK)) ) + if (0 != (flags & MHD_USE_IPv6)) { #ifdef IPPROTO_IPV6 #ifdef IPV6_V6ONLY @@ -3503,10 +3502,11 @@ MHD_start_daemon_va (unsigned int flags, and may also be missing on older POSIX systems; good luck if you have any of those, your IPv6 socket may then also bind against IPv4 anyway... */ #ifndef WINDOWS - const int on = 1; + const int #else - const char on = 1; + const char #endif + on = (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK)); if ( (0 > SETSOCKOPT (socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof (on))) &&
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS3
1 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 258759c4..eaf2d4f4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,7 +22,7 @@ Matthew Moore
22Colin Caughie <c.caughie@indigovision.com> 22Colin Caughie <c.caughie@indigovision.com>
23David Carvalho <andaris@gmail.com> 23David Carvalho <andaris@gmail.com>
24David Reiss <dreiss@facebook.com> 24David Reiss <dreiss@facebook.com>
25Matt Holiday 25Matt Holiday
26Michael Cronenworth <mike@cchtml.com> 26Michael Cronenworth <mike@cchtml.com>
27Mika Raento <mikie@iki.fi> 27Mika Raento <mikie@iki.fi>
28Mike Crowe <mac@mcrowe.com> 28Mike Crowe <mac@mcrowe.com>
@@ -45,6 +45,7 @@ Jan Janak <jan@janakj.org>
45Matthew Mundell <matthew.mundell@greenbone.net> 45Matthew Mundell <matthew.mundell@greenbone.net>
46Scott Goldman <scottjg@github.com> 46Scott Goldman <scottjg@github.com>
47Jared Cantwell 47Jared Cantwell
48Luke-Jr <luke@dashjr.org>
48 49
49Documentation contributions also came from: 50Documentation contributions also came from:
50Marco Maggi <marco.maggi-ipsu@poste.it> 51Marco Maggi <marco.maggi-ipsu@poste.it>