Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00
Code Releases Activity
3,050 Commits 7 Branches 109 Tags 65 MiB
84eee8d5a7
Commit Graph

3050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexey Shchepin
84eee8d5a7 Preliminary Riak support 2012-11-21 11:28:49 +10:00
Badlop
a800a5d4df Test for binary arguments and results to get_roster command 2012-11-20 13:57:41 +01:00
Badlop
dfa47556d1 Add support for binary arguments and results to ejabberd_xmlrpc 2012-11-20 13:57:41 +01:00
Badlop
77111aeec1 Add support for binary arguments to ejabberd_xmlrpc 2012-11-20 12:43:59 +01:00
Badlop
c9ac75474f Update to xmlrpc-rds13 
Cloned from
https://github.com/rds13/xmlrpc
 2012-11-20 12:43:54 +01:00
Pablo Polvorin
0fcaef0566 Backward compatibility for xep-0280 v0.6 (EJABS-1953) 
make mod_carboncopy supports v0.8 and v0.6
 2012-11-19 16:05:23 -03:00
Badlop
031c7412a8 Partially revert "Fix and document persistent_history MUC option (EJABS-1865)" 
This reverts commit ab9ac62138.
 2012-11-19 13:28:57 +01:00
Evgeniy Khramtsov
594ff79514 Make terms serialization faster 
Conflicts:

	src/odbc/ejabberd_odbc.erl
 2012-11-18 12:30:36 +10:00
Evgeniy Khramtsov
8f3f74a6d7 Only migrate C2S processes with remote sockets 
Conflicts:

	src/ejabberd_c2s.erl
	src/ejabberd_sm.erl
 2012-11-16 20:36:40 +10:00
Evgeniy Khramtsov
ff2050b301 Clean tables from remote pids when their node goes down 
Conflicts:

	src/ejabberd_sm.erl
	src/mod_muc/mod_muc.erl
	src/web/mod_bosh.erl
 2012-11-15 15:16:42 +10:00
Pablo Polvorin
89ea1dd1c4 Adapt to XEP-0280 v0.8 2012-11-14 12:57:25 -03:00
Pablo Polvorin
66902b788b Do not require special api for ejabberd_set 
Remove the pack() function, make mod_roster
return subscriptions splitted by {From, To, Both}
 2012-11-12 22:32:33 -03:00
Christophe Romain
ec8cb81c0d make sure publisher is #jid (TECH-1499) 2012-11-12 16:08:09 +01:00
Pablo Polvorin
1a24ac62e5 Change representation of JID sets 
Instead of a single set, use a map from domains to
resources (in presence sets the resource is usually empty) to
users.  This makes the sharing explicit

DomainA
	-> Resource1
		-> User1, User2, ..
	-> Resource2
		-> User3
DomainB
	->Resource3
		-> User4, User5, User6
 2012-11-11 22:25:20 -03:00
Pablo Polvorin
78fb913a00 Use a custom set module, reuse structs when possible. 
For JID sets in ejabberd_c2s
 2012-11-09 21:53:28 -03:00
Pablo Polvorin
e521c8368a Improvement 
Instead of traversing and constructing a new set,
share the set structure when constructing the pres_a
set.
 2012-11-09 16:58:47 -03:00
Pablo Polvorin
ac8c536b50 Improvement 
Force the binary to be a heap binary, rather than
keeping it as a refcount or sub-binary
 2012-11-09 16:57:23 -03:00
Badlop
84d9ee07b4 Document MUC domain_balancing broadcast (EJABS-1866) 2012-11-06 10:54:58 +01:00
Badlop
ab9ac62138 Fix and document persistent_history MUC option (EJABS-1865) 2012-11-02 13:21:50 +01:00
Evgeniy Khramtsov
beaf351ba4 Document mod_admin_p1 module 2012-11-01 18:48:23 +10:00
Alexey Shchepin
37d3a4e1f5 Merge branch '3.0.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 3.0.x 2012-10-30 14:18:32 +02:00
Alexey Shchepin
566c046cd5 Fixed "message" tag checking in standby mode 2012-10-30 14:17:49 +02:00
Badlop
df921fef40 Show binaries as strings in WebAdmin; handle tab characters. 2012-10-30 13:05:30 +01:00
Alexey Shchepin
56e7affdfd Don't try to send privacy pushes in OOR mode (a line was not removed in the previous commit) 2012-10-30 13:45:04 +02:00
Alexey Shchepin
bef66dba24 Don't try to send privacy pushes in OOR mode 2012-10-30 13:29:15 +02:00
Pablo Polvorin
e62af41fa8 Fix mod_ack:user_send_packet/3 signature (thanks zzolkiewski) 
That hook has 4 arguments
 2012-10-29 12:25:44 -03:00
Badlop
472089a328 Show binaries in a pretty format in WebAdmin 2012-10-29 13:40:50 +01:00
Evgeniy Khramtsov
c4d582ace4 Add the guide for commercial usage 2012-10-29 20:15:46 +10:00
Evgeniy Khramtsov
a4e320c263 Get rid of dreaded tuple_to_list(now()) 2012-10-26 20:02:25 +10:00
Evgeniy Khramtsov
7d3d008940 Fix data convertion 2012-10-25 22:42:58 +10:00
Evgeniy Khramtsov
3be9c27509 "epam" should return binaries, not strings 2012-10-24 18:09:11 +10:00
Evgeniy Khramtsov
3ef6e4c834 Process 'max_s2s_connections' and 'max_s2s_connections_per_node' 
options correctly
 2012-10-23 21:16:05 +10:00
Alexey Shchepin
a15e689386 Merge branch '3.0.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 3.0.x 2012-10-03 16:22:32 +03:00
Alexey Shchepin
7c8a452b00 Fixed a typo in ejabberd_s2s_in SUPERVISOR_START definition 2012-10-03 16:21:54 +03:00
Christophe Romain
e5d202a0bf clean the pubsub odbc patch 2012-10-01 11:48:08 +02:00
Evgeniy Khramtsov
083dfe01ea Check a node of a migrating process (EJABS-1908) 2012-09-27 12:39:52 +10:00
Christophe Romain
f0c745b916 add OSX compatibility note 2012-09-26 09:55:30 +02:00
Badlop
9ff1a80db4 Fix record definition (EJAB-1578) 2012-09-18 17:50:53 +02:00
Evgeniy Khramtsov
5480ee29fd Fix spec 2012-09-18 23:39:40 +10:00
Evgeniy Khramtsov
0d4b0b4218 Fix dialyzer types 2012-09-18 23:30:28 +10:00
Paweł Chmielowski
cfe396e155 Don't forget about webscoket_handlers in pipelined http requests 2012-09-14 18:34:58 +02:00
Paweł Chmielowski
2163cbb22e Make websocket work over tls 2012-09-14 18:29:16 +02:00
Paweł Chmielowski
6b3f228327 Unify paths for handling websocket and regular http requests 
This allow to easily produce html output from error paths in websocket code,
and this ability is used to produce informational page when regular http
request is directed to websocket url. Additionally HEAD and OPTIONS request
are now handled correctly.
 2012-09-14 17:51:54 +02:00
Paweł Chmielowski
e58e6a09dd Unify GET and POST handling code 
Code for both it almost identical, extract all differences to separate
function extract_path_query.
 2012-09-14 17:11:35 +02:00
Paweł Chmielowski
2d05ddd466 Fix syntax error in ejabberd_websocket 2012-09-14 16:07:58 +02:00
Paweł Chmielowski
975f4c56d4 Don't try to decode utf-8 codepoints in ej_websocket only to convert it back to utf-8 in ej_http_ws 
Additionally that conversion code was wrong sometimes and lead to loosing
some bits of information.

This fixes EJABS-1875
 2012-09-14 10:20:33 +02:00
Paweł Chmielowski
8eef2f02bf Properly handle websocket sub-protocols 2012-09-14 10:15:32 +02:00
Paweł Chmielowski
2f7c69fd14 Properly handle close op in websocket 2012-09-14 10:05:42 +02:00
Pablo Polvorin
02eeebd41a Fix mod_ack, make it work with both oor and normal clients. 
If the client is able to go to oor, mod_ack must made it do so.
If the client is not able to to go oor mode,  mod_ack must stop
the c2s session, and wait for it to really terminate before
continuing (to avoid race conditions, see EJABS-1677).

Conflicts:

	src/ejabberd_c2s.erl
	src/mod_ack.erl
	src/mod_ping.erl
 2012-09-13 14:05:36 -03:00
Pablo Polvorin
99610c3357 Make mod_ack work with applepush (TECH-1463) (thanks aleksey) 
Do not forcelly kill the c2s process.

Conflicts:

	src/mod_ack.erl

Conflicts:

	src/mod_ack.erl
 2012-09-13 13:50:39 -03:00