From: Remi Collet <remi@php.net>
Date: Thu, 20 Nov 2014 09:15:15 +0000 (+0100)
Subject: Raise a warning when listen = hostname used and is resolved as multiple addresses
X-Git-Tag: php-5.6.4RC1~55^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fd54bd9d8f20f4d56c3d8e0209c6c34fb3bfc98;p=php

Raise a warning when listen = hostname used and is resolved as multiple addresses

Using getaddrinfo is perhaps not a good idea... if we are not able
to listen on multiple addresses...

At least this message should help to diagnose problem, ex
... Found address for localhost, socket opened on ::1
... Found multiple addresses for localhost, 127.0.0.1 ignored
---

diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
index 9d9def35c7..0286f0eee8 100644
--- a/sapi/fpm/fpm/fpm_sockets.c
+++ b/sapi/fpm/fpm/fpm_sockets.c
@@ -255,6 +255,7 @@ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /*
 	char *dup_address = strdup(wp->config->listen_address);
 	char *port_str = strrchr(dup_address, ':');
 	char *addr = NULL;
+	char tmpbuf[INET6_ADDRSTRLEN];
 	int addr_len;
 	int port = 0;
 	int sock = -1;
@@ -302,14 +303,18 @@ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /*
 		return -1;
 	}
 
-	free(dup_address);
-
 	for (p = servinfo; p != NULL; p = p->ai_next) {
-		if ((sock = fpm_sockets_get_listening_socket(wp, p->ai_addr, p->ai_addrlen)) != -1) {
-			break;
+		inet_ntop(p->ai_family, fpm_get_in_addr(p->ai_addr), tmpbuf, INET6_ADDRSTRLEN);
+		if (sock < 0) {
+			if ((sock = fpm_sockets_get_listening_socket(wp, p->ai_addr, p->ai_addrlen)) != -1) {
+				zlog(ZLOG_DEBUG, "Found address for %s, socket opened on %s", dup_address, tmpbuf);
+			}
+		} else {
+			zlog(ZLOG_WARNING, "Found multiple addresses for %s, %s ignored", dup_address, tmpbuf);
 		}
 	}
 
+	free(dup_address);
 	freeaddrinfo(servinfo);
 
 	return sock;