Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

313336 secure websockets 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1826 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-05-20 09:48:12 +00:00
parent 811a5f9b57
commit 9f0592acbe
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlProcessor.java
View File

@ -657,18 +657,21 @@ public class WebXmlProcessor
}
// set the JSP log
try
if (_hasJSP)
{
Class<?> logFactory = Loader.loadClass(this.getClass(),"org.eclipse.jetty.jsp.JettyLog");
Method init = logFactory.getMethod("init");
Log.debug("Init JSP loggging "+init);
init.invoke(null);
try
{
Class<?> logFactory = Loader.loadClass(this.getClass(),"org.eclipse.jetty.jsp.JettyLog");
Method init = logFactory.getMethod("init");
Log.debug("Init JSP loggging "+init);
init.invoke(null);
}
catch (Exception e)
{
Log.warn(e.toString());
Log.ignore(e);
}
}
catch (Exception e)
{
Log.warn(e.toString());
Log.ignore(e);
}
if (holder.getInitParameter("scratchdir") == null)
{

2
test-jetty-webapp/src/main/webapp/ws/index.html
View File

@ -14,7 +14,7 @@
var room = {
join: function(name) {
this._username=name;
var location = document.location.toString().replace('http:','ws:');
var location = document.location.toString().replace('http://','ws://').replace('https://','wss://');
this._ws=new WebSocket(location);
this._ws.onopen=this._onopen;
this._ws.onmessage=this._onmessage;