diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-09-19 19:00:08 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-09-19 19:00:08 +1000 |
| commit | ae4356265f6e7a9c223fbd09b9739d6421e3c538 (patch) | |
| tree | 5c377523e76cc351069180a063290a31adc00677 /src | |
| parent | Reflect modules name changes in p1_mysql (diff) | |
| parent | Fix problem with decoding http headers over tls connections (diff) | |
Merge branch 'master' of github.com:processone/ejabberd
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_http.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl index 151a34ef4..81baea6e4 100644 --- a/src/ejabberd_http.erl +++ b/src/ejabberd_http.erl @@ -201,8 +201,8 @@ parse_headers(#state{request_method = Method, trail = Data} = State) -> PktType = case Method of - undefined -> http; - _ -> httph + undefined -> http_bin; + _ -> httph_bin end, case erlang:decode_packet(PktType, Data, []) of {ok, Pkt, Rest} -> |