-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Mark,
On 4/27/17 4:49 PM, ma...@apache.org wrote: > Author: markt Date: Thu Apr 27 20:49:32 2017 New Revision: 1792957 > > URL: http://svn.apache.org/viewvc?rev=1792957&view=rev Log: > Wildcard host names need quoting since '*' is a reserved character > in an ObjectName. > > Modified: > tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java > tomcat/trunk/webapps/docs/changelog.xml > > Modified: > tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Abstr actProtocol.java?rev=1792957&r1=1792956&r2=1792957&view=diff > > ======================================================================== ====== > --- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java > (original) +++ > tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Apr > 27 20:49:32 2017 @@ -552,13 +552,13 @@ public abstract class > AbstractProtocol<S > > for (SSLHostConfig sslHostConfig : > getEndpoint().findSslHostConfigs()) { ObjectName sslOname = new > ObjectName(domain + ":type=SSLHostConfig,ThreadPool=" + - > getName() + ",name=" + sslHostConfig.getHostName()); + > getName() + ",name=" + > ObjectName.quote(sslHostConfig.getHostName())); > Registry.getRegistry(null, null).registerComponent(sslHostConfig, > sslOname, null); sslOnames.add(sslOname); for > (SSLHostConfigCertificate sslHostConfigCert : > sslHostConfig.getCertificates()) { ObjectName sslCertOname = new > ObjectName(domain + ":type=SSLHostConfigCertificate,ThreadPool=" + > getName() + - ",Host=" + > sslHostConfig.getHostName() + + ",Host=" > + ObjectName.quote(sslHostConfig.getHostName()) + ",name=" + > sslHostConfigCert.getType()); Registry.getRegistry(null, > null).registerComponent( sslHostConfigCert, sslCertOname, null); > > Modified: tomcat/trunk/webapps/docs/changelog.xml URL: > http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?r ev=1792957&r1=1792956&r2=1792957&view=diff > > ======================================================================== ====== > --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ > tomcat/trunk/webapps/docs/changelog.xml Thu Apr 27 20:49:32 2017 @@ > -65,6 +65,12 @@ Avoid a <code>NullPointerException</code> when > reading attributes for a initialised HTTP connector where TLS is > enabled. (markt) </fix> + <fix> + If a wild card > <code>hostName</code> is configured for a + > <code>SSLHostConfig</code> element, quote the host name when using > it as + part of a JMX object name to avoid errors that > prevent the associated + TLS connector from starting. > (markt) + </fix> </changelog> </subsection> <subsection > name="Jasper"> We are always quoting, not just for wildcard hostnames. The "fix" implies that quoting only happens for wildcards. - -chris -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJZAlvHAAoJEBzwKT+lPKRYkTgQAKF+zcM4yN5niDaVWAUXsMcK mx8IYo/eYTtyv25tP634QjOEbL0uD0kbkTBEIW+ymmQxsKtPGShD/N1Ch38Epwfh MxJdQcdKDjHBGI8FP+8PcLTixydN5wpE4m7c6TMXcrUFrrG6fWr6gVmpfy5184IH V8k0T8JdS4RZjFgAfxnTFtuGcNoTEeds+8CbWm4i7U0dJc29p8HGF5xjWpNanRK1 DYR9NiA0reAgZA/0PES0ArsI1fL4k2mA+5YBTKDuOcNkQUJHKx7ElTHIjXz2ZC9Z PXvUDc0oFHJB9v6N0t0/DIGJ3EMrHDsw5VJ5Ln//GSq1FJby93T889RkEcc4TxZf 1a4hpk9tq+QjrmH1dmcYswhNYC877iA9Ae+HLJTE0wxf6Enby4bUZjcB4iv33Srz CCVm2s7Ut+z/o5uhlqJwOo9EeHjtntuW1Ga7ByJGtfZEXqZsIOth2lyfUdNMYHEr 59z0ySMrz1glzP5euZ6TZVVGQLo7W5tuU/gjENMu8Kdrk6xGwrRyA7tW/Uc6apMK v510rzFIF7C/12rYT1sz02XN6w7dV6Kqsj1e2yjNh71+LjcD598WQVve1/PYOk0E L/rEPucBBj+RHNDwHPWcmTPmR1W3cCO9MchjTh7sMcwZ63OqIAh9Ff3g/oLSRLdm 7rEaBviPpbQwwlUctzXx =ZV1K -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
