summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--src/sys-socket.h7
2 files changed, 1 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 5475c46e..ae5e0058 100644
--- a/NEWS
+++ b/NEWS
@@ -174,6 +174,7 @@ NEWS
* buffer_caseless_compare: always convert letters to lowercase to get transitive results, fixing array lookups (fixes #2405)
* fix :port handling in $HTTP["host"] checks (fixes #2135. thx liming)
* fix memleak in mod_auth (fixes #2457, thx brarcher)
+ * fix ipv6 disabling (fixes #2292, thx bert)
- 1.5.0-r19.. -
* -F option added for spawn-fcgi
diff --git a/src/sys-socket.h b/src/sys-socket.h
index c9650ad0..cf93efd2 100644
--- a/src/sys-socket.h
+++ b/src/sys-socket.h
@@ -59,13 +59,6 @@ int inet_aton(const char *cp, struct in_addr *inp);
#include <netdb.h>
#endif /* !_WIN32 */
-#ifdef HAVE_INET_NTOP
-/* only define it if it isn't defined yet */
-#ifndef HAVE_IPV6
-#define HAVE_IPV6
-#endif
-#endif
-
typedef union {
#ifdef HAVE_IPV6
struct sockaddr_in6 ipv6;