diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-04-08 11:12:54 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2013-06-13 11:11:02 +0200 |
| commit | 4d8f7706240a1603468968f47fc7b150b788d62f (patch) | |
| tree | 92d55d789cc7ac979b3c9e161ffb7f908eba043a /src/ejabberd_socket.erl | |
| parent | Fix Guide: ejabberd_service expects a shaper_rule, not a shaper (diff) | |
Switch to rebar build tool
Use dynamic Rebar configuration
Make iconv dependency optional
Disable transient_supervisors compile option
Add hipe compilation support
Only compile ibrowse and lhttpc when needed
Make it possible to generate an OTP application release
Add --enable-debug compile option
Add --enable-all compiler option
Add --enable-tools configure option
Add --with-erlang configure option.
Add --enable-erlang-version-check configure option.
Add lager support
Improve the test suite
Diffstat (limited to 'src/ejabberd_socket.erl')
| -rw-r--r-- | src/ejabberd_socket.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl index d06c48952..31d612d7d 100644 --- a/src/ejabberd_socket.erl +++ b/src/ejabberd_socket.erl @@ -48,6 +48,7 @@ sockname/1, peername/1]). -include("ejabberd.hrl"). +-include("logger.hrl"). -include("jlib.hrl"). -type sockmod() :: ejabberd_http_poll | @@ -56,7 +57,7 @@ -type receiver() :: pid () | atom(). -type socket() :: pid() | inet:socket() | tls:tls_socket() | - ejabberd_zlib:zlib_socket() | + ezlib:zlib_socket() | ejabberd_http_bind:bind_socket() | ejabberd_http_poll:poll_socket(). @@ -167,12 +168,11 @@ compress(SocketData) -> SocketData#socket_state{socket = ZlibSocket, sockmod = ejabberd_zlib}. compress(SocketData, Data) -> - {ok, ZlibSocket} = ejabberd_zlib:enable_zlib( - SocketData#socket_state.sockmod, - SocketData#socket_state.socket), - ejabberd_receiver:compress(SocketData#socket_state.receiver, ZlibSocket), - send(SocketData, Data), - SocketData#socket_state{socket = ZlibSocket, sockmod = ejabberd_zlib}. + {ok, ZlibSocket} = + ejabberd_receiver:compress(SocketData#socket_state.receiver, + Data), + SocketData#socket_state{socket = ZlibSocket, + sockmod = ezlib}. reset_stream(SocketData) when is_pid(SocketData#socket_state.receiver) -> |