aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/jlib.erl8
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a0073692..9c6fe076a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-22 Alexey Shchepin <alexey@process-one.net>
+
+ * src/jlib.erl: Use http_base_64:decode if available
+
2007-08-20 Alexey Shchepin <alexey@process-one.net>
* src/mod_roster.erl: Don't send roster push when unsubscribing in
diff --git a/src/jlib.erl b/src/jlib.erl
index 74369cf22..af1fcabad 100644
--- a/src/jlib.erl
+++ b/src/jlib.erl
@@ -566,6 +566,14 @@ check_list(List) ->
%
decode_base64(S) ->
+ case catch http_base_64:decode(S) of
+ {'EXIT', _Err} ->
+ decode_base64_old(S);
+ Res ->
+ Res
+ end.
+
+decode_base64_old(S) ->
decode1_base64([C || C <- S,
C /= $ ,
C /= $\t,