aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-07-17 21:46:26 +0000
committerBadlop <badlop@process-one.net>2009-07-17 21:46:26 +0000
commit480c98e99164f15302d4d1fd29f534fa8f5c541e (patch)
treec6ee0dab9bc4d09358b8a72dc35b05806914803b /src
parentSupport XEP-0157: Contact Addresses for XMPP Services (EJAB-235) (diff)
Revert workaround of EJAB-611 because it seems no longer required (EJAB-709)
SVN Revision: 2370
Diffstat (limited to 'src')
-rw-r--r--src/web/ejabberd_http.erl5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/web/ejabberd_http.erl b/src/web/ejabberd_http.erl
index 74b930030..8eec261ce 100644
--- a/src/web/ejabberd_http.erl
+++ b/src/web/ejabberd_http.erl
@@ -451,10 +451,7 @@ recv_data(_State, 0, Acc) ->
recv_data(State, Len, Acc) ->
case State#state.trail of
[] ->
- %% TODO: Fix the problem in tls C driver and revert this workaround
- %% https://support.process-one.net/browse/EJAB-611
- %%case (State#state.sockmod):recv(State#state.socket, Len, 300000) of
- case (State#state.sockmod):recv(State#state.socket, 0, 300000) of
+ case (State#state.sockmod):recv(State#state.socket, Len, 300000) of
{ok, Data} ->
recv_data(State, Len - size(Data), [Acc | Data]);
_ ->