diff options
| author | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2013-09-13 11:17:54 +0000 |
|---|---|---|
| committer | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2013-09-13 11:17:54 +0000 |
| commit | e57c8295ebe92b58ca3e68fa8ea8f70d4b0b4cee (patch) | |
| tree | a10e8efd76eadbd488e54c7e929f215fbed31be2 | |
| parent | e2f8dbdc97d9aa16babc80c6203d2f786926058b (diff) | |
| download | lighttpd-e57c8295ebe92b58ca3e68fa8ea8f70d4b0b4cee.tar.gz | |
fix ipv6 disabling (fixes #2292, thx bert)
having ntop should not automatically enable ipv6, especially if ipv6 was
disabled in the configure options.
From: Stefan Bühler <stbuehler@web.de>
git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@2907 152afb58-edef-0310-8abb-c4023f1b3aa9
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/sys-socket.h | 7 |
2 files changed, 1 insertions, 7 deletions
@@ -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; |