diff options
| author | Badlop <badlop@process-one.net> | 2009-06-16 17:44:38 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2009-06-16 17:44:38 +0000 |
| commit | 4ed01b98de673000fe08f1d11c4f4dc73fab0f65 (patch) | |
| tree | b7f8f81e44387005440f2cedb09b29ce31ba4917 /src | |
| parent | We do not send a 'version' attribute at the stream header for now (thanks to ... (diff) | |
Restore ejabberd directory structure (src/web) for integration as patch (thanks to Christohpe Romain)
SVN Revision: 2211
Diffstat (limited to 'src')
| -rw-r--r-- | src/web/ejabberd_http_bind.erl | 5 | ||||
| -rw-r--r-- | src/web/mod_http_bind.erl | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/web/ejabberd_http_bind.erl b/src/web/ejabberd_http_bind.erl index 0d01fe7c1..c3a9dde0e 100644 --- a/src/web/ejabberd_http_bind.erl +++ b/src/web/ejabberd_http_bind.erl @@ -3,12 +3,12 @@ %%% Author : Stefan Strigler <steve@zeank.in-berlin.de> %%% Purpose : HTTP Binding support (JEP-0124) %%% Created : 21 Sep 2005 by Stefan Strigler <steve@zeank.in-berlin.de> -%%% Id : $Id: ejabberd_http_bind.erl 123 2007-05-30 13:48:02Z sstrigler $ +%%% Id : $Id: ejabberd_http_bind.erl 156 2007-06-25 09:22:57Z cromain $ %%%---------------------------------------------------------------------- -module(ejabberd_http_bind). -author('steve@zeank.in-berlin.de'). --vsn('$Rev: 123 $'). +-vsn('$Rev: 156 $'). -behaviour(gen_fsm). @@ -542,6 +542,7 @@ handle_sync_event({http_put, Rid, Key, NewKey, Hold, Packet, StartTo}, {MinPoll, _} = string:to_integer(?MIN_POLLING), if (Packet == "") and + (Hold == 0) and (TNow - StateData#state.last_poll < MinPoll*1000*1000) -> Reply = {error, polling_too_frequently}, {reply, Reply, StateName, StateData}; diff --git a/src/web/mod_http_bind.erl b/src/web/mod_http_bind.erl index 1cebd0f5e..1dba7d193 100644 --- a/src/web/mod_http_bind.erl +++ b/src/web/mod_http_bind.erl @@ -3,7 +3,7 @@ %%% Author : Stefan Strigler <steve@zeank.in-berlin.de> %%% Purpose : Implementation of XMPP over BOSH (XEP-0206) %%% Created : Tue Feb 20 13:15:52 CET 2007 -%%% Id : $Id: $ +%%% Id : $Id: mod_http_bind.erl 156 2007-06-25 09:22:57Z cromain $ %%%---------------------------------------------------------------------- %%%---------------------------------------------------------------------- @@ -15,7 +15,7 @@ -module(mod_http_bind). -author('steve@zeank.in-berlin.de'). --define(MOD_HTTP_BIND_VERSION, "1.0"). +-define(MOD_HTTP_BIND_VERSION, "1.2"). -vsn(?MOD_HTTP_BIND_VERSION). %%-define(ejabberd_debug, true). @@ -23,9 +23,9 @@ -behaviour(gen_mod). -export([ - start/2, - stop/1, - process/2 + start/2, + stop/1, + process/2 ]). -include("ejabberd.hrl"). |