Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

fix getting ServerHost from Host due to binary portage (EJAB-1638)

This commit is contained in:
Christophe Romain 2013-06-06 11:32:52 +02:00
parent c8cba04f05
commit 58e769d68f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -4872,10 +4872,9 @@ transaction_retry(Host, Fun, Trans, Count) ->
{error, ?ERR_INTERNAL_SERVER_ERROR}
end.
odbc_conn({_U, Host, _R})->
Host;
odbc_conn(Host) ->
lists:dropwhile(fun(A) -> A/=$. end, Host) -- ".".
odbc_conn({_U, Host, _R})-> Host;
odbc_conn(<<$., Host/binary>>) -> Host;
odbc_conn(<<_, Host/binary>>) -> odbc_conn(Host).
%% escape value for database storage
escape({_U, _H, _R}=JID)->

11
src/mod_pubsub/pubsub_odbc.patch
View File

@ -1,5 +1,5 @@
--- mod_pubsub.erl 2013-06-06 11:08:12.333599362 +0200
+++ mod_pubsub_odbc.erl 2013-06-06 11:09:59.073591158 +0200
+++ mod_pubsub_odbc.erl 2013-06-06 11:31:06.640173557 +0200
@@ -43,7 +43,7 @@
%%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see
%%% XEP-0060 section 12.18.
@ -1179,14 +1179,13 @@
{'EXIT', Reason} ->
?ERROR_MSG("transaction return internal error: ~p~n",
[{'EXIT', Reason}]),
@@ -5213,6 +4872,17 @@
@@ -5213,6 +4872,16 @@
{error, ?ERR_INTERNAL_SERVER_ERROR}
end.
+odbc_conn({_U, Host, _R})->
+ Host;
+odbc_conn(Host) ->
+ lists:dropwhile(fun(A) -> A/=$. end, Host) -- ".".
+odbc_conn({_U, Host, _R})-> Host;
+odbc_conn(<<$., Host/binary>>) -> Host;
+odbc_conn(<<_, Host/binary>>) -> odbc_conn(Host).
+
+%% escape value for database storage
+escape({_U, _H, _R}=JID)->