Author: schultz
Date: Tue Apr 15 21:19:45 2014
New Revision: 1587734
URL: http://svn.apache.org/r1587734
Log:
Back-ported r1587723 to fix objections to the original r1587379 patch.
Removed inconsistent and confusing langauge from FIPSMode configuration.
Added changelog.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props
changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/tc7/
(props changed)
tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/ (props
changed)
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1587723
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1587723
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/codec:r1587723
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:r1587723
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1587734&r1=1587733&r2=1587734&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 15 21:19:45 2014
@@ -67,6 +67,10 @@
7's but it is still buggy. (markt)
</fix>
<fix>
+ <bug>56027</bug>: Add more nuanced options for managing FIPS mode in
the
+ AprLifecycleListener. (schultz)
+ </fix>
+ <fix>
<bug>56321</bug>: When a WAR is modified, undeploy the web application
before deleting any expanded directory as the undeploy process may
refer to classes that need to be loaded from the expanded directory. If
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml?rev=1587734&r1=1587733&r2=1587734&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml Tue Apr 15 21:19:45
2014
@@ -121,11 +121,6 @@
mode).
FIPS mode <em>requires you to have a FIPS-capable OpenSSL library which
you must build yourself</em>.
- <code>FIPSMode="on"</code> or <code>FIPSMode="require"</code> requires
- Tomcat native library version 1.1.30 or later, while
- <code>FIPSMode="enter"</code> can probably be done with Tomcat native
- library version 1.2.23 or later -- either of which <em>must be built
- against the FIPS-compatible OpenSSL</em> library.
If this attribute is set to any of the above values, <b>SSLEngine</b>
must be enabled as well for any effect.
The default value is <code>off</code>.</p>
Propchange: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/tc7/
------------------------------------------------------------------------------
Merged /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/tc7:r1587723
Propchange: tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/
------------------------------------------------------------------------------
Merged /tomcat/trunk/webapps/examples/websocket-deprecated:r1587723
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
