Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

Restore ejabberd directory structure (src/web) for integration as patch (thanks to Christohpe Romain)

Browse Source 
SVN Revision: 2274
This commit is contained in:
Badlop 2009-06-16 18:24:34 +00:00
parent 5495516c30
commit 01dc4611b9
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/web/ejabberd_http_bind.erl
View File

@ -3,12 +3,12 @@
%%% Author : Stefan Strigler <steve@zeank.in-berlin.de> %%% Author : Stefan Strigler <steve@zeank.in-berlin.de>
%%% Purpose : HTTP Binding support (JEP-0124) %%% Purpose : HTTP Binding support (JEP-0124)
%%% Created : 21 Sep 2005 by Stefan Strigler <steve@zeank.in-berlin.de> %%% 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). -module(ejabberd_http_bind).
-author('steve@zeank.in-berlin.de'). -author('steve@zeank.in-berlin.de').
-vsn('$Rev: 123 $'). -vsn('$Rev: 156 $').
-behaviour(gen_fsm). -behaviour(gen_fsm).
@ -542,6 +542,7 @@ handle_sync_event({http_put, Rid, Key, NewKey, Hold, Packet, StartTo},
{MinPoll, _} = string:to_integer(?MIN_POLLING), {MinPoll, _} = string:to_integer(?MIN_POLLING),
if if
(Packet == "") and (Packet == "") and
(Hold == 0) and
(TNow - StateData#state.last_poll < MinPoll*1000*1000) -> (TNow - StateData#state.last_poll < MinPoll*1000*1000) ->
Reply = {error, polling_too_frequently}, Reply = {error, polling_too_frequently},
{reply, Reply, StateName, StateData}; {reply, Reply, StateName, StateData};

10
src/web/mod_http_bind.erl
View File

@ -3,7 +3,7 @@
%%% Author : Stefan Strigler <steve@zeank.in-berlin.de> %%% Author : Stefan Strigler <steve@zeank.in-berlin.de>
%%% Purpose : Implementation of XMPP over BOSH (XEP-0206) %%% Purpose : Implementation of XMPP over BOSH (XEP-0206)
%%% Created : Tue Feb 20 13:15:52 CET 2007 %%% 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). -module(mod_http_bind).
-author('steve@zeank.in-berlin.de'). -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). -vsn(?MOD_HTTP_BIND_VERSION).
%%-define(ejabberd_debug, true). %%-define(ejabberd_debug, true).
@ -23,9 +23,9 @@
-behaviour(gen_mod). -behaviour(gen_mod).
-export([ -export([
start/2, start/2,
stop/1, stop/1,
process/2 process/2
]). ]).
-include("ejabberd.hrl"). -include("ejabberd.hrl").