From 24d06d76ddf0808ac370e39fd57329d3048d73e4 Mon Sep 17 00:00:00 2001
From: Guillermo Rauch <rauchg@gmail.com>
Date: Fri, 21 Nov 2014 04:59:14 +0100
Subject: [PATCH] Release 1.2.1

---
 History.md   | 7 +++++++
 package.json | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index 75792dba96..b1bab94a9f 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,11 @@
 
+1.2.1 / 2014-11-21
+==================
+
+ * fix protocol violations and improve error handling (GH-1880)
+ * package: bump `engine.io` for websocket leak fix [3rd-Eden]
+ * style tweaks
+
 1.2.0 / 2014-10-27
 ==================
 
diff --git a/package.json b/package.json
index bf48d919cf..a258126a51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "node.js realtime framework server",
   "keywords": [
     "realtime",
@@ -21,7 +21,7 @@
   "dependencies": {
     "engine.io": "1.4.3",
     "socket.io-parser": "2.2.2",
-    "socket.io-client": "1.2.0",
+    "socket.io-client": "1.2.1",
     "socket.io-adapter": "0.3.1",
     "has-binary-data": "0.1.3",
     "debug": "0.7.4"