captcha_host must have the port number to get protocol (EJAB-1418)

diff --git a/doc/guide.tex b/doc/guide.tex
index 2bacd57c9791b97639ee703df847660c0de63265..c51baca90bf9d784af3a2ca4234587b0d80bc5be 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -1633,11 +1633,11 @@ The configurable options are:
   \titem{\{captcha\_cmd, Path\}} 
   Full path to a script that generates the image.
   The default value is an empty string: \term{""}
-  \titem{\{captcha\_host, Host\}} 
-  Host part of the URL sent to the user.
-  You can include the port number.
-  The URL sent to the user is formed by: \term{http://Host/captcha/}
-  The default value is the first hostname configured.
+  \titem{\{captcha\_host, HostPort\}} 
+  Host part of the URL sent to the user,
+  and the port number where ejabberd listens for CAPTCHA requests.
+  The URL sent to the user is formed by: \term{http://Host:Port/captcha/}
+  The default value is: the first hostname configured, and port 5280.
 \end{description}
 
 Additionally, an \term{ejabberd\_http} listener must be enabled with the \term{captcha} option.

diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
index 52ffc682578900ad59776558be1af4481b5af68e..0912bf5599958785fca5b73deb84192522ba7773 100644 (file)
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
@@ -475,7 +475,7 @@
 %%{captcha_cmd, "/lib/ejabberd/priv/bin/captcha.sh"}.
 
 %%
-%% Host part of the URL sent to the user.
+%% Host for the URL and port where ejabberd listens for CAPTCHA requests.
 %%
 %%{captcha_host, "example.org:5280"}.
 

diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl
index 455ffad9d1e6ab9fb72efa8f725ad16bdf1f1b46..0f3aee76cd3910252d63a61cd96392d434027073 100644 (file)
--- a/src/ejabberd_captcha.erl
+++ b/src/ejabberd_captcha.erl
@@ -406,12 +406,12 @@ get_prog_name() ->
 
 get_url(Str) ->
     CaptchaHost = ejabberd_config:get_local_option(captcha_host),
-    TransferProt = atom_to_list(get_transfer_protocol(CaptchaHost)),
     case CaptchaHost of
        Host when is_list(Host) ->
+           TransferProt = atom_to_list(get_transfer_protocol(CaptchaHost)),
            TransferProt ++ "://" ++ Host ++ "/captcha/" ++ Str;
        _ ->
-           TransferProt ++ "://" ++ ?MYNAME ++ "/captcha/" ++ Str
+           "http://" ++ ?MYNAME ++ ":5280/captcha/" ++ Str
     end.
 
 get_transfer_protocol(CaptchaHost) ->