aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-08-01 08:50:19 +0000
committerBadlop <badlop@process-one.net>2008-08-01 08:50:19 +0000
commit3a5fb234270579bd78e65a8649b38fde12c9692d (patch)
treef292a2c4aed84ec625982013e7715893ee9906de
parent* src/msgs/uk.msg: Fix: each string in a single line (diff)
* src/web/ejabberd_http.erl: Temporary solution for check of
packet size when HTTPS (EJAB-611)(EJAB-507)(EJAB-574) SVN Revision: 1502
-rw-r--r--ChangeLog5
-rw-r--r--src/web/ejabberd_http.erl5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2323dc69a..077bad0d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-01 Badlop <badlop@process-one.net>
+
+ * src/web/ejabberd_http.erl: Temporary solution for check of
+ packet size when HTTPS (EJAB-611)(EJAB-507)(EJAB-574)
+
2008-07-31 Badlop <badlop@process-one.net>
* src/msgs/uk.msg: Fix: each string in a single line
diff --git a/src/web/ejabberd_http.erl b/src/web/ejabberd_http.erl
index e38abe74f..4126232bd 100644
--- a/src/web/ejabberd_http.erl
+++ b/src/web/ejabberd_http.erl
@@ -391,7 +391,10 @@ recv_data(_State, 0, Acc) ->
recv_data(State, Len, Acc) ->
case State#state.trail of
[] ->
- case (State#state.sockmod):recv(State#state.socket, Len, 300000) 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
{ok, Data} ->
recv_data(State, Len - size(Data), [Acc | Data]);
_ ->