aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2007-11-27 18:22:47 +0000
committerBadlop <badlop@process-one.net>2007-11-27 18:22:47 +0000
commit003e7ae9a297568fb6615758470c80a05933b979 (patch)
treecd6616faa76ab4176e92d50ba2492d03fdd4e385
parent* src/mod_announce.erl: Bugfix (thanks to Christophe Romain) (diff)
* doc/guide.tex: Document ejabberd_http's
request_handlers (EJAB-372). Fixed small Latex problems. SVN Revision: 993
-rw-r--r--ChangeLog5
-rw-r--r--doc/guide.tex11
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f0081b72d..5ae177740 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-27 Badlop <badlop@process-one.net>
+
+ * doc/guide.tex: Document ejabberd_http's
+ request_handlers (EJAB-372). Fixed small Latex problems.
+
2007-11-27 Alexey Shchepin <alexey@process-one.net>
* src/mod_announce.erl: Bugfix (thanks to Christophe Romain)
diff --git a/doc/guide.tex b/doc/guide.tex
index 6d8d82930..e59cfe0a0 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -336,7 +336,7 @@ when starting the Erlang/OTP virtual machine are:
Specify the ejabberd configuration file.
\titem{-ejabberd log\_path "/var/log/ejabberd/ejabberd.log"}
Specify the directory for the ejabberd.log file.
- \titem{-sasl sasl\_error\_logger \{file,\"/var/log/ejabberd/sasl.log"\}}
+ \titem{-sasl sasl\_error\_logger \{file, "/var/log/ejabberd/sasl.log"\}}
Specify the directory for the sasl.log file.
\titem{-env ERL\_MAX\_PORTS=32000}
Allow up to 32000 connections. The default limit is just 1024.
@@ -633,7 +633,7 @@ Currently next modules are implemented:
\hline \texttt{ejabberd\_http}& Description& Handles incoming HTTP
connections.\\
\cline{2-3} & Options& \texttt{certfile}, \texttt{http\_poll},
- \texttt{inet6}, \texttt{ip}, \texttt{tls}, \texttt{web\_admin}\\
+ \texttt{inet6}, \texttt{ip}, \texttt{request\_handlers}, \texttt{tls}, \texttt{web\_admin}\\
\hline
\end{tabular}
\end{table}
@@ -700,7 +700,12 @@ The following options are available:
at \verb|http://server:port/admin/|. Login and password are the username and
password of one of the registered users who are granted access by the
`configure' access rule.
- \titem{component\_check\_from} \ind{options!service\_check\_from}
+ \titem{\{request\_handlers, [\{Path, Module\}]\}} To define one or several handlers that will serve HTTP requests.
+ The Path is a list of strings; so the URIs that start with that Path will be served by Module.
+ For example, if you want \term{mod\_foo} to serve the URIs that start with \term{/a/b/},
+ and you also want \term{mod\_http\_bind} to serve the URIs \term{/http-bind/},
+ use this option: \term{\{request\_handlers, [\{["a", "b"], mod\_foo\}, \{["http-bind"], mod\_http\_bind\}]\}}
+ \titem{component\_check\_from} \ind{options!service\_check\_from}
This option can be used with \term{ejabberd\_service} only. It is
used to disable control on the from field on packets send by an
external components. The option can be either \term{true} or