Release 1.2.0

rauchg · rauchg · commit 4a0091b25ad5 · 2014-10-27T15:54:57.000-07:00
diff --git a/History.md b/History.md
@@ -1,4 +1,19 @@
 
+1.2.0 / 2014-10-27
+==================
+
+ * package: bump `engine.io`
+ * downloads badge
+ * add test to check that empty rooms are autopruned
+ * added Server#origins(v:Function) description for dynamic CORS
+ * added test coverage for Server#origins(function) for dynamic CORS
+ * added optional Server#origins(function) for dynamic CORS
+ * fix usage example for Server#close
+ * package: fix main file for example application 'chat'
+ * package: bump `socket.io-parser`
+ * update README http ctor to createServer()
+ * bump adapter with a lot of fixes for room bookkeeping
+
 1.1.0 / 2014-09-04
 ==================
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "node.js realtime framework server",
   "keywords": [
     "realtime",
@@ -21,7 +21,7 @@
   "dependencies": {
     "engine.io": "1.4.2",
     "socket.io-parser": "2.2.2",
-    "socket.io-client": "Automattic/socket.io-client#e8e6da",
+    "socket.io-client": "1.2.0",
     "socket.io-adapter": "0.3.1",
     "has-binary-data": "0.1.3",
     "debug": "0.7.4"
