diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2014-10-27 13:44:59 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2014-10-27 13:44:59 +0300 |
| commit | 067958d705168b0cd586a61feff26ada1ce16ec6 (patch) | |
| tree | edd345969045ecf3defa70a4c6a1a9e615ca07f7 /src | |
| parent | Revert "fix mod_offline to store only chat messages with body xml element" (diff) | |
| parent | Merge pull request #330 from weiss/accept-newline (diff) | |
Merge branch 'master' of github.com:processone/ejabberd
Diffstat (limited to 'src')
| -rw-r--r-- | src/jlib.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/jlib.erl b/src/jlib.erl index 7735d7dbc..be1da3fd0 100644 --- a/src/jlib.erl +++ b/src/jlib.erl @@ -798,7 +798,12 @@ base64_to_term(Base64) -> -spec decode_base64(binary()) -> binary(). decode_base64(S) -> - decode_base64_bin(S, <<>>). + case catch binary:last(S) of + C when C == $\n; C == $\s -> + decode_base64(binary:part(S, 0, byte_size(S) - 1)); + _ -> + decode_base64_bin(S, <<>>) + end. take_without_spaces(Bin, Count) -> take_without_spaces(Bin, Count, <<>>). |