aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2014-03-25 11:55:32 +0000
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2014-03-25 11:55:32 +0000
commitbb8f952bef2c17da6518f5da60eb8ffff3dd3751 (patch)
tree386ba13717d92a0e9a4a4b1738442eda3b077b4a
parent582da7168a3ba16944b06c583d3f74f61c82d785 (diff)
downloadlibmicrohttpd-bb8f952bef2c17da6518f5da60eb8ffff3dd3751.tar.gz
libmicrohttpd-bb8f952bef2c17da6518f5da60eb8ffff3dd3751.zip
Fix limiting by IPv6 address
-rw-r--r--ChangeLog3
-rw-r--r--src/microhttpd/daemon.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f390f57..97ac4924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
1Tue Mar 25 12:53:55 CET 2014
2 Fix limiting by IPv6 address. -EG
3
1Tue Mar 25 09:06:13 CET 2014 4Tue Mar 25 09:06:13 CET 2014
2 Added more FD_SETSIZE checks. 5 Added more FD_SETSIZE checks.
3 Implemented FD_SETSIZE checks for W32. -EG 6 Implemented FD_SETSIZE checks for W32. -EG
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 1c058da0..5d58fa9e 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -184,7 +184,7 @@ struct MHD_IPCount
184 * IPv4 address. 184 * IPv4 address.
185 */ 185 */
186 struct in_addr ipv4; 186 struct in_addr ipv4;
187#if HAVE_IPV6 187#if HAVE_INET6
188 /** 188 /**
189 * IPv6 address. 189 * IPv6 address.
190 */ 190 */
@@ -269,7 +269,7 @@ MHD_ip_addr_to_key (const struct sockaddr *addr,
269 return MHD_YES; 269 return MHD_YES;
270 } 270 }
271 271
272#if HAVE_IPV6 272#if HAVE_INET6
273 /* IPv6 addresses */ 273 /* IPv6 addresses */
274 if (sizeof (struct sockaddr_in6) == addrlen) 274 if (sizeof (struct sockaddr_in6) == addrlen)
275 { 275 {