diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2011-09-05 16:31:58 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2011-09-05 16:31:58 +1000 |
| commit | f1a91108ef13fdb4faf0d8679da3f2040289eea8 (patch) | |
| tree | 59713427bb439a08de6015ed621251ddc391559e | |
| parent | Get rid of useless code (diff) | |
Correct some function clauses and value types
| -rw-r--r-- | src/web/ejabberd_http.erl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/web/ejabberd_http.erl b/src/web/ejabberd_http.erl index ea6851902..44d3e161f 100644 --- a/src/web/ejabberd_http.erl +++ b/src/web/ejabberd_http.erl @@ -353,7 +353,7 @@ process_request(#state{request_method = Method, when Method=:='GET' orelse Method=:='HEAD' orelse Method=:='DELETE' orelse Method=:='OPTIONS' -> case (catch url_decode_q_split(Path)) of {'EXIT', _} -> - process_request(false); + make_bad_request(State); {NPath, Query} -> LPath = [path_decode(NPE) || NPE <- string:tokens(NPath, "/")], LQuery = case (catch parse_urlencoded(Query)) of @@ -430,7 +430,7 @@ process_request(#state{request_method = Method, ?DEBUG("client data: ~p~n", [Data]), case (catch url_decode_q_split(Path)) of {'EXIT', _} -> - process_request(false); + make_bad_request(State); {NPath, _Query} -> LPath = [path_decode(NPE) || NPE <- string:tokens(NPath, "/")], LQuery = case (catch parse_urlencoded(Data)) of @@ -464,6 +464,9 @@ process_request(#state{request_method = Method, end; process_request(State) -> + make_bad_request(State). + +make_bad_request(State) -> make_xhtml_output(State, 400, [], @@ -506,7 +509,7 @@ recv_data(State, Len, Acc) -> [] -> case (State#state.sockmod):recv(State#state.socket, Len, 300000) of {ok, Data} -> - recv_data(State, Len - size(Data), [Acc | Data]); + recv_data(State, Len - size(Data), [Acc | [Data]]); _ -> "" end; @@ -1089,8 +1092,8 @@ is_space(_) -> strip_spaces(String) -> strip_spaces(String, both). -strip_spaces(String, left) -> - drop_spaces(String); +%% strip_spaces(String, left) -> +%% drop_spaces(String); strip_spaces(String, right) -> lists:reverse(drop_spaces(lists:reverse(String))); strip_spaces(String, both) -> |