You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/03/31 10:54:36 UTC
svn commit: r1737200 - in /tomcat/tc8.5.x/trunk: ./ conf/server.xml
Author: markt
Date: Thu Mar 31 08:54:36 2016
New Revision: 1737200
URL: http://svn.apache.org/viewvc?rev=1737200&view=rev
Log:
Align with file name patterns used elsewhere
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/conf/server.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 31 08:54:36 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120
Modified: tomcat/tc8.5.x/trunk/conf/server.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/conf/server.xml?rev=1737200&r1=1737199&r2=1737200&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/conf/server.xml (original)
+++ tomcat/tc8.5.x/trunk/conf/server.xml Thu Mar 31 08:54:36 2016
@@ -84,7 +84,7 @@
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true">
<SSLHostConfig>
- <Certificate certificateKeystoreFile="conf/keystore-rsa.pem"
+ <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
</SSLHostConfig>
</Connector>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org