aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-12-14 14:15:45 +0000
committerBadlop <badlop@process-one.net>2009-12-14 14:15:45 +0000
commit402a8c0d351dc782e59ddf046095609ca0a520be (patch)
tree9e8942f374dd6eded3a0ec91ca701588b55a6fc6
parentPrint command's reply and newline only when there's something to print. (diff)
Prepare 2.1.1 release
SVN Revision: 2808
Diffstat
-rw-r--r--doc/dev.html4
-rw-r--r--doc/features.html4
-rw-r--r--doc/guide.html4
-rw-r--r--doc/release_notes_2.1.1.txt47
-rw-r--r--doc/version.tex2
-rw-r--r--src/ejabberd.app2
6 files changed, 55 insertions, 8 deletions
diff --git a/doc/dev.html b/doc/dev.html
index c6c10b947..65ffa1b88 100644
--- a/doc/dev.html
+++ b/doc/dev.html
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/REC-html40/loose.dtd">
<HTML>
<HEAD>
-<TITLE>Ejabberd 2.1.x Developers Guide
+<TITLE>Ejabberd 2.1.1 Developers Guide
</TITLE>
<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
@@ -49,7 +49,7 @@ TD P{margin:0px;}
<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic dev.tex -->
<!--CUT DEF section 1 --><P><A NAME="titlepage"></A>
-</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.x Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.1 Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
<A HREF="mailto:alexey@sevcom.net"><TT>mailto:alexey@sevcom.net</TT></A><BR>
<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A></H3></TD></TR>
</TABLE><DIV CLASS="center">
diff --git a/doc/features.html b/doc/features.html
index 503ac0d3f..5ac22419c 100644
--- a/doc/features.html
+++ b/doc/features.html
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/REC-html40/loose.dtd">
<HTML>
<HEAD>
-<TITLE>Ejabberd 2.1.x Feature Sheet
+<TITLE>Ejabberd 2.1.1 Feature Sheet
</TITLE>
<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
@@ -50,7 +50,7 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic features.tex -->
<!--CUT DEF section 1 --><P><A NAME="titlepage"></A>
-</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.x Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.1 Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
<A HREF="mailto:s.devrieze@pandora.be"><TT>mailto:s.devrieze@pandora.be</TT></A><BR>
<A HREF="xmpp:sander@devrieze.dyndns.org"><TT>xmpp:sander@devrieze.dyndns.org</TT></A></H3></TD></TR>
</TABLE><DIV CLASS="center">
diff --git a/doc/guide.html b/doc/guide.html
index 9c3414957..552b72ca6 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -6,7 +6,7 @@
- ejabberd 2.1.x
+ ejabberd 2.1.1
Installation and Operation Guide
@@ -76,7 +76,7 @@ BLOCKQUOTE.figure DIV.center DIV.center HR{display:none;}
<HR SIZE=2><BR>
<BR>
-<TABLE CELLSPACING=6 CELLPADDING=0><TR><TD ALIGN=right NOWRAP> <FONT SIZE=6><B>ejabberd 2.1.x </B></FONT></TD></TR>
+<TABLE CELLSPACING=6 CELLPADDING=0><TR><TD ALIGN=right NOWRAP> <FONT SIZE=6><B>ejabberd 2.1.1 </B></FONT></TD></TR>
<TR><TD ALIGN=right NOWRAP>&nbsp;</TD></TR>
<TR><TD ALIGN=right NOWRAP> <FONT SIZE=6>Installation and Operation Guide</FONT></TD></TR>
</TABLE><BR>
diff --git a/doc/release_notes_2.1.1.txt b/doc/release_notes_2.1.1.txt
new file mode 100644
index 000000000..b97462c9f
--- /dev/null
+++ b/doc/release_notes_2.1.1.txt
@@ -0,0 +1,47 @@
+
+ Release Notes
+ ejabberd 2.1.1
+
+ ejabberd 2.1.1 is the first bugfix release in ejabberd 2.1.x branch.
+
+ ejabberd 2.1.1 includes several important bugfixes.
+ More details of those fixes can be retrieved from:
+ http://redir.process-one.net/ejabberd-2.1.1
+
+ The new code can be downloaded from ejabberd download page:
+ http://www.process-one.net/en/ejabberd/
+
+
+ The changes are:
+
+* Core
+- Call ejabberd_router:route/3 instead of sending a message
+- Can't connect if starttls_required and zlib are set
+- Routes vCard request to the occupant full JID, but should to bare JID
+- S2S: fix allow_host/2 on subdomains. added hook s2s_allow_host
+
+* MUC
+- Support converting one-to-one chat to MUC
+- Add support for serving a Unique Room Name
+
+* Publish Subscribe
+- Receive same last published PEP items at reconnect if several resources online
+- Typo in mod_pubsub_odbc breaks Service Discovery and more
+
+* Web
+- Fix memory and port leak when TLS is enabled in HTTP
+- WebAdmin doesn't report correct last activity with postgresql backend
+- Option to define custom HTTP headers in mod_http_fileserver
+- Show informative webpage when browsing the HTTP-Poll page
+
+* Other
+- Change captcha.sh to not depend on bash
+- Generate main XML file also when exporting only a vhost
+- Fix last newline in ejabberdctl result
+- Guide: fix -setcookie, mod_pubsub_odbc host, content_types
+
+
+ Bug reports
+
+ You can officially report bugs on ProcessOne support site:
+ http://support.process-one.net/
diff --git a/doc/version.tex b/doc/version.tex
index 905ac86f2..e71e2ab08 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,2 +1,2 @@
% ejabberd version (automatically generated).
-\newcommand{\version}{2.1.x}
+\newcommand{\version}{2.1.1}
diff --git a/src/ejabberd.app b/src/ejabberd.app
index e347daf3b..f87d95d1c 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -2,7 +2,7 @@
{application, ejabberd,
[{description, "ejabberd"},
- {vsn, "2.1.x"},
+ {vsn, "2.1.1"},
{modules, [acl,
adhoc,
configure,
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-03 15:09:06 +0000