--- embedaddon/lighttpd/src/mod_extforward.c 2013/10/14 10:32:47 1.1.1.1 +++ embedaddon/lighttpd/src/mod_extforward.c 2014/06/15 20:20:06 1.1.1.2 @@ -165,7 +165,7 @@ SETDEFAULTS_FUNC(mod_extforward_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(plugin_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; @@ -336,11 +336,11 @@ static void ipstr_to_sockaddr(server *srv, const char } else switch (addrlist->ai_family) { case AF_INET: memcpy(&sock->ipv4, addrlist->ai_addr, sizeof(sock->ipv4)); - assert(AF_INET == sock->plain.sa_family); + force_assert(AF_INET == sock->plain.sa_family); break; case AF_INET6: memcpy(&sock->ipv6, addrlist->ai_addr, sizeof(sock->ipv6)); - assert(AF_INET6 == sock->plain.sa_family); + force_assert(AF_INET6 == sock->plain.sa_family); break; default: log_error_write(srv, __FILE__, __LINE__, "SSS", @@ -439,7 +439,6 @@ URIHANDLER_FUNC(mod_extforward_uri_handler) { #ifdef HAVE_IPV6 ipstr_to_sockaddr(srv, real_remote_addr, &sock); #else - UNUSED(addrs_left); sock.ipv4.sin_addr.s_addr = inet_addr(real_remote_addr); sock.plain.sa_family = (sock.ipv4.sin_addr.s_addr == 0xFFFFFFFF) ? AF_UNSPEC : AF_INET; #endif