Badlop
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
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Christophe Romain
e4db030f4e
Allow node creation without configure item
...
SVN Revision: 1962
2009-03-04 01:10:44 +00:00
Christophe Romain
abbfa96fc4
backport typo fix from trunk
...
SVN Revision: 1959
2009-03-04 00:01:19 +00:00
Christophe Romain
55942d1f4a
Add roster subscriptions handling and make PEP events sent to all resources
...
SVN Revision: 1957
2009-03-03 22:42:52 +00:00
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Christophe Romain
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
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Badlop
7b10b69031
Merge r1861 from trunk:
...
* doc/Makefile: When cleaning, remove contributed_modules.tex
SVN Revision: 1900
2009-02-21 09:23:42 +00:00
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Badlop
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
Christophe Romain
f362fe93ec
fix nodetree plugin resolver
...
SVN Revision: 1888
2009-02-19 11:24:26 +00:00
Christophe Romain
9b6343faa4
prevent from calling get_vh_registered_users/2 when not available
...
SVN Revision: 1870
2009-02-13 13:30:20 +00:00
Badlop
1b0ea74818
* doc/release_notes_2.0.3.txt: Minor changes
...
SVN Revision: 1818
2009-01-13 18:05:06 +00:00
Mickaël Rémond
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
Badlop
32805c3ba1
* src/msgs/pl.po: Fix typo (thanks to Apag0r)(EJAB-844)
...
SVN Revision: 1814
2009-01-12 23:47:07 +00:00
Badlop
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
Christophe Romain
be99c4b0eb
prevent unauthorized entity to gain none-affiliation for given entity
...
SVN Revision: 1801
2009-01-11 04:07:39 +00:00
Christophe Romain
da893f4293
fix owners cache and fix unsubscribe permissions (EJAB-840)
...
SVN Revision: 1798
2009-01-11 01:41:22 +00:00
Christophe Romain
6e04bcbbf8
fix unsubscription of full jid subscribed node (EJAB-839)
...
SVN Revision: 1793
2009-01-10 13:35:34 +00:00
Badlop
053f45ab39
* doc/release_notes_2.0.3.txt: New file for new release
...
SVN Revision: 1790
2009-01-09 14:10:14 +00:00
Badlop
3e12700e11
* doc/guide.tex: Improve explanation of backup commands
...
* doc/guide.html: Likewise
SVN Revision: 1789
2009-01-09 14:04:56 +00:00
Badlop
048b1a5db3
* src/web/ejabberd_web_admin.erl: New appearance of WebAdmin logo,
...
fixed logo-fill.
SVN Revision: 1788
2009-01-09 13:42:15 +00:00
Badlop
012a0529a8
* src/mod_configure.erl: Fix access check for vhost configuration
...
SVN Revision: 1787
2009-01-09 00:39:57 +00:00
Christophe Romain
553b402d03
fix EJAB-701 and EJAB-836
...
SVN Revision: 1786
2009-01-08 21:53:23 +00:00
Mickaël Rémond
efaf182d54
* src/ejabberd_listener.erl: Define send timeout option to avoid blocking on socket send (EJAB-746).
...
* src/ejabberd_s2s_out.erl: Likewise.
SVN Revision: 1785
2009-01-08 21:01:27 +00:00
Badlop
2c5b0fb896
* src/msgs/ru.po: Fix typo (thanks to Dominges)
...
* src/msgs/ru.msg: Likewise
SVN Revision: 1776
2009-01-06 15:09:53 +00:00
Alexey Shchepin
04ff0c2f6f
* src/tls/tls_drv.c: Added a flag to avoid certificate validation
...
* src/tls/tls.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 1775
2009-01-05 17:27:30 +00:00
Badlop
b32793efcf
* src/*.erl: Fix EDoc comments
...
SVN Revision: 1772
2009-01-03 21:31:36 +00:00
Christophe Romain
ee02b0b57f
PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix
...
SVN Revision: 1765
2009-01-03 00:23:58 +00:00
Mickaël Rémond
5141edd757
* src/ejabberd_c2s.erl: Remove useless comment and port Alexey fix to 2.0.x branch.
...
SVN Revision: 1764
2008-12-29 12:06:34 +00:00
