remove unused file; remove async-resposne; update history

http-kit · Mar 28, 2013 · 4a1ef09 · 4a1ef09
1 parent ca6e6c9
commit 4a1ef09
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 361 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Current [semantic](http://semver.org/) version: `[http-kit "2.0.0-RC4"]`.
 
 ### Hack locally
 
-Hacker friendly: only ~3k lines of code (including java), clean and tidy.
+Hacker friendly: Written from ground-up, only ~3k lines of code (including java), clean and tidy.
 
 ```sh
 # modify as you want, unit tests back you up

diff --git a/README_CN.md b/README_CN.md
diff --git a/history.md b/history.md
@@ -47,3 +47,9 @@ HTTP server:
 
 ### 2.0-rc2 (2013/2/9)
    1. fix a possible CPU 100% usage
+
+### 2.0-0 (2013/3/28)
+   1. Unify WebSocket and HTTP long polling/streaming with Channel protocol and with-channel (API breaks with the RC)
+   2. WebSocket support sending and receiving binary frame
+   3. Support HTTP streaming
+   4. Fix few issues with WebSocket
diff --git a/snippets_zh.clj b/snippets_zh.clj
diff --git a/src/org/httpkit/server.clj b/src/org/httpkit/server.clj
@@ -131,9 +131,3 @@
          {:status 400 :body "Bad Sec-WebSocket-Key header"})
        (do ~@body
            {:body ~ch-name}))))
-
-(defmacro async-response "DEPRECATED"
-  [request callback-name & body]
-  `(with-channel ~request ch#
-     (let [~callback-name (fn [data#] (send! ch# data# true))]
-       ~@body)))
diff --git a/test/wsbench.go → test/go/wsbench.go b/test/wsbench.go → test/go/wsbench.go
@@ -11,8 +11,8 @@ import (
 )
 
 const (
-	origin = "http://localhost:9899/"
-	wsurl  = "ws://localhost:9899/test"
+	origin = "http://localhost:9090/"
+	wsurl  = "ws://localhost:9090/ws"
 )
 
 var concurrency = flag.Int("c", 100, "concurrency")

diff --git a/test/wstest.go → test/go/wstest.go b/test/wstest.go → test/go/wstest.go