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

Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Joakim Erdfelt 2011-08-22 15:17:43 -07:00
parent 5ef33386b7 6867dae4ee
commit 96d46df7da
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClient.java
View File

@ -83,6 +83,7 @@ public class WebSocketClient extends AggregateLifeCycle
private final List<String> _extensions=new CopyOnWriteArrayList<String>();
private int _bufferSize=64*1024;
private String _origin;
private String _protocol;
private int _maxIdleTime=-1;
@ -202,6 +203,24 @@ public class WebSocketClient extends AggregateLifeCycle
_protocol = protocol;
}
/* ------------------------------------------------------------ */
/** Get the origin of the client
* @return The clients Origin
*/
public String getOrigin()
{
return _origin;
}
/* ------------------------------------------------------------ */
/** Set the origin of the client
* @param origin the origin of the client (eg "http://example.com")
*/
public void setOrigin(String origin)
{
_origin = origin;
}
/* ------------------------------------------------------------ */
public Map<String,String> getCookies()
{
@ -455,7 +474,7 @@ public class WebSocketClient extends AggregateLifeCycle
"Upgrade: websocket\r\n"+
"Connection: Upgrade\r\n"+
"Sec-WebSocket-Key: "+_key+"\r\n"+
"Sec-WebSocket-Origin: http://example.com\r\n"+
(_origin==null?"":"Sec-WebSocket-Origin: "+_origin+"\r\n")+
"Sec-WebSocket-Version: "+WebSocketConnectionD10.VERSION+"\r\n";
if (holder.getProtocol()!=null)