Revert fpm_sockets.c changes

Author: alexandre-daubois

sapi/fpm/fpm/fpm_sockets.c

@@ -1,4 +1,4 @@
-	/* (c) 2007,2008 Andrei Nigmatulin */
+/* (c) 2007,2008 Andrei Nigmatulin */
 
 #include "fpm_config.h"
 
@@ -27,7 +27,6 @@
 #include "fpm_env.h"
 #include "fpm_cleanup.h"
 #include "fpm_scoreboard.h"
-#include "zend_smart_string.h"
 
 struct listening_socket_s {
 	int refcount;
@@ -59,24 +58,40 @@ static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */
 	unsigned i;
 	unsigned socket_set_count = 0;
 	unsigned socket_set[FPM_ENV_SOCKET_SET_MAX];
+	unsigned socket_set_buf = 0;
 	char envname[32];
-	smart_string env_str = {0};
+	char *env_value = 0;
+	int p = 0;
 	struct listening_socket_s *ls = sockets_list.data;
 
 	for (i = 0; i < sockets_list.used; i++, ls++) {
 		if (which != FPM_CLEANUP_PARENT_EXEC) {
 			close(ls->sock);
 		} else { /* on PARENT EXEC we want socket fds to be inherited through environment variable */
+			char fd[32];
+			char *tmpenv_value;
+			snprintf(fd, sizeof(fd), "%d", ls->sock);
+
+			socket_set_buf = (i % FPM_ENV_SOCKET_SET_SIZE == 0 && i) ? 1 : 0;
+			tmpenv_value = realloc(env_value, p + (p ? 1 : 0) + strlen(ls->key) + 1 + strlen(fd) + socket_set_buf + 1);
+			if (!tmpenv_value) {
+				zlog(ZLOG_SYSERROR, "failure to inherit data on parent exec for socket `%s` due to memory allocation failure", ls->key);
+				free(ls->key);
+				break;
+			}
+
+			env_value = tmpenv_value;
+
 			if (i % FPM_ENV_SOCKET_SET_SIZE == 0) {
-				smart_string_appendc(&env_str, '\0');
-				socket_set[socket_set_count] = env_str.len;
+				socket_set[socket_set_count] = p + socket_set_buf;
 				socket_set_count++;
-			} else {
-				smart_string_appendc(&env_str, ',');
+				if (i) {
+					*(env_value + p + 1) = 0;
+				}
 			}
-			smart_string_appends(&env_str, ls->key);
-			smart_string_appendc(&env_str, '=');
-			smart_string_append_long(&env_str, ls->sock);
+
+			p += sprintf(env_value + p + socket_set_buf, "%s%s=%s", (p && !socket_set_buf) ? "," : "", ls->key, fd);
+			p += socket_set_buf;
 		}
 
 		if (which == FPM_CLEANUP_PARENT_EXIT_MAIN) {
@@ -87,15 +102,14 @@ static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */
 		free(ls->key);
 	}
 
-	if (env_str.c) {
-		smart_string_appendc(&env_str, '\0');
+	if (env_value) {
 		for (i = 0; i < socket_set_count; i++) {
 			fpm_sockets_get_env_name(envname, sizeof(envname), i);
-			setenv(envname, env_str.c + socket_set[i], 1);
+			setenv(envname, env_value + socket_set[i], 1);
 		}
 		fpm_sockets_get_env_name(envname, sizeof(envname), socket_set_count);
 		unsetenv(envname);
-		smart_string_free(&env_str);
+		free(env_value);
 	}
 
 	fpm_array_free(&sockets_list);
@@ -383,24 +397,24 @@ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /*
 static int fpm_socket_af_unix_listening_socket(struct fpm_worker_pool_s *wp) /* {{{ */
 {
 	struct sockaddr_un sa_un;
-    size_t socket_length = sizeof(sa_un.sun_path);
-    size_t address_length = strlen(wp->config->listen_address);
+	size_t socket_length = sizeof(sa_un.sun_path);
+	size_t address_length = strlen(wp->config->listen_address);
 
 	memset(&sa_un, 0, sizeof(sa_un));
 	strlcpy(sa_un.sun_path, wp->config->listen_address, socket_length);
 
-    if (address_length >= socket_length) {
-        zlog(
-            ZLOG_WARNING,
-            "[pool %s] cannot bind to UNIX socket '%s' as path is too long (found length: %zu, "
+	if (address_length >= socket_length) {
+		zlog(
+				ZLOG_WARNING,
+				"[pool %s] cannot bind to UNIX socket '%s' as path is too long (found length: %zu, "
 				"maximal length: %zu), trying cut socket path instead '%s'",
-            wp->config->name,
-			wp->config->listen_address,
-			address_length,
-			socket_length,
-			sa_un.sun_path
-        );
-    }
+				wp->config->name,
+				wp->config->listen_address,
+				address_length,
+				socket_length,
+				sa_un.sun_path
+		);
+	}
 
 	sa_un.sun_family = AF_UNIX;
 	return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_un, sizeof(struct sockaddr_un));
@@ -499,7 +513,7 @@ int fpm_sockets_init_main(void)
 			return -1;
 		}
 
-	if (wp->listen_address_domain == FPM_AF_INET && fpm_socket_get_listening_queue(wp->listening_socket, NULL, &lq_len) >= 0) {
+		if (wp->listen_address_domain == FPM_AF_INET && fpm_socket_get_listening_queue(wp->listening_socket, NULL, &lq_len) >= 0) {
 			fpm_scoreboard_update(-1, -1, -1, (int)lq_len, -1, -1, 0, 0, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard);
 		}
 	}