diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/ejabberd_config.erl | 5 | ||||
| -rw-r--r-- | src/shaper.erl | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -49,6 +49,11 @@ * 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> * doc/release_notes_1.1.2.txt: Minor fixes. diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 1c7a76b14..ce8e273ee 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -113,8 +113,9 @@ process_term(Term, State) -> {access, RuleName, Rules} -> process_host_term(Term, global, State); {shaper, Name, Data} -> - lists:foldl(fun(Host, S) -> process_host_term(Term, Host, S) end, - State, State#state.hosts); + %lists:foldl(fun(Host, S) -> process_host_term(Term, Host, S) end, + % State, State#state.hosts); + process_host_term(Term, global, State); {host, Host} -> State; {hosts, Hosts} -> diff --git a/src/shaper.erl b/src/shaper.erl index 19a557c73..f50cc71d1 100644 --- a/src/shaper.erl +++ b/src/shaper.erl @@ -16,7 +16,7 @@ new(Name) -> - Data = case ejabberd_config:get_global_option({shaper, Name}) of + Data = case ejabberd_config:get_global_option({shaper, Name, global}) of undefined -> none; D -> |