410cdc3c5c
Backport r2422 and r2423 from trunk:
...
* tools/ejabberdctl: fix shell function syntax (EJAB-1003).
* tools/ejabberdctl: use a variable for Erlang shell.
* tools/ejabberdctl: cosmetic change.
SVN Revision: 2424
2009-08-06 09:55:35 +00:00
48095baeaf
treap.erl backport
...
SVN Revision: 2399
2009-07-29 03:42:23 +00:00
bd73b01083
treap backport from svn trunk
...
SVN Revision: 2384
2009-07-22 06:49:06 +00:00
c735577ca7
added CAPTCHA related namespaces
...
SVN Revision: 2329
2009-06-19 13:00:33 +00:00
3991450318
* doc/release_notes_2.0.5.txt: Added file for new release
...
SVN Revision: 2002
2009-04-01 10:37:18 +00:00
1f3acfc83f
* src/expat_erl.c: Fix implicit declaration of function
...
x_fix_buff (thanks to Dennis Schridde)(EJAB-900)
SVN Revision: 2000
2009-03-24 23:09:46 +00:00
1e3faf8bd9
Merge 1998 from trunk.
...
* src/ejabberd_sm.erl: Partially retract SVN r1976
EJAB-300 (EJAB-890). Check default privacy list when account, not
a specific session, receives a presence subscription
stanza (EJAB-300).
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 1999
2009-03-24 18:02:13 +00:00
3fce8ed570
Fix mistake when calling win32_dns.
...
SVN Revision: 1990
2009-03-11 18:36:27 +00:00
b6abe1b926
fix typo in previous patch backport
...
SVN Revision: 1988
2009-03-10 21:10:42 +00:00
69b11b677d
* doc/release_notes_2.0.4.txt: Added file for new release
...
SVN Revision: 1987
2009-03-10 16:25:20 +00:00
8f41436cd8
* src/tls/tls_drv.c: Fix encryption problem for ejabberd_http
...
after timeout (thanks to Alexey Shchepin)(EJAB-880)
SVN Revision: 1986
2009-03-10 15:21:36 +00:00
b0864396ec
typo fix on roster access_model
...
SVN Revision: 1983
2009-03-10 12:08:12 +00:00
dcac4ed8c8
Fix PEP with other domains and s2s (EJAB-825)
...
SVN Revision: 1981
2009-03-10 10:46:19 +00:00
74c202a714
* src/tls/tls_drv.c: Fix to support OpenSSL older than
...
0.9.8f (EJAB-877)(thanks to Jonathan Schleifer)
* doc/guide.tex: It is again supported OpenSSL older than 0.9.8f
* doc/guide.html: Likewise
SVN Revision: 1979
2009-03-09 19:17:53 +00:00
10b22b52ef
Merge 1925 from trunk.
...
* src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not
defined, the module takes an IP address of a local
hostname (thanks to Evgeniy Khramtsov)
SVN Revision: 1978
2009-03-09 14:44:46 +00:00
a6145084f1
* src/ejabberd_c2s.erl: Enforce privacy rules also for
...
subscription requests (EJAB-300)
* src/ejabberd_sm.erl: Likewise
SVN Revision: 1976
2009-03-07 08:59:26 +00:00
367002f89a
Merge 1856 from trunk.
...
* src/eldap/eldap.erl: moves waiting for response queries to
pending queue on an LDAP connection failure (thanks to Evgeniy
Khramtsov)
SVN Revision: 1974
2009-03-06 11:50:23 +00:00
75a8ebf293
Merge 1855 from trunk.
...
* src/eldap/eldap.erl: implemented queue for pending
queries (thanks to Evgeniy Khramtsov)
SVN Revision: 1973
2009-03-06 11:42:56 +00:00
4e17b1463b
Merge 1851 from trunk.
...
* src/eldap/eldap.erl: Close a connection on tcp_error (thanks to
Evgeniy Khramtsov)
SVN Revision: 1972
2009-03-06 11:39:12 +00:00
5c73d160cc
Merge 1682 from trunk.
...
* src/eldap/Makefile.in: added +optimize and +driver compilation
options (thanks to Evgeniy Khramtsov)
* src/eldap/Makefile.win32: Likewise
SVN Revision: 1971
2009-03-06 11:34:27 +00:00
ac69fbb24d
* src/ejabberd_app.erl: In a Windows machine, explicitly add the
...
nameservers, as it seems Erlang does not do itself (EJAB-860)
* src/win32_dns.erl: Get name servers from Windows registy (thanks
to Geoff Cant)
SVN Revision: 1968
2009-03-05 20:03:18 +00:00
3454f2fe04
* doc/guide.tex: Require OpenSSL 0.9.8f or higher (EJAB-877)
...
* doc/guide.html: Likewise
SVN Revision: 1967
2009-03-05 19:48:24 +00:00
5374c0b069
* src/ejabberd_auth.erl: If anonymous auth is enabled, when
...
checking if the account already exists in other auth methods, take
into account if the auth method failed (EJAB-882)
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
SVN Revision: 1966
2009-03-04 18:34:02 +00:00
e4db030f4e
Allow node creation without configure item
...
SVN Revision: 1962
2009-03-04 01:10:44 +00:00
abbfa96fc4
backport typo fix from trunk
...
SVN Revision: 1959
2009-03-04 00:01:19 +00:00
55942d1f4a
Add roster subscriptions handling and make PEP events sent to all resources
...
SVN Revision: 1957
2009-03-03 22:42:52 +00:00
06abf6331b
Merge fix from trunk r1910
...
* src/web/ejabberd_http.erl: Added a workaround for inet:peername
returning 'ebadf'
SVN Revision: 1928
2009-02-27 16:19:19 +00:00
8be6b8df76
Merge fix from trunk r1190
...
* src/cyrsasl_digest.erl: Unquote backslash in DIGEST-MD5 quoted
strings (EJAB-304)
SVN Revision: 1927
2009-02-27 15:57:35 +00:00
a1e7e737bf
* src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
...
and recent Openfire (thanks to Philipp Hancke)(EJAB-877)
SVN Revision: 1926
2009-02-27 15:42:27 +00:00
fa08801574
* doc/guide.tex: No mention to the release date in ejabberd Guide
...
or release notes. The date of an ejabberd release is determined by
the date of the corresponding release announcement.
SVN Revision: 1922
2009-02-26 23:10:28 +00:00
dcb05c4061
Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854)
...
SVN Revision: 1911
2009-02-23 15:51:01 +00:00
6ea29663a3
Merge r1880 from trunk:
...
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
must provide the password, like other participants (EJAB-867)
SVN Revision: 1906
2009-02-21 09:37:05 +00:00
ad48607327
Merge r1879 from trunk:
...
* src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
linkifying only a few known protocols (EJAB-850)
SVN Revision: 1905
2009-02-21 09:30:23 +00:00
fea7eac245
Merge r1877 from trunk:
...
* src/mod_roster.erl: When account is deleted, cancel presence
subscription for all roster items (EJAB-790)
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 1904
2009-02-21 09:28:58 +00:00
b1f3d56beb
Merge r1874 from trunk:
...
* src/mod_shared_roster.erl: Fix bug: a pending subscription
request, and later the requester added to the roster due to a
shared roster group, that request could neither be accepted or
rejected (thanks to Brian Cully)(EJAB-869)
SVN Revision: 1903
2009-02-21 09:27:27 +00:00
7c6ccbb744
Merge r1864 from trunk:
...
* src/mod_pubsub/mod_pubsub.erl: The table pubsub_node in ejabberd
older than 2.0.2 had indexes for parentid and type. This is not
required since ejabberd 2.0.2, so those indexes can be
deleted. (EJAB-669)
SVN Revision: 1902
2009-02-21 09:26:12 +00:00
02d7d0aa4c
Merge r1862 from trunk:
...
* doc/Makefile: In Clean do not remove html. In new Distclean, remove also html.
SVN Revision: 1901
2009-02-21 09:24:57 +00:00
7b10b69031
Merge r1861 from trunk:
...
* doc/Makefile: When cleaning, remove contributed_modules.tex
SVN Revision: 1900
2009-02-21 09:23:42 +00:00
606b1d1b52
Merge r1858 from trunk:
...
* doc/guide.tex: Provide only an example of language option
* doc/guide.html: Likewise
SVN Revision: 1899
2009-02-21 09:22:51 +00:00
2cd587bec5
Merge r1854 from trunk:
...
* doc/guide.tex: mod_muc can run in several nodes of cluster
* doc/guide.html: Likewise
SVN Revision: 1898
2009-02-21 09:21:31 +00:00
f6ee802960
Merge r1850 from trunk:
...
* src/odbc/mysql.sql: Fix complain about comment syntax
* src/odbc/pg.sql: Likewise
SVN Revision: 1897
2009-02-21 09:19:56 +00:00
e6ecb38ed9
Merge r1836 from trunk:
...
* doc/guide.tex: Explain that account creation is only supported
by internal and odbc authentication methods
* doc/guide.html: Likewise
SVN Revision: 1896
2009-02-21 09:19:11 +00:00
cd29a77759
Merge r1822 and partial r1834 from trunk:
...
* src/mod_privacy.erl: Privacy list items must be processed in the
specified order (EJAB-848)
* src/mod_privacy_odbc.erl: Likewise
SVN Revision: 1895
2009-02-21 09:15:43 +00:00
677387bc80
Merge r1666 from trunk:
...
* src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
* src/mod_shared_roster.erl: Likewise
SVN Revision: 1894
2009-02-21 09:12:59 +00:00
f362fe93ec
fix nodetree plugin resolver
...
SVN Revision: 1888
2009-02-19 11:24:26 +00:00
9b6343faa4
prevent from calling get_vh_registered_users/2 when not available
...
SVN Revision: 1870
2009-02-13 13:30:20 +00:00
1b0ea74818
* doc/release_notes_2.0.3.txt: Minor changes
...
SVN Revision: 1818
2009-01-13 18:05:06 +00:00
d87336e12e
* src/tls/Makefile.win32: Windows compilation support.
...
* src/tls/tls_drv.c: Likewise.
* src/tls/stdint.h: Likewise.
* doc/guide.tex: Update Erlang version in Windows compilation documentation.
SVN Revision: 1817
2009-01-13 16:36:10 +00:00
32805c3ba1
* src/msgs/pl.po: Fix typo (thanks to Apag0r)(EJAB-844)
...
SVN Revision: 1814
2009-01-12 23:47:07 +00:00
19966a7353
* doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842)
...
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text
SVN Revision: 1805
2009-01-12 14:52:59 +00:00
Jérôme Sautret