Author: markt
Date: Fri Feb 5 13:42:54 2016
New Revision: 1728665
URL: http://svn.apache.org/viewvc?rev=1728665&view=rev
Log:
Move i18n resources along with the code that was already moved.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1728665&r1=1728664&r2=1728665&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties Fri Feb
5 13:42:54 2016
@@ -27,7 +27,6 @@ http11processor.request.finish=Error fin
http11processor.response.finish=Error finishing response
http11processor.socket.info=Exception getting socket information
http11processor.socket.ssl=Exception getting SSL attributes
-http11processor.socket.sslreneg=Exception re-negotiating SSL connection
http11processor.sendfile.error=Error sending data using sendfile. May be
caused by invalid request attributes for start/end points
iib.available.readFail=A non-blocking read failed while attempting to
determine if data was available
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1728665&r1=1728664&r2=1728665&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Fri
Feb 5 13:42:54 2016
@@ -111,6 +111,8 @@ channel.nio.ssl.sniHostName=The SNI host
sniExtractor.clientHelloTooBig=The ClientHello was not presented in a single
TLS record so no SNI information could be extracted
socket.closed=The socket associated with this connection has been closed.
+socket.sslreneg=Exception re-negotiating SSL connection
+
socket.apr.clientAbort=The client aborted the connection.
socket.apr.read.error=Unexpected error [{0}] reading data from the APR/native
socket [{1}] with wrapper [{2}].
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1728665&r1=1728664&r2=1728665&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Feb 5
13:42:54 2016
@@ -1606,7 +1606,7 @@ public class Nio2Endpoint extends Abstra
sslChannel.rehandshake();
((JSSESupport) sslSupport).setSession(engine.getSession());
} catch (IOException ioe) {
- log.warn(sm.getString("http11processor.socket.sslreneg"),
ioe);
+ log.warn(sm.getString("socket.sslreneg"), ioe);
}
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1728665&r1=1728664&r2=1728665&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Feb 5
13:42:54 2016
@@ -1419,7 +1419,7 @@ public class NioEndpoint extends Abstrac
sslChannel.rehandshake(getEndpoint().getSoTimeout());
((JSSESupport) sslSupport).setSession(engine.getSession());
} catch (IOException ioe) {
-
log.warn(sm.getString("http11processor.socket.sslreneg",ioe));
+ log.warn(sm.getString("socket.sslreneg",ioe));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
