couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [32/50] mochiweb commit: updated refs/heads/1843-feature-bigcouch to 432c949
Date Thu, 17 Apr 2014 18:17:00 GMT
clean up trailing whitespace


Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/c8e3a523
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/c8e3a523
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/c8e3a523

Branch: refs/heads/1843-feature-bigcouch
Commit: c8e3a5235c75680085173d652ab8c6ad3a55a2a0
Parents: 7ba3196
Author: Bob Ippolito <bob@redivi.com>
Authored: Wed Dec 25 13:29:41 2013 -0800
Committer: Bob Ippolito <bob@redivi.com>
Committed: Wed Dec 25 13:29:41 2013 -0800

----------------------------------------------------------------------
 src/mochiweb_websocket.erl | 52 ++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/c8e3a523/src/mochiweb_websocket.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_websocket.erl b/src/mochiweb_websocket.erl
index 3ef5c5e..0092156 100644
--- a/src/mochiweb_websocket.erl
+++ b/src/mochiweb_websocket.erl
@@ -47,7 +47,7 @@ request(Socket, Body, State, WsVersion, ReplyChannel) ->
         {tcp, _, WsFrames} ->
             {M, F} = Body,
             case parse_frames(WsVersion, WsFrames, Socket) of
-                close -> 
+                close ->
                     mochiweb_socket:close(Socket),
                     exit(normal);
 
@@ -92,7 +92,7 @@ upgrade_connection(Req, Body) ->
             mochiweb_socket:close(Req:get(socket)),
             exit(normal)
     end.
-   
+
 make_handshake(Req) ->
     SecKey  = Req:get_header_value("sec-websocket-key"),
     Sec1Key = Req:get_header_value("Sec-WebSocket-Key1"),
@@ -170,11 +170,11 @@ process_frames([{Opcode, Payload} | Rest], Acc) ->
 parse_hybi_frames(_, <<>>, Acc) ->
     lists:reverse(Acc);
 
-parse_hybi_frames(S, <<_Fin:1, 
-               _Rsv:3, 
-               Opcode:4, 
-               _Mask:1, 
-               PayloadLen:7, 
+parse_hybi_frames(S, <<_Fin:1,
+               _Rsv:3,
+               Opcode:4,
+               _Mask:1,
+               PayloadLen:7,
                MaskKey:4/binary,
                Payload:PayloadLen/binary-unit:8,
                Rest/binary>>,
@@ -183,11 +183,11 @@ parse_hybi_frames(S, <<_Fin:1,
     Payload2 = hybi_unmask(Payload, MaskKey, <<>>),
     parse_hybi_frames(S, Rest, [{Opcode, Payload2} | Acc]);
 
-parse_hybi_frames(S, <<_Fin:1, 
-               _Rsv:3, 
-               Opcode:4, 
-               _Mask:1, 
-               126:7, 
+parse_hybi_frames(S, <<_Fin:1,
+               _Rsv:3,
+               Opcode:4,
+               _Mask:1,
+               126:7,
                PayloadLen:16,
                MaskKey:4/binary,
                Payload:PayloadLen/binary-unit:8,
@@ -197,16 +197,16 @@ parse_hybi_frames(S, <<_Fin:1,
     Payload2 = hybi_unmask(Payload, MaskKey, <<>>),
     parse_hybi_frames(S, Rest, [{Opcode, Payload2} | Acc]);
 
-parse_hybi_frames(Socket, <<_Fin:1, 
-               _Rsv:3, 
-               _Opcode:4, 
-               _Mask:1, 
-               126:7, 
+parse_hybi_frames(Socket, <<_Fin:1,
+               _Rsv:3,
+               _Opcode:4,
+               _Mask:1,
+               126:7,
                _PayloadLen:16,
                _MaskKey:4/binary,
                _/binary-unit:8>> = PartFrame,
              Acc) ->
-    
+
     ok = mochiweb_socket:setopts(Socket, [{packet, 0}, {active, once}]),
     receive
         {tcp_closed, _} ->
@@ -221,23 +221,23 @@ parse_hybi_frames(Socket, <<_Fin:1,
 
         {tcp, _, Continuation} ->
           parse_hybi_frames(Socket, <<PartFrame/binary, Continuation/binary>>,
Acc);
-            
+
         _ ->
             mochiweb_socket:close(Socket),
             exit(normal)
     after
-      5000 -> 
+      5000 ->
         mochiweb_socket:close(Socket),
         exit(normal)
     end;
 
 parse_hybi_frames(S, <<_Fin:1,
-               _Rsv:3, 
-               Opcode:4, 
-               _Mask:1, 
-               127:7, 
-               0:1, 
-               PayloadLen:63, 
+               _Rsv:3,
+               Opcode:4,
+               _Mask:1,
+               127:7,
+               0:1,
+               PayloadLen:63,
                MaskKey:4/binary,
                Payload:PayloadLen/binary-unit:8,
                Rest/binary>>,


Mime
View raw message