Permalink
Browse files

Merge branch 'master' into dev

  • Loading branch information...
majek committed Jan 19, 2012
2 parents 52a8214 + 645dcb8 commit 5cc2f62c727651b037b12d9d2a07d36ef9621f03
Showing with 10 additions and 10 deletions.
  1. +3 −3 Changelog
  2. +3 −3 README.md
  3. +1 −1 examples/echo/index.html
  4. +1 −1 examples/echo/server.js
  5. +1 −1 package.json
  6. +1 −1 src/sockjs.coffee
View
@@ -1,8 +1,8 @@
dev
===
0.2.0
=====
* #36, #3 - Replace a custom WebSocket server implementation
with faye-websocket-node.
with faye-websocket-node.
* Multiple changes to support SockJS-protocol 0.2.
* The session is now closed on network errors immediately
(instead of waiting 5 seconds)
View
@@ -23,7 +23,7 @@ An simplified echo SockJS server could look more or less like:
var http = require('http');
var sockjs = require('sockjs');
var sockjs_opts = {sockjs_url: "http://cdn.sockjs.org/sockjs-0.1.min.js"};
var sockjs_opts = {sockjs_url: "http://cdn.sockjs.org/sockjs-0.2.min.js"};
var echo = sockjs.createServer(sockjs_opts);
echo.on('connection', function(conn) {
@@ -90,7 +90,7 @@ Where `options` is a hash which can contain:
domain local to the SockJS server. This iframe also does need to
load SockJS javascript client library, and this option lets you specify
its url (if you're unsure, point it to
<a href="http://cdn.sockjs.org/sockjs-0.1.min.js">
<a href="http://cdn.sockjs.org/sockjs-0.2.min.js">
the latest minified SockJS client release</a>, this is the default).
You must explicitly specify this url on the server side for security
reasons - we don't want the possibility of running any foreign
@@ -346,7 +346,7 @@ To run it run something like:
cd sockjs-protocol
make test_deps
./venv/bin/python sockjs-protocol-0.1.py
./venv/bin/python sockjs-protocol-0.2.py
For details see
[SockJS-protocol README](https://github.com/sockjs/sockjs-protocol#readme).
View
@@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js">
</script>
<script src="http://cdn.sockjs.org/sockjs-0.1.min.js">
<script src="http://cdn.sockjs.org/sockjs-0.2.min.js">
</script>
<style>
.box {
View
@@ -3,7 +3,7 @@ var sockjs = require('sockjs');
var node_static = require('node-static');
// 1. Echo sockjs server
var sockjs_opts = {sockjs_url: "http://cdn.sockjs.org/sockjs-0.1.min.js"};
var sockjs_opts = {sockjs_url: "http://cdn.sockjs.org/sockjs-0.2.min.js"};
var sockjs_echo = sockjs.createServer(sockjs_opts);
sockjs_echo.on('connection', function(conn) {
View
@@ -1,7 +1,7 @@
{
"name": "sockjs",
"author": "Marek Majkowski",
"version": "0.1.2",
"version": "0.2.0",
"repository": {"type": "git",
"url": "https://github.com/sockjs/sockjs-node.git"},
"dependencies": {
View
@@ -132,7 +132,7 @@ class Server extends events.EventEmitter
heartbeat_delay: 25000
disconnect_delay: 5000
log: (severity, line) -> console.log(line)
sockjs_url: 'http://cdn.sockjs.org/sockjs-0.1.min.js'
sockjs_url: 'http://cdn.sockjs.org/sockjs-0.2.min.js'
if user_options
utils.objectExtend(@options, user_options)

0 comments on commit 5cc2f62

Please sign in to comment.