Use weak function for fcgi_log

laruence · laruence · commit 86de98cabada · 2015-05-23T19:19:48.000+08:00
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
@@ -240,6 +240,7 @@ char *alloca();
 
 #if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__))
 # define HAVE_NORETURN_ALIAS
+# define HAVE_ATTRIBUTE_WEAK
 #endif
 
 #if ZEND_DEBUG
diff --git a/main/fastcgi.c b/main/fastcgi.c
@@ -133,7 +133,9 @@ static int is_impersonate = 0;
 #include "fastcgi.h"
 
 /* maybe it's better to use weak name instead */
-static fcgi_logger logger;
+#ifndef HAVE_ATTRIBUTE_WEAK
+static fcgi_logger fcgi_log;
+#endif
 
 typedef union _sa_t {
 	struct sockaddr     sa;
@@ -360,9 +362,19 @@ void fcgi_terminate(void)
 	in_shutdown = 1;
 }
 
+#ifndef HAVE_ATTRIBUTE_WEAK
 void fcgi_set_logger(fcgi_logger lg) {
-	logger = lg;
+	fcgi_log = lg;
 }
+#else
+void __attribute__((weak)) fcgi_log(int type, const char *format, ...) {
+	va_list ap;
+
+	va_start(ap, format);
+	vfprintf(stderr, format, ap);
+	va_end(ap);
+}
+#endif
 
 int fcgi_init(void)
 {
@@ -583,10 +595,10 @@ int fcgi_listen(const char *path, int backlog)
 					hep = gethostbyname(host);
 				}
 				if (!hep || hep->h_addrtype != AF_INET || !hep->h_addr_list[0]) {
-					logger(FCGI_ERROR, "Cannot resolve host name '%s'!\n", host);
+					fcgi_log(FCGI_ERROR, "Cannot resolve host name '%s'!\n", host);
 					return -1;
 				} else if (hep->h_addr_list[1]) {
-					logger(FCGI_ERROR, "Host '%s' has multiple addresses. You must choose one explicitly!\n", host);
+					fcgi_log(FCGI_ERROR, "Host '%s' has multiple addresses. You must choose one explicitly!\n", host);
 					return -1;
 				}
 				sa.sa_inet.sin_addr.s_addr = ((struct in_addr*)hep->h_addr_list[0])->s_addr;
@@ -623,7 +635,7 @@ int fcgi_listen(const char *path, int backlog)
 		int path_len = strlen(path);
 
 		if (path_len >= sizeof(sa.sa_unix.sun_path)) {
-			logger(FCGI_ERROR, "Listening socket's path name is too long.\n");
+			fcgi_log(FCGI_ERROR, "Listening socket's path name is too long.\n");
 			return -1;
 		}
 
@@ -646,7 +658,7 @@ int fcgi_listen(const char *path, int backlog)
 	    bind(listen_socket, (struct sockaddr *) &sa, sock_len) < 0 ||
 	    listen(listen_socket, backlog) < 0) {
 
-		logger(FCGI_ERROR, "Cannot bind/listen socket - [%d] %s.\n",errno, strerror(errno));
+		fcgi_log(FCGI_ERROR, "Cannot bind/listen socket - [%d] %s.\n",errno, strerror(errno));
 		return -1;
 	}
 
@@ -683,14 +695,14 @@ int fcgi_listen(const char *path, int backlog)
 					n++;
 #endif
 				} else {
-					logger(FCGI_ERROR, "Wrong IP address '%s' in listen.allowed_clients", cur);
+					fcgi_log(FCGI_ERROR, "Wrong IP address '%s' in listen.allowed_clients", cur);
 				}
 				cur = end;
 			}
 			allowed_clients[n].sa.sa_family = 0;
 			free(ip);
 			if (!n) {
-				logger(FCGI_ERROR, "There are no allowed addresses");
+				fcgi_log(FCGI_ERROR, "There are no allowed addresses");
 				/* don't clear allowed_clients as it will create an "open for all" security issue */
 			}
 		}
@@ -743,14 +755,14 @@ void fcgi_set_allowed_clients(char *ip)
 				n++;
 #endif
 			} else {
-				logger(FCGI_ERROR, "Wrong IP address '%s' in listen.allowed_clients", cur);
+				fcgi_log(FCGI_ERROR, "Wrong IP address '%s' in listen.allowed_clients", cur);
 			}
 			cur = end;
 		}
 		allowed_clients[n].sa.sa_family = 0;
 		free(ip);
 		if (!n) {
-			logger(FCGI_ERROR, "There are no allowed addresses");
+			fcgi_log(FCGI_ERROR, "There are no allowed addresses");
 			/* don't clear allowed_clients as it will create an "open for all" security issue */
 		}
 	}
@@ -1222,7 +1234,7 @@ static int fcgi_is_allowed() {
 	}
 #endif
 
-	logger(FCGI_ERROR, "Connection disallowed: IP address '%s' has been dropped.", fcgi_get_last_client_ip());
+	fcgi_log(FCGI_ERROR, "Connection disallowed: IP address '%s' has been dropped.", fcgi_get_last_client_ip());
 	return 0;
 }
 
@@ -1337,7 +1349,7 @@ int fcgi_accept_request(fcgi_request *req)
 						}
 						fcgi_close(req, 1, 0);
 					} else {
-						logger(FCGI_ERROR, "Too many open file descriptors. FD_SETSIZE limit exceeded.");
+						fcgi_log(FCGI_ERROR, "Too many open file descriptors. FD_SETSIZE limit exceeded.");
 						fcgi_close(req, 1, 0);
 					}
 #endif
diff --git a/main/fastcgi.h b/main/fastcgi.h
@@ -118,8 +118,6 @@ typedef struct _fcgi_end_request_rec {
 
 typedef void (*fcgi_apply_func)(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg);
 
-typedef void (*fcgi_logger)(int type, const char *fmt, ...);
-
 #define FCGI_HASH_TABLE_SIZE 128
 #define FCGI_HASH_TABLE_MASK (FCGI_HASH_TABLE_SIZE - 1)
 #define FCGI_HASH_SEG_SIZE   4096
@@ -200,10 +198,14 @@ fcgi_request* fcgi_init_request(fcgi_request *request, int listen_socket);
 void fcgi_set_allowed_clients(char *ip);
 int fcgi_accept_request(fcgi_request *req);
 int fcgi_finish_request(fcgi_request *req, int force_close);
-void fcgi_set_logger(fcgi_logger lg);
 const char *fcgi_get_last_client_ip();
 void fcgi_set_in_shutdown(int new_value);
 
+#ifndef HAVE_ATTRIBUTE_WEAK
+typedef void (*fcgi_logger)(int type, const char *fmt, ...);
+void fcgi_set_logger(fcgi_logger lg);
+#endif
+
 char* fcgi_getenv(fcgi_request *req, const char* var, int var_len);
 char* fcgi_putenv(fcgi_request *req, char* var, int var_len, char* val);
 char* fcgi_quick_getenv(fcgi_request *req, const char* var, int var_len, unsigned int hash_value);
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
@@ -219,13 +219,15 @@ static php_cgi_globals_struct php_cgi_globals;
 #define TRANSLATE_SLASHES(path)
 #endif
 
+#ifndef HAVE_ATTRIBUTE_WEAK
 static void fcgi_log(int type, const char *format, ...) {
 	va_list ap;
 
 	va_start(ap, format);
 	vfprintf(stderr, format, ap);
 	va_end(ap);
 }
+#endif
 
 static int print_module_info(zval *element)
 {
@@ -1936,7 +1938,10 @@ consult the installation file that came with this distribution, or visit \n\
 		}
 	}
 
+#ifndef HAVE_ATTRIBUTE_WEAK
 	fcgi_set_logger(fcgi_log);
+#endif
+
 	if (bindpath) {
 		int backlog = 128;
 		if (getenv("PHP_FCGI_BACKLOG")) {
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
@@ -457,7 +457,11 @@ static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers) /* {{{ */
 # define STDIN_FILENO 0
 #endif
 
+#ifndef HAVE_ATTRIBUTE_WEAK
 static void fpm_fcgi_log(int type, const char *fmt, ...) /* {{{ */
+#else
+void fcgi_log(int type, const char *fmt, ...)
+#endif
 {
 	va_list args;
 	va_start(args, fmt);
@@ -1586,7 +1590,10 @@ int main(int argc, char *argv[])
 	cgi_sapi_module.php_ini_path_override = NULL;
 	cgi_sapi_module.php_ini_ignore_cwd = 1;
 
+#ifndef HAVE_ATTRIBUTE_WEAK
 	fcgi_set_logger(fpm_fcgi_log);
+#endif
+
 	fcgi_init();
 
 #ifdef PHP_WIN32

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,9 @@ static int is_impersonate = 0;`
`133`	`133`	`#include "fastcgi.h"`
`134`	`134`
`135`	`135`	`/* maybe it's better to use weak name instead */`
`136`		`-static fcgi_logger logger;`
	`136`	`+#ifndef HAVE_ATTRIBUTE_WEAK`
	`137`	`+static fcgi_logger fcgi_log;`
	`138`	`+#endif`
`137`	`139`
`138`	`140`	`typedef union _sa_t {`
`139`	`141`	`struct sockaddr sa;`
`@@ -360,9 +362,19 @@ void fcgi_terminate(void)`
`360`	`362`	`in_shutdown = 1;`
`361`	`363`	`}`
`362`	`364`
	`365`	`+#ifndef HAVE_ATTRIBUTE_WEAK`
`363`	`366`	`void fcgi_set_logger(fcgi_logger lg) {`
`364`		`- logger = lg;`
	`367`	`+ fcgi_log = lg;`
`365`	`368`	`}`
	`369`	`+#else`
	`370`	`+void __attribute__((weak)) fcgi_log(int type, const char *format, ...) {`
	`371`	`+ va_list ap;`
	`372`	`+`
	`373`	`+ va_start(ap, format);`
	`374`	`+ vfprintf(stderr, format, ap);`
	`375`	`+ va_end(ap);`
	`376`	`+}`
	`377`	`+#endif`
`366`	`378`
`367`	`379`	`int fcgi_init(void)`
`368`	`380`	`{`
`@@ -583,10 +595,10 @@ int fcgi_listen(const char *path, int backlog)`
`583`	`595`	`hep = gethostbyname(host);`
`584`	`596`	`}`
`585`	`597`	`if (!hep \|\| hep->h_addrtype != AF_INET \|\| !hep->h_addr_list[0]) {`
`586`		`- logger(FCGI_ERROR, "Cannot resolve host name '%s'!\n", host);`
	`598`	`+ fcgi_log(FCGI_ERROR, "Cannot resolve host name '%s'!\n", host);`
`587`	`599`	`return -1;`
`588`	`600`	`} else if (hep->h_addr_list[1]) {`
`589`		`- logger(FCGI_ERROR, "Host '%s' has multiple addresses. You must choose one explicitly!\n", host);`
	`601`	`+ fcgi_log(FCGI_ERROR, "Host '%s' has multiple addresses. You must choose one explicitly!\n", host);`
`590`	`602`	`return -1;`
`591`	`603`	`}`
`592`	`604`	`sa.sa_inet.sin_addr.s_addr = ((struct in_addr*)hep->h_addr_list[0])->s_addr;`
`@@ -623,7 +635,7 @@ int fcgi_listen(const char *path, int backlog)`
`623`	`635`	`int path_len = strlen(path);`
`624`	`636`
`625`	`637`	`if (path_len >= sizeof(sa.sa_unix.sun_path)) {`
`626`		`- logger(FCGI_ERROR, "Listening socket's path name is too long.\n");`
	`638`	`+ fcgi_log(FCGI_ERROR, "Listening socket's path name is too long.\n");`
`627`	`639`	`return -1;`
`628`	`640`	`}`
`629`	`641`
`@@ -646,7 +658,7 @@ int fcgi_listen(const char *path, int backlog)`
`646`	`658`	`bind(listen_socket, (struct sockaddr *) &sa, sock_len) < 0 \|\|`
`647`	`659`	`listen(listen_socket, backlog) < 0) {`
`648`	`660`
`649`		`- logger(FCGI_ERROR, "Cannot bind/listen socket - [%d] %s.\n",errno, strerror(errno));`
	`661`	`+ fcgi_log(FCGI_ERROR, "Cannot bind/listen socket - [%d] %s.\n",errno, strerror(errno));`
`650`	`662`	`return -1;`
`651`	`663`	`}`
`652`	`664`
`@@ -683,14 +695,14 @@ int fcgi_listen(const char *path, int backlog)`
`683`	`695`	`n++;`
`684`	`696`	`#endif`
`685`	`697`	`} else {`
`686`		`- logger(FCGI_ERROR, "Wrong IP address '%s' in listen.allowed_clients", cur);`
	`698`	`+ fcgi_log(FCGI_ERROR, "Wrong IP address '%s' in listen.allowed_clients", cur);`
`687`	`699`	`}`
`688`	`700`	`cur = end;`
`689`	`701`	`}`
`690`	`702`	`allowed_clients[n].sa.sa_family = 0;`
`691`	`703`	`free(ip);`
`692`	`704`	`if (!n) {`
`693`		`- logger(FCGI_ERROR, "There are no allowed addresses");`
	`705`	`+ fcgi_log(FCGI_ERROR, "There are no allowed addresses");`
`694`	`706`	`/* don't clear allowed_clients as it will create an "open for all" security issue */`
`695`	`707`	`}`
`696`	`708`	`}`
`@@ -743,14 +755,14 @@ void fcgi_set_allowed_clients(char *ip)`
`743`	`755`	`n++;`
`744`	`756`	`#endif`
`745`	`757`	`} else {`
`746`		`- logger(FCGI_ERROR, "Wrong IP address '%s' in listen.allowed_clients", cur);`
	`758`	`+ fcgi_log(FCGI_ERROR, "Wrong IP address '%s' in listen.allowed_clients", cur);`
`747`	`759`	`}`
`748`	`760`	`cur = end;`
`749`	`761`	`}`
`750`	`762`	`allowed_clients[n].sa.sa_family = 0;`
`751`	`763`	`free(ip);`
`752`	`764`	`if (!n) {`
`753`		`- logger(FCGI_ERROR, "There are no allowed addresses");`
	`765`	`+ fcgi_log(FCGI_ERROR, "There are no allowed addresses");`
`754`	`766`	`/* don't clear allowed_clients as it will create an "open for all" security issue */`
`755`	`767`	`}`
`756`	`768`	`}`
`@@ -1222,7 +1234,7 @@ static int fcgi_is_allowed() {`
`1222`	`1234`	`}`
`1223`	`1235`	`#endif`
`1224`	`1236`
`1225`		`- logger(FCGI_ERROR, "Connection disallowed: IP address '%s' has been dropped.", fcgi_get_last_client_ip());`
	`1237`	`+ fcgi_log(FCGI_ERROR, "Connection disallowed: IP address '%s' has been dropped.", fcgi_get_last_client_ip());`
`1226`	`1238`	`return 0;`
`1227`	`1239`	`}`
`1228`	`1240`
`@@ -1337,7 +1349,7 @@ int fcgi_accept_request(fcgi_request *req)`
`1337`	`1349`	`}`
`1338`	`1350`	`fcgi_close(req, 1, 0);`
`1339`	`1351`	`} else {`
`1340`		`- logger(FCGI_ERROR, "Too many open file descriptors. FD_SETSIZE limit exceeded.");`
	`1352`	`+ fcgi_log(FCGI_ERROR, "Too many open file descriptors. FD_SETSIZE limit exceeded.");`
`1341`	`1353`	`fcgi_close(req, 1, 0);`
`1342`	`1354`	`}`
`1343`	`1355`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -219,13 +219,15 @@ static php_cgi_globals_struct php_cgi_globals;`
`219`	`219`	`#define TRANSLATE_SLASHES(path)`
`220`	`220`	`#endif`
`221`	`221`
	`222`	`+#ifndef HAVE_ATTRIBUTE_WEAK`
`222`	`223`	`static void fcgi_log(int type, const char *format, ...) {`
`223`	`224`	`va_list ap;`
`224`	`225`
`225`	`226`	`va_start(ap, format);`
`226`	`227`	`vfprintf(stderr, format, ap);`
`227`	`228`	`va_end(ap);`
`228`	`229`	`}`
	`230`	`+#endif`
`229`	`231`
`230`	`232`	`static int print_module_info(zval *element)`
`231`	`233`	`{`
`@@ -1936,7 +1938,10 @@ consult the installation file that came with this distribution, or visit \n\`
`1936`	`1938`	`}`
`1937`	`1939`	`}`
`1938`	`1940`
	`1941`	`+#ifndef HAVE_ATTRIBUTE_WEAK`
`1939`	`1942`	`fcgi_set_logger(fcgi_log);`
	`1943`	`+#endif`
	`1944`	`+`
`1940`	`1945`	`if (bindpath) {`
`1941`	`1946`	`int backlog = 128;`
`1942`	`1947`	`if (getenv("PHP_FCGI_BACKLOG")) {`