Author: schultz
Date: Wed Apr 25 19:51:17 2012
New Revision: 1330519
URL: http://svn.apache.org/viewvc?rev=1330519&view=rev
Log:
Back-port for "Add APR version number to tcnative version INFO log message".
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1311997
Merged /tomcat/tc7.0.x/trunk:r1311997
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1330519&r1=1330518&r2=1330519&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 25 19:51:17 2012
@@ -189,12 +189,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko, kfujino
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53056
- Add APR version number to tcnative version INFO log message
- http://svn.apache.org/viewvc?view=revision&revision=1311997
- +1: schultz, kkolinko, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53057
Add OpenSSL version number INFO log message
http://svn.apache.org/viewvc?view=revision&revision=1312007
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1330519&r1=1330518&r2=1330519&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Wed Apr 25 19:51:17 2012
@@ -224,7 +224,10 @@ public class AprLifecycleListener
}
if (!log.isDebugEnabled()) {
log.info(sm.getString("aprListener.tcnValid", major + "."
- + minor + "." + patch));
+ + minor + "." + patch,
+ Library.APR_MAJOR_VERSION + "."
+ + Library.APR_MINOR_VERSION + "."
+ + Library.APR_PATCH_VERSION));
}
else {
log.debug(sm.getString("aprListener.tcnValid", major + "."
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1330519&r1=1330518&r2=1330519&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Wed Apr 25 19:51:17 2012
@@ -40,7 +40,7 @@ aprListener.tcnInvalid=An incompatible v
aprListener.tcnVersion=An older version {0} of the APR based Apache Tomcat
Native library is installed, while Tomcat recommends version greater than {1}
aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native
library
aprListener.sslInit=Failed to initialize the SSLEngine.
-aprListener.tcnValid=Loaded APR based Apache Tomcat Native library {0}.
+aprListener.tcnValid=Loaded APR based Apache Tomcat Native library {0} using
APR version {1}.
aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters
[{2}], random [{3}].
aprListener.initializingFIPS=Initializing FIPS mode...
aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1330519&r1=1330518&r2=1330519&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
Wed Apr 25 19:51:17 2012
@@ -35,7 +35,7 @@ aprListener.tcnInvalid = Se encuentra in
aprListener.tcnVersion = Se encuentra instalada una versi\u00f3n muy vieja {0}
de la biblioteca nativa APR de Apache Tomcat, mientras que Tomcat recomienda
una versi\u00f3n mayor de {1}
aprListener.aprDestroy = No pude apagar la biblioteca nativa de Apache Tomcat
aprListener.sslInit = No pude inicializar el SSLEngine (Motor SSL)
-aprListener.tcnValid = Cargada la biblioteca nativa APR de Apache Tomcat {0}
+aprListener.tcnValid = Cargada la biblioteca nativa APR de Apache Tomcat {0}
con la versión APR {1}.
aprListener.flags = Capacidades APR\: IPv6 [{0}], enviar fichero [{1}],
aceptar filtros [{2}], aleatorio [{3}].
containerBase.addDefaultMapper = Excepci\u00f3n configurando mapeador por
defecto de clase {0}
containerBase.alreadyStarted = Ya ha sido arrancado el Contenedor {0}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1330519&r1=1330518&r2=1330519&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 25 19:51:17 2012
@@ -113,6 +113,10 @@
<bug>52719</bug>: Fix a theoretical resource leak in the JAR validation
that checks for non-permitted classes in web application JARs. (markt)
</fix>
+ <fix>
+ <bug>53056</bug>: Add APR version number to tcnative version INFO log
+ message. (schultz)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
