Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-10 16:58:46 +01:00
Code Releases Activity
3,301 Commits 7 Branches 109 Tags 67 MiB
7d3633e91c
Commit Graph

3301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Sébastien Pédron
6a3436b1c4 Merge from trunk (r1709 to r1730). 
Ejabberd should be usable again.

PR:		EJABP-1

SVN Revision: 1731
 2008-12-16 13:16:56 +00:00
Jean-Sébastien Pédron
62f9f6e6c5 Convert to exmpp the parts in mod_pubsub recently merged from trunk. 
Warning: Ejabberd is unusable because the rest of trunk hasn't been
merged yet!

PR:		EJABP-1

SVN Revision: 1730
 2008-12-16 10:31:08 +00:00
Christophe Romain
96aaba738b fix get_item_name deadlock on transaction 
SVN Revision: 1729
 2008-12-15 19:58:53 +00:00
Christophe Romain
a800ac5a4e fix get_item_name deadlock on transaction 
SVN Revision: 1728
 2008-12-15 19:55:35 +00:00
Alexey Shchepin
620cbc765c * src/ejabberd_c2s.erl: Bugfix in "from" attribute checking 
SVN Revision: 1727
 2008-12-12 13:08:00 +00:00
Jean-Sébastien Pédron
f83fc51960 Replace stringprep by exmpp_stringprep. 
PR:		EJABP-1

SVN Revision: 1726
 2008-12-10 14:44:08 +00:00
Christophe Romain
e1575e3177 fix typo bug injected in r1712 
SVN Revision: 1725
 2008-12-09 22:42:34 +00:00
Christophe Romain
6e5a32308a fix typo bug injected in r1712 
SVN Revision: 1724
 2008-12-09 22:42:01 +00:00
Christophe Romain
3d28a7837d minor bugfix 
SVN Revision: 1723
 2008-12-09 22:09:30 +00:00
Christophe Romain
e8635b99c8 prevent publish items with invalid XML schema (EJAB-699) 
SVN Revision: 1722
 2008-12-09 22:02:47 +00:00
Christophe Romain
44b4c29d08 lattest pubsub merge added in Changelog 
SVN Revision: 1721
 2008-12-09 00:35:27 +00:00
Christophe Romain
9f2fda6060 merge to lattest trunk r1716 
SVN Revision: 1720
 2008-12-09 00:32:36 +00:00
Christophe Romain
07e9ad307e cosmetic change (intentation and spaces) 
SVN Revision: 1719
 2008-12-08 23:28:50 +00:00
Christophe Romain
23ce0b312d remove pubsub_state record when unsubscribing node without affiliation (EJAB-776) 
SVN Revision: 1717
 2008-12-08 21:47:50 +00:00
Christophe Romain
dceb817853 reply to suscriptions options queries with unsupported feature error (EJAB-713) 
SVN Revision: 1716
 2008-12-08 21:17:46 +00:00
Christophe Romain
c443ee4f4a several pubsub improvements 
SVN Revision: 1715
 2008-12-08 19:50:50 +00:00
Christophe Romain
e2d8154a80 Reduce memory consumption due to caps handling 
SVN Revision: 1712
 2008-12-08 14:10:55 +00:00
Jean-Sébastien Pédron
3bfb2b5cc1 Merge from trunk (r1692 to r1709). 
PR:		EJABP-1

SVN Revision: 1710
 2008-12-08 12:02:27 +00:00
Jean-Sébastien Pédron
82b97b9639 Finish the conversion of mod_pubsub to Exmpp. 
PR:		EJABP-1

SVN Revision: 1709
 2008-12-08 11:21:32 +00:00
Jean-Sébastien Pédron
d01c24bd23 Fix acl:match_rule/3 call. It takes a #jid record, not a short JID. 
PR:		EJABP-1

SVN Revision: 1708
 2008-12-08 11:20:21 +00:00
Mickaël Rémond
4618ec1fef * src/ejabberd_c2s.erl: Enforce client stanza from attribute (EJAB-812). 
* src/jlib.erl: Likewise.

SVN Revision: 1706
 2008-12-08 09:21:36 +00:00
Jean-Sébastien Pédron
163d185776 First pass of Exmpp conversion for mod_pubsub. 
CAUTION:
o  Several modules aren't converted yet.
o  Existent Mnesia tables written to disc are not updated.
o  There must be bugs, mostly because of the mix between #jid record
and short JIDs.
PR:		EJABP-1

SVN Revision: 1705
 2008-12-05 15:13:09 +00:00
Jean-Sébastien Pédron
6305ddca18 Add the module and function names to the error message, when a module 
crash.

SVN Revision: 1704
 2008-12-05 15:08:03 +00:00
Jean-Sébastien Pédron
b82b66fdf0 Update Exmpp XML parser options. 
SVN Revision: 1703
 2008-12-05 15:06:49 +00:00
Badlop
8e32cc11cb Fix default value of default_room_options (thanks to Aleksey Shchepin) 
SVN Revision: 1702
 2008-12-03 15:06:21 +00:00
Jean-Sébastien Pédron
b425093813 Convert mod_proxy65 to exmpp. 
SVN Revision: 1701
 2008-12-03 14:34:43 +00:00
Jérôme Sautret
9e679aa621 * src/odbc/ejabberd_odbc.erl: close MySQL connections on terminate (needs mysql r829) 
SVN Revision: 1700
 2008-12-03 10:58:19 +00:00
Badlop
bc9ba75c2b No need to define default value of history field because it is explicitely set when the record is created 
SVN Revision: 1699
 2008-12-02 19:45:39 +00:00
Badlop
f124bb3d10 * src/mod_muc/mod_muc_room.erl: Move definitions to header file 
* src/mod_muc/mod_muc_room.hrl: New header file
* src/Makefile.in: Likewise

SVN Revision: 1698
 2008-12-02 19:23:12 +00:00
Badlop
60ae1b47c5 * doc/guide.tex: New subsection Database Connection 
* doc/guide.html: Likewise

SVN Revision: 1697
 2008-12-01 17:45:01 +00:00
Jean-Sébastien Pédron
f30d2b9f1c Fix two warnings about unused variables. 
PR:		EJABP-1

SVN Revision: 1696
 2008-12-01 15:54:57 +00:00
Jean-Sébastien Pédron
9e96043255 Merge from trunk (r1649 to r1692). 
PR:		EJABP-1

SVN Revision: 1695
 2008-12-01 15:53:30 +00:00
Jean-Sébastien Pédron
bd300e870c Convert mod_muc to Exmpp. 
PR:		EJABP-1
Submitted by:	Pablo Polvorin <pablo.polvorin@process-one.net>

SVN Revision: 1692
 2008-12-01 15:01:27 +00:00
Jean-Sébastien Pédron
e06f533f6b Start the exmpp application. 
PR:		EJABP-1
Submitted by:	Pablo Polvorin <pablo.polvorin@process-one.net>

SVN Revision: 1691
 2008-12-01 15:00:36 +00:00
Jean-Sébastien Pédron
7088ba88a9 o In store_last_info/4, fix a bug where the status was not converted to 
list before calling ejabberd_odbc:escape/1.
o  In get_last_info/2, fix a bug where the status was returned as a list
instead of a binary.

SVN Revision: 1690
 2008-12-01 12:16:41 +00:00
Badlop
7348f4a553 Remove debug line from SVN r1685 
SVN Revision: 1689
 2008-11-28 19:51:30 +00:00
Alexey Shchepin
964cb84864 * src/mod_muc/mod_muc_room.erl: Clean user activity after timeout 
(EJAB-804)

SVN Revision: 1688
 2008-11-28 16:06:39 +00:00
Badlop
78b90e9300 * src/ejabberdctl.template: Fix detection of ejabberdctl.cfg path 
SVN Revision: 1687
 2008-11-26 18:02:41 +00:00
Badlop
340562e452 * src/mod_irc/mod_irc.erl: Announce disco#info (thanks to Spike) 
* src/mod_muc/mod_muc.erl: Announce disco#info disco#items
* src/mod_proxy65/mod_proxy65_service.erl: No announce disco#items
* src/mod_pubsub/mod_pubsub.erl: Announce disco#info disco#items
* src/mod_vcard.erl: Announce disco#info

SVN Revision: 1686
 2008-11-26 16:04:27 +00:00
Badlop
6a785fa536 * src/gen_mod.erl: First store module options in ETS and Mnesia, 
then start the module. In case of failure, remove options from
ETS. Until now the module was started before the options were
stored in database, and some modules started incorrectly because
they couldn't access the options from database; for instance
mod_muc_room required this for reading max_users option.

* src/mod_muc/mod_muc_room.erl: Include the value of max_users
service option and the current max_users room option in the list
of allowed room limit values.

SVN Revision: 1685
 2008-11-26 15:10:38 +00:00
Christophe Romain
e68a731219 pubsub/pep: get_node_affiliations resultset bugfix 
SVN Revision: 1684
 2008-11-25 23:05:26 +00:00
Evgeniy Khramtsov
11e5617efc * src/eldap/Makefile.in: added +optimize and +driver 
compilation options
* src/eldap/Makefile.win32: Likewise

SVN Revision: 1682
 2008-11-24 13:27:04 +00:00
Mickaël Rémond
cc858469ec * src/ejabberdctl.template: Added the ability to define the --config-dir option. 
SVN Revision: 1681
 2008-11-23 16:41:50 +00:00
Alexey Shchepin
c2d81c59b6 * src/ejabberd_receiver.erl: Hibernate after timeout 
* src/ejabberd_frontend_socket.erl: Likewise

SVN Revision: 1680
 2008-11-23 09:43:52 +00:00
Badlop
91b328b7d5 URL path should be tokenized by / and then decoded (EJAB-786). 
SVN Revision: 1679
 2008-11-12 10:03:27 +00:00
Badlop
9f110a6352 * src/web/ejabberd_http.erl: Include recognized headers in 
request_headers as atoms, and others as strings (EJAB-778)

SVN Revision: 1678
 2008-11-12 09:58:28 +00:00
Badlop
add568169e * doc/guide.tex: Improve legibility of mod_irc example config 
SVN Revision: 1677
 2008-11-12 00:21:47 +00:00
Alexey Shchepin
d5d89c2ab3 SVN Revision: 1676 2008-11-10 14:40:53 +00:00
Alexey Shchepin
4709ed58aa * src/tls/tls_drv.c: Don't create a SSL context on every 
connection and disable SSLv2 on outgoing connections (EJAB-781)

SVN Revision: 1675
 2008-11-10 14:32:51 +00:00
Mickaël Rémond
10e3f2cf92 * src/ejabberd_s2s_out.erl: exports the DNS resolution function. 
SVN Revision: 1674
 2008-11-08 17:50:54 +00:00