Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-20 22:22:09 +02:00
Code Releases Activity

* src/web/ejabberd_http.erl: Added a workaround for inet:peername

Browse Source 
returning 'ebadf'

SVN Revision: 1910
This commit is contained in:
Alexey Shchepin 2009-02-23 05:25:10 +00:00
parent e6324f8a02
commit b6208955f3
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-02-23 Alexey Shchepin <alexey@process-one.net>
* src/web/ejabberd_http.erl: Added a workaround for inet:peername
returning 'ebadf'
2009-02-20 Badlop <badlop@process-one.net> 2009-02-20 Badlop <badlop@process-one.net>
* src/ejabberd_listener.erl: When stopping a listener, don't stop * src/ejabberd_listener.erl: When stopping a listener, don't stop

14
src/web/ejabberd_http.erl
View File

@ -381,6 +381,13 @@ process_request(#state{request_method = Method,
request_headers = RequestHeaders, request_headers = RequestHeaders,
request_handlers = RequestHandlers} = State) request_handlers = RequestHandlers} = State)
when (Method=:='POST' orelse Method=:='PUT') andalso is_integer(Len) -> when (Method=:='POST' orelse Method=:='PUT') andalso is_integer(Len) ->
{ok, IP} =
case SockMod of
gen_tcp ->
inet:peername(Socket);
_ ->
SockMod:peername(Socket)
end,
case SockMod of case SockMod of
gen_tcp -> gen_tcp ->
inet:setopts(Socket, [{packet, 0}]); inet:setopts(Socket, [{packet, 0}]);
@ -400,13 +407,6 @@ process_request(#state{request_method = Method,
LQ -> LQ ->
LQ LQ
end, end,
{ok, IP} =
case SockMod of
gen_tcp ->
inet:peername(Socket);
_ ->
SockMod:peername(Socket)
end,
Request = #request{method = Method, Request = #request{method = Method,
path = LPath, path = LPath,
q = LQuery, q = LQuery,