Merge pull request #23289 from Yoast/tracking-server-software

enricobattocchi · web-flow · commit f57df8a2a5d7 · 2026-05-28T09:20:33.000+02:00
feat(tracking): include the web-server family in server data
diff --git a/admin/tracking/class-tracking-server-data.php b/admin/tracking/class-tracking-server-data.php
@@ -36,10 +36,11 @@ protected function get_server_data() {
 			$server_data['Hostname'] = gethostbyaddr( $ipaddress );
 		}
 
-		$server_data['os']            = function_exists( 'php_uname' ) ? php_uname() : PHP_OS;
-		$server_data['PhpVersion']    = PHP_VERSION;
-		$server_data['CurlVersion']   = $this->get_curl_info();
-		$server_data['PhpExtensions'] = $this->get_php_extensions();
+		$server_data['os']             = function_exists( 'php_uname' ) ? php_uname() : PHP_OS;
+		$server_data['PhpVersion']     = PHP_VERSION;
+		$server_data['CurlVersion']    = $this->get_curl_info();
+		$server_data['PhpExtensions']  = $this->get_php_extensions();
+		$server_data['ServerSoftware'] = isset( $_SERVER['SERVER_SOFTWARE'] ) ? sanitize_text_field( wp_unslash( $_SERVER['SERVER_SOFTWARE'] ) ) : '';
 
 		return $server_data;
 	}

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,11 @@ protected function get_server_data() {`
`36`	`36`	`$server_data['Hostname'] = gethostbyaddr( $ipaddress );`
`37`	`37`	`}`
`38`	`38`
`39`		`- $server_data['os'] = function_exists( 'php_uname' ) ? php_uname() : PHP_OS;`
`40`		`- $server_data['PhpVersion'] = PHP_VERSION;`
`41`		`- $server_data['CurlVersion'] = $this->get_curl_info();`
`42`		`- $server_data['PhpExtensions'] = $this->get_php_extensions();`
	`39`	`+ $server_data['os'] = function_exists( 'php_uname' ) ? php_uname() : PHP_OS;`
	`40`	`+ $server_data['PhpVersion'] = PHP_VERSION;`
	`41`	`+ $server_data['CurlVersion'] = $this->get_curl_info();`
	`42`	`+ $server_data['PhpExtensions'] = $this->get_php_extensions();`
	`43`	`+ $server_data['ServerSoftware'] = isset( $_SERVER['SERVER_SOFTWARE'] ) ? sanitize_text_field( wp_unslash( $_SERVER['SERVER_SOFTWARE'] ) ) : '';`
`43`	`44`
`44`	`45`	`return $server_data;`
`45`	`46`	`}`