Use new http2 directive for Nginx versions >= 1.25.0

Author: ms217

server/conf/nginx_vhost.conf.master

@@ -17,7 +17,12 @@ server {
         listen [::]:<tmpl_var name='http_port'>;
 </tmpl_if>
 <tmpl_if name='ssl_enabled'>
+<tmpl_if name='http2_directive_compat_quirk' op='==' value='y'>
+        listen <tmpl_var name='ip_address'>:<tmpl_var name='https_port'> ssl;
+	http2 on;
+<tmpl_else>
         listen <tmpl_var name='ip_address'>:<tmpl_var name='https_port'> ssl http2;
+</tmpl_if>
 <tmpl_if name='use_proxy_protocol' op='==' value='y'>
 <tmpl_if name='proxy_protocol_https' op='>' value='0'>
         listen <tmpl_var name='ip_address'>:<tmpl_var name='proxy_protocol_https'> ssl http2 proxy_protocol;

server/plugins-available/nginx_plugin.inc.php

@@ -1622,6 +1622,12 @@ function update($event_name, $data) {
 			$vhost_data['tls13_supported'] = "y";
 		}
 
+		// Nginx >= 1.25.0 uses a dedicated directive to enable HTTP/2 support
+		if(version_compare($app->system->getnginxversion(true), '1.25.0', '>=')) {
+			$vhost_data['http2_directive_compat_quirk'] = "y";
+
+		}
+
 		$tpl->setVar($vhost_data);
 
 		$server_alias = array();