25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-24 17:29:28 +01:00
Commit Graph

2630 Commits

Author SHA1 Message Date
Evgeniy Khramtsov
1922bf21f0 Do not try to start TLS twice when front-end socket is used 2011-05-05 19:02:34 +10:00
Evgeniy Khramtsov
c98ddeb59f Merge branch '2.1.x' into 2.2.x
Conflicts:
	src/ejabberd_captcha.erl
	src/expat_erl.c
	src/mod_muc/mod_muc_room.erl
2011-05-04 00:04:10 +10:00
Evgeniy Khramtsov
613214da18 Do not add p1:pushed more than once 2011-05-03 23:01:05 +10:00
Evgeniy Khramtsov
84c1cf8033 Do not accept XML with undefined prefixes (EJAB-680) 2011-05-03 20:26:07 +10:00
Evgeniy Khramtsov
38693a670b Process ejabberd_sm messages using several dispatchers (EJABS-1653) 2011-05-02 22:37:33 +10:00
Badlop
5a0cfe7e2b Reorganize the push_item function, and handle version not_found (EJAB-1420) 2011-04-29 20:34:08 +02:00
Badlop
714dce84db No need to inform that XEP-0237 is optional; clarified in XEP version 1.2 2011-04-29 20:34:06 +02:00
Evgeniy Khramtsov
a97a60a888 Fix previous merge 2011-04-29 20:53:15 +10:00
Badlop
b807b21a59 Show configuration for HTTPS http_bind 2011-04-28 13:24:18 +02:00
Evgeniy Khramtsov
49365da481 Stringprep JID before get_node calculation 2011-04-27 15:22:25 +10:00
jabber
70e84021f2 Remove global lock if there are no nodes available 2011-04-27 15:17:54 +10:00
Evgeniy Khramtsov
24e033ac79 Initialize cluster before modules start 2011-04-27 15:15:49 +10:00
Evgeniy Khramtsov
658ab235ba Get rid of pg2 in cluster nodes 2011-04-27 15:15:19 +10:00
Evgeniy Khramtsov
2f16a160c0 Shadow unused variable 2011-04-27 15:07:18 +10:00
Evgeniy Khramtsov
4a2f62062e New migration procedure 2011-04-27 15:07:10 +10:00
Badlop
4f4c8eb61e mod_register Access now also controls account unregistrations 2011-04-26 22:55:04 +02:00
Badlop
3952888f94 Escape user input in mod_privacy_odbc (EJAB-1442) 2011-04-26 20:57:48 +02:00
Badlop
9b145385af Throw error when captcha fails at server start, not later at runtime 2011-04-26 13:59:08 +02:00
jabber
897b46c31d Do not decrease MUC admin's role/affiliation 2011-04-18 21:06:05 +10:00
Evgeniy Khramtsov
72299ab078 Add captcha_limit option to the example config 2011-04-18 16:16:10 +10:00
Evgeniy Khramtsov
e7ab83b612 Remove forgotten -compile(export_all). 2011-04-18 16:09:05 +10:00
Evgeniy Khramtsov
07cf6f09b8 Implement CAPTCHA limit 2011-04-18 16:06:36 +10:00
Evgeniy Khramtsov
252ee6228b Fix syntax error 2011-04-18 15:50:24 +10:00
Evgeniy Khramtsov
cf6264f507 CAPTCHA whitelist support 2011-04-18 15:47:06 +10:00
Badlop
4f1ececbd1 Try to improve support for roster_version in MSSQL (EJAB-1437) 2011-04-14 23:11:37 +02:00
Badlop
70bf5b4eda The responses to HEAD must have empty Body 2011-04-12 23:31:08 +02:00
Badlop
f59a979f7c Support as read-only HTTP method not only GET, also HEAD 2011-04-12 23:13:46 +02:00
Badlop
05e3893f60 If extauth script crashes, ejabberd should restart it (EJAB-1428) 2011-04-11 21:27:19 +02:00
Badlop
7d7621c67c Support more captcha_host value formats (EJAB-1418) 2011-04-11 19:59:26 +02:00
Christophe Romain
33d4126290 merge with latest 2.1.x (pre 2.1.7) 2011-04-11 15:47:04 +02:00
Badlop
449e56ed52 Send jid attribute when occupant is banned (EJAB-1432) 2011-04-07 12:54:39 +02:00
Badlop
aded966370 mod_ping uses iqdisc no_queue by default (thanks to Chris Moos)(EJAB-1435) 2011-04-07 12:08:31 +02:00
Badlop
dac1f328d7 Clarify {iqdisc, no_queue} 2011-04-07 12:06:31 +02:00
Badlop
90ea752046 Updated Japanese translation (thanks to Mako N) 2011-03-30 19:18:26 +02:00
Alexey Shchepin
494add4fd0 Updated rebind from the latest 2.2.x-applepush branch 2011-03-21 19:11:05 +02:00
Christophe Romain
3b7458bbc2 fir state initialization 2011-03-18 18:59:44 +01:00
Christophe Romain
f05a4d1638 typo fix 2011-03-18 17:41:56 +01:00
Christophe Romain
75d2cbcb14 add nodeidx as index on pubsub_state and pubsub_item 2011-03-18 17:36:08 +01:00
Christophe Romain
f9fa168d84 prevent from creating empty pubsub_subscription record 2011-03-18 15:17:13 +01:00
Badlop
e4b3bd5005 Fix typo (thanks to Krzee) 2011-03-17 12:15:31 +01:00
Christophe Romain
5ad1d08b89 SSL sockets don't compute length of data (EJABS-1460) 2011-03-15 13:53:38 +01:00
Christophe Romain
dcb068c7ad Correctly handle ssl requests split into multiple ip (EJABS-1460) 2011-03-15 13:52:35 +01:00
Christophe Romain
2d32d2f25e Enable workarounds for broken clients in tls layer (EJABS-1460) 2011-03-15 13:51:49 +01:00
Badlop
abcbcd1f2c Update the changed string in the PO translation files 2011-03-13 18:34:55 +01:00
Badlop
18fd67b311 Change string in WebAdmin to reuse an existing one 2011-03-13 18:34:50 +01:00
Badlop
b116957982 Fix bashism and make some lines similar to master branch (EJAB-1404) 2011-03-09 16:25:05 +01:00
Badlop
a1f20a5bc0 If the port number isn't listener, then specify the protocol (EJAB-1418) 2011-03-03 11:38:00 +01:00
Badlop
e0d14c3b8d captcha_host must have the port number to get protocol (EJAB-1418) 2011-03-03 00:02:43 +01:00
Badlop
1548a18b5e mod_irc must send presence unavailable to the departing occupant (EJAB-1417) 2011-03-01 22:33:11 +01:00
Badlop
339fa6e41b ejabberdctl needs space between INET_DIST_INTERFACE (thanks to Dale Chase)(EJAB-1416) 2011-02-28 18:40:45 +01:00