d5d906184f
Merge branch 'new_stream'
...
Conflicts:
src/cyrsasl.erl
src/ejabberd_c2s.erl
src/ejabberd_cluster.erl
src/ejabberd_frontend_socket.erl
src/ejabberd_node_groups.erl
src/ejabberd_router.erl
src/mod_bosh.erl
src/mod_ip_blacklist.erl
src/mod_muc_mnesia.erl
src/mod_offline.erl
src/mod_proxy65_sm.erl
2017-01-20 19:35:46 +03:00
1e55e018e5
Adopt remaining code to support new hooks
2017-01-09 17:02:17 +03:00
5fdd1c39fe
Update copyright date automatically ( #1442 )
2017-01-02 21:42:06 +01:00
e7fe4dc474
More refactoring on session management
2016-12-30 00:00:36 +03:00
309bdfbe28
Add xmpp_stream_out behaviour and rewrite s2s/SM code
2016-12-28 09:47:11 +03:00
7f653cfe76
Rewrite ejabberd_service to use new XMPP stream API
2016-12-11 18:24:51 +03:00
534e73f732
Uncomment forgotten block of code
2016-11-12 14:51:43 +03:00
78a44e0176
Merge branch 'master' into xml-ng
...
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
2016-11-12 13:27:15 +03:00
4c5460f0bd
Get rid of compile warnings for random/crypto modules on R19
2016-10-18 08:17:21 +03:00
58969fb854
Improve namespace handling
2016-09-24 14:17:21 +03:00
53209b9ab1
Add tests for s2s code
2016-09-23 12:30:33 +03:00
ceda073766
Add tests for external component
2016-09-21 10:45:11 +03:00
c29a48695d
Rename #error{} record to #stanza_error{}
2016-09-08 17:08:48 +03:00
af0a493c66
Merge pull request #1253 from Amuhar/xep0356
2016-09-07 14:34:31 +02:00
522a186a38
Improve some type specs
2016-08-09 10:56:32 +03:00
c409ed2f2c
Rewrite S2S and ejabberd_service code to use XML generator
2016-07-27 10:45:08 +03:00
6983dfa21f
External Component Hook
...
Changed Hook Trigger Event and included a Reason upon
component_disconnected/2 Hook
2016-07-21 14:03:01 -03:00
fca2f24231
External Component Connection Hooks
2016-07-18 17:55:10 -03:00
fced8dc3d9
Replace some ?ERR_* macros with ?ERRT_*
2016-03-31 11:00:29 +03:00
357e48fb6b
Make it possible to get virtual host of a registered route
2016-03-13 11:38:40 +03:00
dfc29ea03c
Switch to Fast XML module
2016-02-03 19:03:17 +01:00
f448ff608a
Update copyright to 2016 ( #901 )
2016-01-13 12:29:14 +01:00
9cc5a5d467
Simplify external components configuration
2015-11-28 17:38:34 +03:00
95265dd3ad
Move JID related functions to jid.erl ( #847 )
2015-11-24 18:44:13 +03:00
c1119b1f39
Remove unused validation code
2015-06-03 16:05:17 +03:00
fb6267f38e
Add config validation at startup
2015-06-01 15:38:27 +03:00
0c725b5fac
Document protocol support (EJABS-1620)
2015-05-21 17:04:05 +02:00
5a35405cd5
Update copyright dates to 2015 (EJAB-1733)
2015-01-08 17:34:43 +01:00
285c4c17cf
Merge pull request #146 from jamielinux/master
...
Update FSF address
2014-04-11 13:35:46 +02:00
633d47f784
Update copyright dates to 2014 (EJAB-1679)
2014-03-13 12:30:57 +01:00
8538997d61
Update FSF address
2014-02-22 10:27:40 +00:00
91a74e3e27
Change configuration file format to YAML
2013-08-21 22:17:59 +10:00
4dc80dddd4
Fix all calls to functions of p1_tls application
2013-06-20 18:40:44 +10:00
4d8f770624
Switch to rebar build tool
...
Use dynamic Rebar configuration
Make iconv dependency optional
Disable transient_supervisors compile option
Add hipe compilation support
Only compile ibrowse and lhttpc when needed
Make it possible to generate an OTP application release
Add --enable-debug compile option
Add --enable-all compiler option
Add --enable-tools configure option
Add --with-erlang configure option.
Add --enable-erlang-version-check configure option.
Add lager support
Improve the test suite
2013-06-13 11:11:02 +02:00
9deb294328
Accumulated patch to binarize and indent code
2013-03-14 10:33:02 +01:00
0ae400533c
Update copyright dates
2013-01-24 16:25:13 +02:00
b1e2538488
Update copyright dates
2012-02-23 17:52:34 +02:00
fd52f2cb7d
update copyright up to 2011
2011-02-14 13:50:55 +01:00
e2c3925b7d
Discard unmatched INFO messages in ejabberd services.
...
This patch will stop services terminating with function clause messages,
but doesn't affect the message queue at all.
2010-09-17 18:48:43 +02:00
715cc5ea3b
New configure option: --enable-nif
2010-07-01 20:54:01 +10:00
2ff291899d
Don't send error stanza as reply to error stanza (EJAB-930)
2010-04-20 20:31:42 +02:00
84c4d75735
Remove warning for undefined print_state/1 function for p1_fsm processes (thanks Badlop).
...
Include a identity function as implementation of print_state/1.
2010-04-09 14:25:00 -03:00
7b76fdcde7
Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159)
...
SVN Revision: 2891
2010-01-12 16:11:32 +00:00
14232df14c
new option added: max_fsm_queue. removed hardcoded FSMLIMITS
...
SVN Revision: 2645
2009-10-07 14:24:09 +00:00
72535ee14d
use queue to reduced quadratic time effort on selective receive (thanks to Alexey Shchepin)
...
SVN Revision: 2644
2009-10-07 13:41:36 +00:00
c10984f61b
Improve stream error stanza when receives invalid handshake from component.
...
SVN Revision: 2640
2009-10-06 10:04:26 +00:00
f09509502e
* doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842)
...
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text
SVN Revision: 1804
2009-01-12 14:44:42 +00:00
1d6570cdec
Retract from previous commit the code that checked the connection is attempted to a known served component (EJAB-717)
...
SVN Revision: 1517
2008-08-09 20:09:37 +00:00
62f22e8976
* src/ejabberd_service.erl: Fix XEP-0114 compliance: define xmlns
...
in header of error response; check the connection is attempted to
a served component; include in response the JID of served
component not server (thanks to Sergei Golovan)
SVN Revision: 1516
2008-08-09 18:08:00 +00:00
c3bda4aaee
* doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708)
...
* doc/guide.html: Likewise
* doc/api/overview.edoc: Likewise
* src/*/*.erl: Likewise
* src/*/*.hrl: Likewise
* src/*/*.c: Likewise
* src/odbc/*.sql: Likewise
SVN Revision: 1499
2008-07-31 11:18:49 +00:00
2d2fcc8210
* doc/guide.tex: Updated copyright dates to 2008
...
* src/*: Likewise
SVN Revision: 1153
2008-01-15 17:02:57 +00:00
56fe3579bb
* Applied copyright update patch 1.
...
SVN Revision: 1110
2007-12-24 11:41:41 +00:00
d625fc80fc
* src/acl.erl and other 64 files: Remove Erlang module attribute
...
'vsn' because it doesn't provide any worth feature, and it
difficults hot code update (EJAB-440)
SVN Revision: 1044
2007-12-06 22:12:27 +00:00
221532428f
* src/ejabberd_config.erl: Normalize hostnames in config file. If mixed case is used, the hostname will be now useable (EJAB-277).
...
* src/stringprep/stringprep_sup.erl: Likewise
* src/stringprep/Makefile.in: Likewise
* src/stringprep/Makefile.win32: Likewise
* src/ejabberd_app.erl: Likewise
SVN Revision: 806
2007-06-29 17:27:42 +00:00
525b8e9374
* src/ejabberd_service.erl: Added an option to disable from attribute checks in packets coming from an external component (EJAB-275)
...
* doc/guide.tex: Likewise
SVN Revision: 804
2007-06-28 14:32:48 +00:00
c917642b7f
* src/ejabberd_service.erl: Added shaper_rule option, changed
...
service connection log message
SVN Revision: 744
2007-03-13 16:01:39 +00:00
a1d0e7d7cb
* src/ejabberd_service.erl: Add extra info in the log about which
...
components is connected and which Erlang process is handling
it. This is usefull in context where many types of components are
used (Thanks to Jerome Sautret) (EJAB-211).
SVN Revision: 743
2007-03-13 15:01:27 +00:00
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
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
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
15a714ae68
* src/xml_stream.erl: Cleanup
...
* src/ejabberd_service.erl: Updated to use ejabberd_receiver
SVN Revision: 532
2006-04-13 02:08:24 +00:00
efacb0ad66
* src/ejabberd_c2s.erl: Remove top-level xmlns from incoming
...
stanzas
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_service.erl: Likewise
SVN Revision: 492
2006-01-25 00:35:12 +00:00
568909d5bb
* src/aclocal.m4: Updated for zlib support
...
* src/configure.ac: Likewise
* src/mod_muc/mod_muc_room.erl: Weakened presence filtering, added
warning in non-anonymous rooms, room destroying updated to latest
JEP-0045, added a number of occupants and room name in room's
disco#info reply, miscellaneous internal changes (thanks to Sergei
Golovan)
* src/mod_muc/mod_muc.erl: Better support for nick unregistration
(thanks to Sergei Golovan)
* src/ejabberd_zlib/ejabberd_zlib.erl: Zlib support (thanks to
Sergei Golovan)
* src/ejabberd_zlib/ejabberd_zlib_drv.c: Likewise
* src/ejabberd_zlib/Makefile.in: Likewise
* src/ejabberd_c2s.erl: Stream compression support (JEP-0138)
* src/ejabberd_receiver.erl: Likewise
* src/mod_disco.erl: Don't split node name before calling hooks
(thanks to Sergei Golovan)
* src/mod_configure.erl: Support for configuration using ad-hoc
commands (thanks to Sergei Golovan)
* src/mod_announce.erl: Support for sending announce messages
using ad-hoc commands (thanks to Sergei Golovan)
* src/mod_adhoc.erl: Ad-hoc support (JEP-0050) (thanks to Magnus
Henoch)
* src/adhoc.erl: Likewise
* src/adhoc.hrl: Likewise
* src/jlib.hrl: Updated (thanks to Sergei Golovan)
* src/gen_mod.erl: Added function is_loaded/2 (thanks to Sergei
Golovan)
* src/ejabberd_service.erl: Changed error message on handshake
error (thanks to Sergei Golovan)
* src/ejabberd.cfg.example: Updated (thanks to Sergei Golovan)
SVN Revision: 486
2006-01-19 02:17:31 +00:00
6bb510d99e
* src/ejabberd_service.erl: Bugfix
...
* src/ejabberd_receiver.erl: Rewritten to use {active, once} mode
for socket
* src/ejabberd_c2s.erl: Update
* src/ejabberd_listener.erl: Likewise
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/shaper.erl: Likewise
* src/tls/tls.erl: Likewise
* src/web/ejabberd_http.erl: Likewise
SVN Revision: 483
2006-01-13 01:55:20 +00:00
ad0f691472
* src/ejabberd_service.erl: Added logging of termination
...
SVN Revision: 458
2005-12-10 18:42:08 +00:00
4098c3ecba
* (all): Enhanced virtual hosting support
...
SVN Revision: 370
2005-06-20 03:18:13 +00:00
c7d15b12df
* src/ejabberd_c2s.erl: Fixed bind namespace
...
* src/ejabberd_ctl.erl: New module for ejabberd administration
* tools/ejabberdctl: Shell script for ejabberd administration
* src/mod_vcard.erl: Copyright update
* src/ejabberd_service.erl: Now possible to specify access rules
for service
* src/ejabberd.cfg.example: Updated
SVN Revision: 198
2004-01-11 20:42:57 +00:00
4768cd2f26
* src/ejabberd_local.erl: Replaced register_local_route to
...
register_route
* src/ejabberd_service.erl: Likewise
* src/mod_echo.erl: Likewise
* src/mod_vcard.erl: Likewise
* src/ejabberd_router.erl: Partially rewrited
* src/ejabberd_sm.erl: Likewise
SVN Revision: 185
2003-12-14 20:51:01 +00:00
a704f9760d
* src/ejabberd_service.erl: Added supports for multiple hosts per
...
service
* src/Makefile.in: Minor fix
SVN Revision: 153
2003-10-18 19:15:12 +00:00
ca5d88c368
* (all): Reorganized supervision tree
...
SVN Revision: 125
2003-07-20 20:35:35 +00:00
1834fb3a72
* src/ejabberd_s2s_out.erl: Close connection after key
...
verification
* src/ejabberd_c2s.erl: start replaced with start_link
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/ejabberd_listener.erl: Now uses proc_lib to spawn listeners,
removed 3rd parameter in listener configuration (assumed to equal
start_link)
* src/ejabberd.rel: Updated
* doc/guide.tex: Small changes
* doc/Makefile: Added implicit charset specification to hevea
SVN Revision: 124
2003-07-14 18:06:03 +00:00
f05efc0814
* src/ejabberd_service.erl: Proper handling of bad XML
...
* src/mod_muc/mod_muc_room.erl: Append number of participants in
disco replies if requester allowed to see participant list
* src/mod_muc/mod_muc.erl (iq_disco_items): Pass requester JID to
room process
* src/mod_irc/mod_irc_connection.erl: Exit on receiving of
presence or message error
* src/mod_irc/mod_irc_connection.erl (handle_info): Return
"feature not implemented" on iq request with unknown namespace
SVN Revision: 111
2003-05-29 19:07:41 +00:00
86cd1729cb
* src/ejabberd_local.erl: Updated missed errors to new style
...
* src/mod_register.erl: Likewise
* src/mod_version.erl: Likewise
* src/mod_time.erl: Likewise
* src/mod_stats.erl: Likewise
* src/mod_register.erl: Likewise
* src/mod_private.erl: Likewise
* src/mod_configure.erl: Likewise
* src/ejabberd_sm.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/mod_vcard.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_muc/mod_muc.erl: Added vcard to mod_muc module
* src/ejabberd_app.erl: Dump list of opened ports every hour
* src/ejabberd.hrl: Added INFO_MSG macros, ERROR_LOG_PATH renamed
to LOG_PATH
SVN Revision: 106
2003-05-09 19:32:59 +00:00
d19c1b3a3f
* src/ejabberd_service.erl: Answer "Bad Request" on unknown tags
...
SVN Revision: 73
2003-02-14 20:26:57 +00:00
a8a8e3b5a6
*** empty log message ***
...
SVN Revision: 62
2003-02-06 19:09:22 +00:00
6599d1ecc5
*** empty log message ***
...
SVN Revision: 55
2003-02-01 20:21:28 +00:00
c4d76dec7d
*** empty log message ***
...
SVN Revision: 38
2003-01-13 20:51:17 +00:00
e23adaae38
*** empty log message ***
...
SVN Revision: 33
2003-01-08 20:42:03 +00:00
2617433ae3
*** empty log message ***
...
SVN Revision: 32
2003-01-07 19:10:35 +00:00
Evgeniy Khramtsov