* src/shaper.erl: Bugfix (EJAB-350)
* src/ejabberd_config.erl: Likewise SVN Revision: 911
This commit is contained in:
parent
69f83f4bf1
commit
c3dc5c929f
|
@ -49,6 +49,11 @@
|
||||||
|
|
||||||
* src/web/ejabberd_http_poll.erl: Bugfix
|
* src/web/ejabberd_http_poll.erl: Bugfix
|
||||||
|
|
||||||
|
2006-10-01 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
|
* src/shaper.erl: Bugfix
|
||||||
|
* src/ejabberd_config.erl: Likewise
|
||||||
|
|
||||||
2006-09-27 Mickael Remond <mickael.remond@process-one.net>
|
2006-09-27 Mickael Remond <mickael.remond@process-one.net>
|
||||||
|
|
||||||
* doc/release_notes_1.1.2.txt: Minor fixes.
|
* doc/release_notes_1.1.2.txt: Minor fixes.
|
||||||
|
|
|
@ -113,8 +113,9 @@ process_term(Term, State) ->
|
||||||
{access, RuleName, Rules} ->
|
{access, RuleName, Rules} ->
|
||||||
process_host_term(Term, global, State);
|
process_host_term(Term, global, State);
|
||||||
{shaper, Name, Data} ->
|
{shaper, Name, Data} ->
|
||||||
lists:foldl(fun(Host, S) -> process_host_term(Term, Host, S) end,
|
%lists:foldl(fun(Host, S) -> process_host_term(Term, Host, S) end,
|
||||||
State, State#state.hosts);
|
% State, State#state.hosts);
|
||||||
|
process_host_term(Term, global, State);
|
||||||
{host, Host} ->
|
{host, Host} ->
|
||||||
State;
|
State;
|
||||||
{hosts, Hosts} ->
|
{hosts, Hosts} ->
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
|
|
||||||
new(Name) ->
|
new(Name) ->
|
||||||
Data = case ejabberd_config:get_global_option({shaper, Name}) of
|
Data = case ejabberd_config:get_global_option({shaper, Name, global}) of
|
||||||
undefined ->
|
undefined ->
|
||||||
none;
|
none;
|
||||||
D ->
|
D ->
|
||||||
|
|
Loading…
Reference in New Issue