25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00

* src/mod_pubsub/mod_pubsub.erl: Pub/sub implementation (not

completed yet)

* src/jlib.hrl: Added pub/sub nemaspaces

SVN Revision: 120
This commit is contained in:
Alexey Shchepin 2003-07-07 19:45:22 +00:00
parent c5bfac85a6
commit 91fa7350c6
3 changed files with 44 additions and 31 deletions

View File

@ -1,3 +1,12 @@
2003-07-07 Alexey Shchepin <alexey@sevcom.net>
* src/mod_pubsub/mod_pubsub.erl: Pub/sub implementation (not
completed yet)
2003-07-05 Alexey Shchepin <alexey@sevcom.net>
* src/jlib.hrl: Added pub/sub nemaspaces
2003-07-03 Alexey Shchepin <alexey@sevcom.net> 2003-07-03 Alexey Shchepin <alexey@sevcom.net>
* src/mod_irc/iconv_erl.c (iconv_erl_control): Bugfix * src/mod_irc/iconv_erl.c (iconv_erl_control): Bugfix

View File

@ -40,8 +40,8 @@
{listen, [{5522, ejabberd_c2s, start, [{access, c2s}, {listen, [{5522, ejabberd_c2s, start, [{access, c2s},
{shaper, c2s_shaper}]}, {shaper, c2s_shaper}]},
%{5523, ejabberd_c2s, start, {5523, ejabberd_c2s, start,
% [{access, c2s}, {ssl, [{certfile, "./ssl.pem"}]}]}, [{access, c2s}, {ssl, [{certfile, "./ssl.pem"}]}]},
{5269, ejabberd_s2s_in, start, []}, {5269, ejabberd_s2s_in, start, []},
{8888, ejabberd_service, start, {8888, ejabberd_service, start,
[{host, "conference.e.localhost", [{password, "asdqwe"}]}]} [{host, "conference.e.localhost", [{password, "asdqwe"}]}]}
@ -62,6 +62,7 @@
{mod_private, []}, {mod_private, []},
{mod_irc, []}, {mod_irc, []},
{mod_muc, []}, {mod_muc, []},
{mod_pubsub, []},
{mod_time, [{iqdisc, no_queue}]}, {mod_time, [{iqdisc, no_queue}]},
{mod_version, []} {mod_version, []}
]}. ]}.

View File

@ -26,6 +26,9 @@
-define(NS_MUC_USER, "http://jabber.org/protocol/muc#user"). -define(NS_MUC_USER, "http://jabber.org/protocol/muc#user").
-define(NS_MUC_ADMIN, "http://jabber.org/protocol/muc#admin"). -define(NS_MUC_ADMIN, "http://jabber.org/protocol/muc#admin").
-define(NS_MUC_OWNER, "http://jabber.org/protocol/muc#owner"). -define(NS_MUC_OWNER, "http://jabber.org/protocol/muc#owner").
-define(NS_PUBSUB, "http://jabber.org/protocol/pubsub").
-define(NS_PUBSUB_EVENT, "http://jabber.org/protocol/pubsub#event").
-define(NS_PUBSUB_OWNER, "http://jabber.org/protocol/pubsub#owner").
-define(NS_STREAM, "http://etherx.jabber.org/streams"). -define(NS_STREAM, "http://etherx.jabber.org/streams").
@ -44,7 +47,7 @@
-define(ERR_BAD_REQUEST, -define(ERR_BAD_REQUEST,
?STANZA_ERROR("400", "modify", "bad-request")). ?STANZA_ERROR("400", "modify", "bad-request")).
-define(ERR_CONFLICT, -define(ERR_CONFLICT,
?STANZA_ERROR("409", "cancel", "cancel")). ?STANZA_ERROR("409", "cancel", "conflict")).
-define(ERR_FEATURE_NOT_IMPLEMENTED, -define(ERR_FEATURE_NOT_IMPLEMENTED,
?STANZA_ERROR("501", "cancel", "feature-not-implemented")). ?STANZA_ERROR("501", "cancel", "feature-not-implemented")).
-define(ERR_FORBIDDEN, -define(ERR_FORBIDDEN,