Author: markt
Date: Wed Jun 6 18:47:00 2012
New Revision: 1347048
URL: http://svn.apache.org/viewvc?rev=1347048&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53368
Make WebSocket play nicely with a security manager (kkolinko)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/conf/catalina.policy
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1347047
Modified: tomcat/tc7.0.x/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.policy?rev=1347048&r1=1347047&r2=1347048&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc7.0.x/trunk/conf/catalina.policy Wed Jun 6 18:47:00 2012
@@ -188,6 +188,9 @@ grant {
// Applications using Comet need to be able to access this package
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.comet";
+
+ // Applications using WebSocket need to be able to access this package
+ permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.websocket";
};
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=1347048&r1=1347047&r2=1347048&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 6 18:47:00 2012
@@ -220,6 +220,11 @@
<bug>53366</bug>: Ensure new HTTP header parser works correctly when
running Tomcat under a security manager. (markt/kkolinko)
</fix>
+ <fix>
+ <bug>53368</bug>: Configure the default security policy to allow web
+ applications to use WebSocket when running under a security manager.
+ (markt/kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
