changes from feedback

Author: devnexen

sapi/fpm/config.m4

@@ -396,23 +396,6 @@ AC_DEFUN([AC_FPM_TIMES],
 	])
 ])
 
-AC_DEFUN([AC_FPM_SOCKETROUTE],
-[
-	have_socketroute=no
-	AC_MSG_CHECKING([for SO_SETFIB])
-
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[int x = SO_SETFIB;]])], [
-		have_socketroute=yes
-		AC_MSG_RESULT([yes])
-	], [
-		AC_MSG_RESULT([no])
-	])
-
-	if test $have_socketroute = "yes"; then
-		AC_DEFINE([HAVE_SOCKETROUTE], 1, [do we have socket route capabilities])
-	fi
-])
-
 AC_DEFUN([AC_FPM_KQUEUE],
 [
 	AC_MSG_CHECKING([for kqueue])
@@ -556,7 +539,6 @@ if test "$PHP_FPM" != "no"; then
   AC_FPM_LQ
   AC_FPM_SYSCONF
   AC_FPM_TIMES
-  AC_FPM_SOCKETROUTE
   AC_FPM_KQUEUE
   AC_FPM_PORT
   AC_FPM_DEVPOLL

sapi/fpm/fpm/fpm_conf.c

@@ -70,9 +70,6 @@ struct fpm_global_config_s fpm_global_config = {
 #ifdef HAVE_SYSTEMD
 	.systemd_watchdog = 0,
 	.systemd_interval = -1, /* -1 means not set */
-#endif
-#ifdef HAVE_SOCKETROUTE
-	.socketroute = -1, /* -1 means not set */
 #endif
 	.log_buffering = ZLOG_DEFAULT_BUFFERING,
 	.log_limit = ZLOG_DEFAULT_LIMIT
@@ -107,9 +104,6 @@ static struct ini_value_parser_s ini_fpm_global_options[] = {
 	{ "events.mechanism",            &fpm_conf_set_string,          GO(events_mechanism) },
 #ifdef HAVE_SYSTEMD
 	{ "systemd_interval",            &fpm_conf_set_time,            GO(systemd_interval) },
-#endif
-#ifdef HAVE_SOCKETROUTE
-	{ "socket.route",                &fpm_conf_set_integer,         GO(socketroute) },
 #endif
 	{ 0, 0, 0 }
 };
@@ -131,6 +125,9 @@ static struct ini_value_parser_s ini_fpm_pool_options[] = {
 	{ "listen.group",              &fpm_conf_set_string,      WPO(listen_group) },
 	{ "listen.mode",               &fpm_conf_set_string,      WPO(listen_mode) },
 	{ "listen.allowed_clients",    &fpm_conf_set_string,      WPO(listen_allowed_clients) },
+#ifdef SO_SETFIB
+	{ "listen.setfib",             &fpm_conf_set_integer,     WPO(listen_setfib) },
+#endif
 	{ "process.priority",          &fpm_conf_set_integer,     WPO(process_priority) },
 	{ "process.dumpable",          &fpm_conf_set_boolean,     WPO(process_dumpable) },
 	{ "pm",                        &fpm_conf_set_pm,          WPO(pm) },
@@ -1721,6 +1718,9 @@ static void fpm_conf_dump(void) /* {{{ */
 		zlog(ZLOG_NOTICE, "\tlisten.group = %s",               STR2STR(wp->config->listen_group));
 		zlog(ZLOG_NOTICE, "\tlisten.mode = %s",                STR2STR(wp->config->listen_mode));
 		zlog(ZLOG_NOTICE, "\tlisten.allowed_clients = %s",     STR2STR(wp->config->listen_allowed_clients));
+#ifdef HAVE_SETFIB
+		zlog(ZLOG_NOTICE, "\tlisten.setfib = %d",              wp->config->listen_setfib);
+#endif
 		if (wp->config->process_priority == 64) {
 			zlog(ZLOG_NOTICE, "\tprocess.priority = undefined");
 		} else {

sapi/fpm/fpm/fpm_conf.h

@@ -44,9 +44,6 @@ struct fpm_global_config_s {
 	int systemd_watchdog;
 	int systemd_interval;
 #endif
-#ifdef HAVE_SOCKETROUTE
-	int socketroute;
-#endif
 };
 
 extern struct fpm_global_config_s fpm_global_config;
@@ -106,6 +103,9 @@ struct fpm_worker_pool_config_s {
 	char *listen_acl_users;
 	char *listen_acl_groups;
 #endif
+#ifdef SO_SETFIB
+	int listen_setfib;
+#endif
 };
 
 struct ini_value_parser_s {

sapi/fpm/fpm/fpm_sockets.c

@@ -254,19 +254,17 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
 		return -1;
 	}
 
-#ifdef HAVE_SOCKETROUTE
-	if (-1 < fpm_global_config.socketroute) {
 #ifdef SO_SETFIB
-		if (routemax < fpm_global_config.socketroute) {
-			zlog(ZLOG_ERROR, "Invalid routing table id %d, max is %d", fpm_global_config.socketroute, routemax);
+	if (-1 < wp->config->listen_setfib) {
+		if (routemax < wp->config->listen_setfib) {
+			zlog(ZLOG_ERROR, "Invalid routing table id %d, max is %d", wp->config->listen_setfib, routemax);
 			close(sock);
 			return -1;
 		}
 
-		if (0 > setsockopt(sock, SOL_SOCKET, SO_SETFIB, &fpm_global_config.socketroute, sizeof(fpm_global_config.socketroute))) {
+		if (0 > setsockopt(sock, SOL_SOCKET, SO_SETFIB, &wp->config->listen_setfib, sizeof(wp->config->listen_setfib))) {
 			zlog(ZLOG_WARNING, "failed to change socket attribute");
 		}
-#endif
 	}
 #endif
 
@@ -406,10 +404,9 @@ static int fpm_socket_af_unix_listening_socket(struct fpm_worker_pool_s *wp) /*
 }
 /* }}} */
 
-#ifdef HAVE_SOCKETROUTE
-static zend_result fpm_socket_setroute_init(void) /* {{{ */
-{
 #ifdef SO_SETFIB
+static zend_result fpm_socket_setfib_init(void) /* {{{ */
+{
 	/* potentially up to 65536 but needs to check the actual cap beforehand */
 	size_t len = sizeof(routemax);
 	if (sysctlbyname("net.fibs", &routemax, &len, NULL, 0) < 0) {
@@ -418,7 +415,6 @@ static zend_result fpm_socket_setroute_init(void) /* {{{ */
 	}
 
 	return SUCCESS;
-#endif
 }
 /* }}} */
 #endif
@@ -436,8 +432,8 @@ int fpm_sockets_init_main() /* {{{ */
 		return -1;
 	}
 
-#ifdef HAVE_SOCKETROUTE
-	if (fpm_socket_setroute_init() == FAILURE) {
+#ifdef SO_SETFIB
+	if (fpm_socket_setfib_init() == FAILURE) {
 		return -1;
 	}
 #endif

sapi/fpm/php-fpm.conf.in

@@ -125,10 +125,6 @@
 ; Default value: 10
 ;systemd_interval = 10
 
-; Sets the routing table for the sockets created within FPM
-; - FreeBSD from 0 up to 65536
-;socket.route = -1
-
 ;;;;;;;;;;;;;;;;;;;;
 ; Pool Definitions ;
 ;;;;;;;;;;;;;;;;;;;;