Browse Source

Small guide fixes

Loïc Hoguin 7 years ago
parent
commit
f104da9322
2 changed files with 10 additions and 9 deletions
  1. 2 2
      doc/src/guide/resource_design.asciidoc
  2. 8 7
      doc/src/guide/ws_handlers.asciidoc

+ 2 - 2
doc/src/guide/resource_design.asciidoc

@@ -193,8 +193,8 @@ callback.
 
 If you implement the methods PUT, POST and/or PATCH,
 you must implement the `content_types_accepted` callback,
-and one `AcceptResource` callback for each content-type
-it returns. Prefix the `AcceptResource` callback names
+and one `AcceptCallback` callback for each content-type
+it returns. Prefix the `AcceptCallback` callback names
 with `from_` for clarity. For example, `from_html` or
 `from_json`.
 

+ 8 - 7
doc/src/guide/ws_handlers.asciidoc

@@ -57,18 +57,19 @@ be:
 
 [source,erlang]
 ----
-init(Req, State) ->
-    case cowboy_req:parse_header(<<"sec-websocket-protocol">>, Req) of
+init(Req0, State) ->
+    case cowboy_req:parse_header(<<"sec-websocket-protocol">>, Req0) of
         undefined ->
-            {cowboy_websocket, Req, State};
+            {cowboy_websocket, Req0, State};
         Subprotocols ->
             case lists:keymember(<<"mqtt">>, 1, Subprotocols) of
                 true ->
-                    Req2 = cowboy_req:set_resp_header(<<"sec-websocket-protocol">>,
-                        <<"mqtt">>, Req),
-                    {cowboy_websocket, Req2, State};
+                    Req = cowboy_req:set_resp_header(<<"sec-websocket-protocol">>,
+                        <<"mqtt">>, Req0),
+                    {cowboy_websocket, Req, State};
                 false ->
-                    {stop, Req, State}
+                    Req = cowboy_req:reply(400, Req0),
+                    {ok, Req, State}
             end
     end.
 ----