aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-04-18 10:23:57 +0200
committerFredrik Gustafsson <[email protected]>2013-04-18 10:23:57 +0200
commit1906e60c325de2a822b621d3b7cb5ba325491331 (patch)
treea146b1df2ed9ff573d3f013fb110ce8fa6d746a4
parent05e45751629348ce1a4c573f754fa12cfbb637de (diff)
parenta504d4abc5074f43b37a8a7c187f04fa82f29323 (diff)
downloadotp-1906e60c325de2a822b621d3b7cb5ba325491331.tar.gz
otp-1906e60c325de2a822b621d3b7cb5ba325491331.tar.bz2
otp-1906e60c325de2a822b621d3b7cb5ba325491331.zip
Merge branch 'maint'
-rw-r--r--lib/inets/src/http_server/httpd_manager.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl
index 672a70a394..c83d06a158 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -691,11 +691,11 @@ handle_unblock(S, FromA) ->
handle_unblock(S, _FromA, unblocked) ->
{ok,S};
handle_unblock(S, FromA, _AdminState) ->
- stop_block_tmr(S#state.blocking_tmr),
case S#state.blocking_tmr of
- {_Tmr,FromB,Ref} ->
+ {Tmr,FromB,Ref} ->
%% Another process is trying to unblock
%% Inform the blocker
+ stop_block_tmr(Tmr),
FromB ! {block_reply, {error,{unblocked,FromA}},Ref};
_ ->
ok