Jean-Sébastien Pédron
ff500d8297
Merge from trunk (r1787 to r1804).
...
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.
Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1766, r1768, r1781, r1783, r1794, r1797, r1799, r1802.
Warning: Ejabberd may be broken until the merge is completly finished.
PR: EJABP-1
SVN Revision: 1829
2009-01-19 14:47:33 +00:00
Jean-Sébastien Pédron
bc51bd0dbd
Merge from trunk (r1752 to r1764).
...
Warning: Ejabberd may be broken until the merge is completly finished.
PR: EJABP-1
SVN Revision: 1826
2009-01-19 11:16:44 +00:00
Jean-Sébastien Pédron
ab2b70f189
Merge from trunk (r1613 to 1649).
...
PR: EJABP-1
SVN Revision: 1650
2008-10-13 10:11:19 +00:00
Jean-Sébastien Pédron
4eaa8e19c9
Merge from trunk (r1457 to r1563).
...
SVN Revision: 1564
2008-09-16 14:39:57 +00:00
Mickaël Rémond
a664579b58
* src/ejabberd_c2s.erl: Added C2S blacklist support (EJAB-625).
...
* src/mod_ip_blacklist.erl: Likewise.
* src/jlib.erl: Added IP format tuple to string function.
* src/ejabberd_socket.erl: Properly handled c2s start failure (happen for blacklisted IP).
SVN Revision: 1317
2008-05-05 16:22:06 +00:00
Badlop
2d2fcc8210
* doc/guide.tex: Updated copyright dates to 2008
...
* src/*: Likewise
SVN Revision: 1153
2008-01-15 17:02:57 +00:00
Mickaël Rémond
56fe3579bb
* Applied copyright update patch 1.
...
SVN Revision: 1110
2007-12-24 11:41:41 +00:00
Alexey Shchepin
fa6b6b8f5a
* src/ejabberd_socket.erl: Added API for monitoring socket
...
processes
* src/ejabberd_frontend_socket.erl: Likewise
* src/ejabberd_c2s.erl: Added socket monitoring
* src/mod_muc/mod_muc_room.erl: Fixed the stop reason for the
destroy event
SVN Revision: 751
2007-04-12 06:08:32 +00:00
Alexey Shchepin
cd7595e3f4
* src/ejabberd_socket.erl: Added sockname/1 and peername/1
...
functions
* src/ejabberd_frontend_socket.erl: Likewise
* src/tls/tls.erl: Likewise
* src/ejabberd_zlib/ejabberd_zlib.erl: Likewise
* src/mod_private_odbc.erl: Private storage support using odbc
* src/odbc/pg.sql: Likewise
SVN Revision: 663
2006-10-19 04:46:24 +00:00
Alexey Shchepin
c72599cacd
* src/ejabberd_frontend_socket.erl: Support for frontend
...
connection manager
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_listener.erl: Likewise
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/ejabberd_socket.erl: Likewise
* src/web/ejabberd_http_poll.erl: Likewise
SVN Revision: 657
2006-10-01 01:53:37 +00:00
Alexey Shchepin
aa478100d8
* src/ejabberd_socket.erl: Support for non-xml sockets
...
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/web/ejabberd_http.erl: Likewise
SVN Revision: 629
2006-09-25 03:51:11 +00:00
Alexey Shchepin
0fe9caa304
* src/ejabberd_socket.erl: All XML socket operations moved here
...
* src/ejabberd_s2s_in.erl: Likewise
SVN Revision: 600
2006-09-05 04:36:01 +00:00
Alexey Shchepin
4d7cc9301a
* src/ejabberd_socket.erl: All XML socket operations moved here
...
* src/ejabberd_listener.erl: Updated
* src/ejabberd_receiver.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/mod_shared_roster.erl: Bugfix
* src/mod_roster_odbc.erl: Bugfix
SVN Revision: 599
2006-09-05 04:26:28 +00:00
