Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 29C9317C95 for ; Mon, 29 Jun 2015 21:46:12 +0000 (UTC) Received: (qmail 14084 invoked by uid 500); 29 Jun 2015 21:46:08 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 13904 invoked by uid 500); 29 Jun 2015 21:46:08 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 12811 invoked by uid 99); 29 Jun 2015 21:46:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2015 21:46:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0FBD3E35F6; Mon, 29 Jun 2015 21:46:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertkowalski@apache.org To: commits@couchdb.apache.org Date: Mon, 29 Jun 2015 21:46:36 -0000 Message-Id: In-Reply-To: <41909276fb954bfdb4649bc815a971dd@git.apache.org> References: <41909276fb954bfdb4649bc815a971dd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] couch commit: updated refs/heads/COUCHDB-2734-header-date to f3e022c normalize whitespace Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/8ecae102 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/8ecae102 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/8ecae102 Branch: refs/heads/COUCHDB-2734-header-date Commit: 8ecae1021e51e61a1c7bfd3d7bbcecdc8a250918 Parents: 7dac0cb Author: Bob Ippolito Authored: Wed Dec 25 13:38:48 2013 -0800 Committer: Bob Ippolito Committed: Wed Dec 25 13:38:48 2013 -0800 ---------------------------------------------------------------------- examples/websocket/websocket.erl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/8ecae102/examples/websocket/websocket.erl ---------------------------------------------------------------------- diff --git a/examples/websocket/websocket.erl b/examples/websocket/websocket.erl index 3fcc1f5..b392a20 100644 --- a/examples/websocket/websocket.erl +++ b/examples/websocket/websocket.erl @@ -29,10 +29,10 @@ % % [1]: At first you have to start HTTP server which will listen for HTTP requests % and eventually upgrade connection to websocket -% [2]: Attempt to upgrade connection to websocket. +% [2]: Attempt to upgrade connection to websocket. % Function mochiweb_websocket:upgrade_connection/2: % * first argument is mochiweb_request -% * second is M:F which will handle further websocket messages. +% * second is M:F which will handle further websocket messages. % Function return two funs: % * ReentryWs/1 - use it to enter to messages handling loop (in this example ws_loop/3) % * ReplyChannel/1 - use to send messages to client. May be passed to other processes @@ -40,9 +40,9 @@ % [4]: State that will be passed to message handling loop % [5]: Pass controll to messages handling loop. From this moment each message received from client % can be handled... -% [6]: ...here as Payload. State is variable intended for holiding your custom state. ReplyChannel -% is the same function as in [3]. -% Notice! Payload is list of messages received from client. Websocket framing mechanism +% [6]: ...here as Payload. State is variable intended for holiding your custom state. ReplyChannel +% is the same function as in [3]. +% Notice! Payload is list of messages received from client. Websocket framing mechanism % concatenates messages which are sent one after another in short time. % [7]: Print payload received from client and send it back % [8]: Message handling function must return new state value @@ -51,9 +51,9 @@ start_link() -> Loop = fun (Req) -> ?MODULE:loop(Req) end, - + mochiweb_http:start_link([ - {name, client_access}, + {name, client_access}, {loop, Loop}, {port, 8080} ]).