diff options
| author | Badlop <badlop@process-one.net> | 2009-08-31 16:29:25 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2009-08-31 16:29:25 +0000 |
| commit | fd57ec58721f02172a42b65dba47582b2035d4b3 (patch) | |
| tree | 4fd93a13078b7d4810b5e5b5807701711f16351c /doc | |
| parent | Remove the word "END" of release_notes file because it seems unnecessary. (diff) | |
Support zlib compression after STARTTLS (thanks to Aleksey Shchepin)(EJAB-499)
SVN Revision: 2571
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guide.html | 5 | ||||
| -rw-r--r-- | doc/guide.tex | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/doc/guide.html b/doc/guide.html index a4ec1acb..68876eac 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -779,10 +779,7 @@ password of one of the registered users who are granted access by the ‘configure’ access rule. </DD><DT CLASS="dt-description"><B><TT>zlib</TT></B></DT><DD CLASS="dd-description"> This option specifies that Zlib stream compression (as defined in <A HREF="http://xmpp.org/extensions/xep-0138.html">XEP-0138</A>) -is available on connections to the port. Client connections cannot use -stream compression and stream encryption simultaneously. Hence, if you -specify both <TT>starttls</TT> (or <TT>tls</TT>) and <TT>zlib</TT>, the latter -option will not affect connections (there will be no stream compression). +is available on connections to the port. </DD></DL><P>There are some additional global options that can be specified in the ejabberd configuration file (outside <TT>listen</TT>): </P><DL CLASS="description"><DT CLASS="dt-description"> <B><TT>{s2s_use_starttls, true|false}</TT></B></DT><DD CLASS="dd-description"> diff --git a/doc/guide.tex b/doc/guide.tex index b80b8be7..32e3d67f 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -920,10 +920,7 @@ This is a detailed description of each option allowed by the listening modules: `configure' access rule. \titem{zlib} \ind{options!zlib}\ind{protocols!XEP-0138: Stream Compression}\ind{Zlib}This option specifies that Zlib stream compression (as defined in \xepref{0138}) - is available on connections to the port. Client connections cannot use - stream compression and stream encryption simultaneously. Hence, if you - specify both \option{starttls} (or \option{tls}) and \option{zlib}, the latter - option will not affect connections (there will be no stream compression). + is available on connections to the port. \end{description} There are some additional global options that can be specified in the ejabberd configuration file (outside \term{listen}): |