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,021 Commits 7 Branches 109 Tags 65 MiB
7d3d008940
Commit Graph

3021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Evgeniy Khramtsov
aad740f34c LDAP StartTLS support 
Conflicts:

	src/ejabberd_auth_ldap.erl
	src/eldap/eldap.erl
	src/mod_shared_roster_ldap.erl
	src/mod_vcard_ldap.erl
	src/tls/tls.erl
 2012-09-13 17:59:45 +10:00
Evgeniy Khramtsov
a70c72e50e Move SM dispatchers code in a separate file 
and make it more robust (EJABS-1845)

Conflicts:

	src/ejabberd_sm.erl
	src/ejabberd_sup.erl
 2012-09-13 17:09:32 +10:00
Evgeniy Khramtsov
a2fdc75730 Add forgotten file 2012-09-13 17:04:23 +10:00
Evgeniy Khramtsov
b82789f11d Make gen_iq_handlers more robust (EJABS-1758) 
Conflicts:

	src/ejabberd_local.erl
	src/ejabberd_sm.erl
	src/gen_iq_handler.erl
 2012-09-13 17:04:13 +10:00
Evgeniy Khramtsov
6b7d70adf6 Do not close session with an item-not-found error when 
receiving duplicate request with same rid as the currently
active one (EJABS-1844) (thanks to Pawel Chmielowski)

Conflicts:

	src/web/ejabberd_bosh.erl
 2012-09-13 16:50:54 +10:00
Badlop
10f10a2fd3 Allow multiple fqdn values in configuration (EJAB-1578) 2012-09-12 19:55:00 +02:00
Badlop
35c4e740ab Fix recent commit "Reduce size..." 2012-09-12 19:48:18 +02:00
Christophe Romain
e3085a4d48 put cleaning code to pubsub_debug 2012-09-12 15:08:39 +02:00
Janusz Dziemidowicz
e8d008c392 Reduce size of XML stream state 
This makes size of hibernated ejabberd_receiver a lot smaller (from
~290 words down to ~40).
 2012-09-11 21:27:16 +02:00
Badlop
674ab27700 Send announce Message stanzas as Headline type instead of Normal 2012-09-11 20:32:29 +02:00
Badlop
9442a583bc Check node name is available before starting ejabberd (EJAB-1572) 2012-09-11 20:22:56 +02:00
Badlop
9787416e88 Fix file name of Name Service Switch (thanks to Konstantin Khomoutov) 2012-09-11 19:38:38 +02:00
Badlop
fbe2995696 Update Slovak translation (thanks to Marek Bečka) 2012-09-11 17:39:37 +02:00
Christophe Romain
33251cd5a8 fix configure to display generic version 2012-09-11 17:27:31 +02:00
Christophe Romain
f387934886 update copyright date to 2012 2012-09-11 17:18:22 +02:00
Badlop
fb39b163df Explain that 2 LDAP connections are established per vhost 2012-09-11 16:30:22 +02:00
Christophe Romain
011535f0de binary refactoring 2012-09-11 15:45:59 +02:00
Evgeniy Khramtsov
75d3152a0f Merge branch '2.1.x' into 2.2.x 
Conflicts:
	src/mod_muc/mod_muc.erl
	src/mod_muc/mod_muc_room.erl
	src/mod_offline.erl
	src/mod_offline_odbc.erl
	src/mod_shared_roster.erl
	src/web/ejabberd_http_bind.erl
 2012-05-04 14:19:52 +10:00
Paweł Chmielowski
6c94d040fa Repeated http-bind request should abort only requests with same rid 
Before this change, when request with repeat rid was received any waiting
request was aborted (but only after next request was delivered). With this
change, only request with identical rid are aborted and this is done
immediately
 2012-05-03 11:44:34 +02:00
Paweł Chmielowski
e8921d79ba Receiving missing http-bind request shouldn't close waiting out-ouf-order request 2012-05-03 11:44:21 +02:00
Evgeniy Khramtsov
db8bd0126b Remove CRLFs introduced in the previous merge 2012-05-03 18:34:53 +10:00
Evgeniy Khramtsov
6719d9669b Fix get_subscription_lists/4 2012-04-29 19:34:57 +10:00
Paweł Chmielowski
8b13226d00 Do not trigger item-not-found errors in mod_http_bind (part of EJABS-1827) 
This changes what happens to request received with out of order rid,
previously response to such request was send immediately, and client was
free to submit another request, which triggered item-not-found if it was
delivered before request with missing rid.

This change make us wait for sending response to out of order request until
request with missing rid arrives. It also queues all outgoing data before
that condition is meet.
 2012-04-27 13:23:19 +02:00
Paweł Chmielowski
545f9ce525 Do not trigger item-not-found errors in mod_http_bind (part of EJABS-1827) 
This changes what happens to request received with out of order rid,
previously response to such request was send immediately, and client was
free to submit another request, which triggered item-not-found if it was
delivered before request with missing rid.

This change make us wait for sending response to out of order request until
request with missing rid arrives. It also queues all outgoing data before
that condition is meet.
 2012-04-27 13:19:49 +02:00
Evgeniy Khramtsov
437f68a9f3 Merge SQL and Mnesia code into one module (EJAB-1560) 2012-04-27 19:52:05 +10:00
Christophe Romain
7f1e9d3972 merge from 2.1.11 and resolve conflicts 2012-04-27 11:37:11 +02:00
Badlop
453e249de3 Update ejabberd version number to 2.1.11 2012-04-26 16:04:16 +02:00
Badlop
8688030d7a Add ejabberd 2.1.11 release notes 2012-04-26 15:57:37 +02:00
Badlop
6e2003c2e2 Recompile translation files 2012-04-26 15:54:54 +02:00