Badlop
04a315eb52
Fix section links to the Guide in the WebAdmin
2016-02-08 16:16:53 +01:00
badlop
cf2f80bd09
Merge pull request #944 from cdroege/configureable_host-mod_register_web
...
Allow to modify host when deleting account or changing password over web
2016-02-08 13:48:11 +01:00
Evgeny Khramtsov
2bfb619d19
Merge pull request #914 from weiss/mam-expose-jid
...
Expose occupant JID in MUC MAM messages whenever possible
2016-02-08 14:23:19 +03:00
Mickael Remond
0b1620a45c
Remove compile warnings
2016-02-08 10:50:28 +01:00
Holger Weiss
bf49c292f8
Omit redundant check for overcrowded MUC room
...
The send_update_presence/4 function already checked whether the room is
overcrowded before calling send_update_presence1/4, so there's no need
to have send_new_presence/4 perform the same check.
2016-02-08 00:46:33 +01:00
Holger Weiss
8098f7d9a8
mod_mam: Don't let outcasts access MUC archive
...
XEP-0313 says: "A MUC archive MUST check that the user requesting the
archive has the right to enter it at the time of the query [...]. In
the case of open MUC rooms, the MUC archives can generally be accessed
by any users [...] who do not have an affiliation of 'outcast'".
2016-02-08 00:16:02 +01:00
Holger Weiss
a31f59ea31
XEP-0198: Fix session timeout corner case
...
If the "resend_on_timeout" option is set to 'if_offline' and a pending
stream management session is terminated because a new session is opened
by the same resource (while no other resource is online), resend
unacknowledged messages rather than bouncing error messages.
2016-02-06 22:28:55 +01:00
Badlop
7435ee464f
Rename option to regexp_room_id for consistency with other options ( #905 )
2016-02-05 12:09:27 +01:00
HAMANO Tsukasa
268f0b30ec
add room_id_regexp option
2016-02-05 12:09:18 +01:00
Christian Dröge
30388fa2bf
Allow to modify host when deleting account or changing password over web
2016-02-04 21:31:16 +01:00
Pablo Polvorin
942072cf9d
Make hibernate timeouts configurable
...
Two *global* options added:
c2s_hibernate and receiver_hibernate.
Default if not specified is 90000, the previous hardcoded value.
2016-02-04 15:45:29 -03:00
Mickael Remond
dfc29ea03c
Switch to Fast XML module
2016-02-03 19:03:17 +01:00
Mickael Remond
71ee0d56fa
Switch to fast_tls and update app names
2016-02-03 16:13:16 +01:00
Mickael Remond
9ae1371c6e
Convert more dependencies to new repository / packages
2016-02-03 12:30:12 +01:00
Mickael Remond
0de222d998
Convert code to use Fast YAML
2016-02-03 11:30:48 +01:00
Mickael Remond
b137ee3beb
Move to new dependencies for SIP and STUN
2016-02-03 11:26:14 +01:00
Mickael Remond
99b5c5712c
Move to new iconv package
2016-02-03 11:17:24 +01:00
Mickael Remond
e8ba7bce24
Use stringprep app name
2016-02-03 10:12:25 +01:00
Nathan Bruning
80fc34fb0c
Fix presence-based delivery
2016-02-02 14:06:07 +01:00
Paweł Chmielowski
fa55ac5c8f
More strict checking for MUC initial presence
2016-02-01 12:09:58 +01:00
Paweł Chmielowski
dc52ec904c
Send presence with code 170 only in initial presence from MUC
2016-02-01 11:30:49 +01:00
Evgeniy Khramtsov
d3ee2a9c18
Add 'import_prosody' command
2016-01-29 14:30:50 +03:00
Evgeniy Khramtsov
54dc2f56c6
Import privacy lists from Prosody
2016-01-29 14:14:08 +03:00
Richard
ae77b1300a
change mod_ping Timers using maps instead of dict
2016-01-29 00:07:38 +08:00
Evgeniy Khramtsov
b20db3b736
Initial version of migration script from Prosody to ejabberd
2016-01-28 14:23:51 +03:00
Paweł Chmielowski
aaa84dc118
Need extra line before ## in markdown
2016-01-27 11:42:13 +01:00
Paweł Chmielowski
239b1c6f74
Always use lagger
2016-01-26 14:34:58 +01:00
Christophe Romain
b2c6e397fc
Set set utf8mb4 charset on mysql connection
2016-01-26 13:47:24 +01:00
Paweł Chmielowski
621dff7307
Add header to generated markdown file
2016-01-26 10:46:38 +01:00
Paweł Chmielowski
bdeb4a7e32
Add a way to get all ejabberd_commands, not only those that was registered
...
This is part of (TECH-1828).
2016-01-26 10:00:28 +01:00
Paweł Chmielowski
22696e8388
Geenarte markdown that is acceptable by docs.ejabberd.org processor
2016-01-25 16:51:54 +01:00
Paweł Chmielowski
a2a692d081
Merge pull request #919 from hamano/rename_timestamp_function
...
rename timestamp function #917
2016-01-24 07:51:25 +01:00
Mickael Remond
a3931e6b73
lager is the default logger, we need to reverse the define flag
2016-01-23 18:43:06 +01:00
HAMANO Tsukasa
5a85b0fb52
rename timestamp function #917
2016-01-23 17:58:10 +09:00
Holger Weiss
b62607037a
mod_mam: Expose MUC occupant JID in more cases
...
Include the occupant JID with MUC MAM messages if the room is not
anonymous, and also when the MAM user sent the MUC message himself (not
just in the case where he is a room moderator).
2016-01-20 00:02:40 +01:00
Christophe Romain
2ddbd032ee
Add error handling to send_stanza
2016-01-19 16:16:04 +01:00
Holger Weiss
5e4ed4266d
mod_mam: Strip existing JID tags from MUC messages
...
Strip any pre-existing <x/> tags which have an <item/> child with a
'jid' attribute from MUC MAM messages. This way, if such a tag exists,
clients can be sure it was added by mod_mam.
2016-01-19 00:39:10 +01:00
Alexey Shchepin
a150bf8fdc
Make C2S session establishment optional (ECS-11)
2016-01-18 16:33:57 +03:00
Holger Weiss
bd383fb8c1
mod_mam: Remove unused code
...
This mod_mam version doesn't store groupchat messages in user archives,
and it also doesn't support the "store_body_only" option.
2016-01-18 13:27:29 +01:00
Holger Weiss
63777f830d
Use maps instead of dicts in HTTP upload modules
...
ejabberd currently depends on Erlang/OTP 17.1 or higher, so we can now
use maps.
2016-01-16 01:30:22 +01:00
badlop
6ac839dd76
Merge pull request #906 from hamano/stats_processes
...
add stats processes command
2016-01-15 19:26:23 +01:00
Evgeniy Khramtsov
a83c5a8f3a
Do not redefine records
2016-01-15 15:44:50 +03:00
Evgeniy Khramtsov
1d452c98c1
Describe option type of 'domain_balancing'
2016-01-15 14:32:10 +03:00
Holger Weiss
ddaa409ee2
XEP-0198: Let MAM take care of pending messages
...
If a stream management session times out for a user who appears to be
using MAM, drop any unacknowledged messages rather than resending or
bouncing them. This avoids duplicates or bogus error messages.
However, this is only done if the new mod_mam option "assume_mam_usage"
is set to 'if_enabled' or 'on_request'. In the former case, a user is
assumed to be using MAM if archiving is enabled for his account. In the
latter case, MAM usage is assumed only if archiving was explicitly
requested by the client, or if archiving was enabled by means of
mod_mam's "request_activates_archiving" option.
2016-01-15 01:08:22 +01:00
HAMANO Tsukasa
6cb1905f7c
add stats processes command
2016-01-15 00:27:15 +09:00
Holger Weiss
db04cdf2ca
mod_mam: Sort messages returned by Mnesia
...
Sort the messages retrieved from an Mnesia archive before selecting the
subset limited by the <max/> value. This makes sure the desired subset
of messages is sent to the client.
2016-01-14 02:27:02 +01:00
Holger Weiss
58c8fc5770
mod_mam: Limit result set page size
...
If the client doesn't specify a maximum number of messages to retrieve
per page, set a limit of 50 messages. If the client specifies a limit
larger than 250, cap the number to 250 messages.
These limits aren't enforced for MAM v0.2 requests though, as that
version of the XEP doesn't require clients to support RSM. The newer
revisions say that "a server MAY place a reasonable limit on how many
stanzas may be pushed to a client in one request. Whether or not the
client query included a <set/> element, the server MAY simply return its
limited results, modifying the <set/> element it returns appropriately."
2016-01-14 02:12:28 +01:00
Holger Weiss
35ec0d58a4
mod_mam: Reject <index/>-based paging
...
If an <index/> is specified in the MAM request, reject the request
rather than ignoring the desired index and returning wrong results.
XEP-0059 says that the server "MAY return a <feature-not-implemented/>
error."
2016-01-14 01:39:19 +01:00
Holger Weiss
11afa45646
mod_mam: Remove unused variable
2016-01-14 01:15:11 +01:00
Holger Weiss
89f63a4fdf
mod_mam: Check whether MUC message is desired
2016-01-14 01:13:16 +01:00
Holger Weiss
85f4f90b45
mod_mam: Support XEP-0313 v0.2 MUC archive queries
2016-01-14 00:58:48 +01:00
Holger Weiss
8117092e6a
mod_mam: Respond to form requests
...
If the client requests a data form with the supported filters, return it
as per XEP-0313 v0.3 and newer.
2016-01-13 23:56:05 +01:00
Holger Weiss
89b1700279
mod_mam: Add 'from' attribute to <delay/> tag
2016-01-13 23:17:23 +01:00
Holger Weiss
9cd048c442
mod_mam: Improve binary comparison of message UIDs
...
Make sure the binary comparison performed when clients use message UIDs
to page through Mnesia archives yields correct results even if the
specified UIDs don't have the same number of digits as the UIDs of the
stored messages. This way, MAM will continue to work as expected after
migrating from mod_mam_mnesia to mod_mam.
2016-01-13 23:01:51 +01:00
Holger Weiss
3dccc20d8b
mod_mam: Add "delete_old_mam_messages" command
...
The new "delete_old_mam_messages" command allows for purging all MAM
messages of the specified type older than the specified number of days.
(Currently only implemented for Mnesia archives.)
2016-01-13 22:46:30 +01:00
Holger Weiss
a61b0c303d
mod_mam: Add "request_activates_archiving" option
...
Enabling "request_activates_archiving" tells mod_mam not to store any
messages for a user until his client issued a MAM request, regardless of
mod_mam's "default" option. Once a MAM request is issued, messages are
archived as usual.
2016-01-13 21:38:08 +01:00
Holger Weiss
0183b2487e
Advertise MUC MAM v0.4.1 in room JID's disco#info
2016-01-13 20:30:44 +01:00
Badlop
f448ff608a
Update copyright to 2016 ( #901 )
2016-01-13 12:29:14 +01:00
Evgeniy Khramtsov
fd3e3a99c5
Log failed SQL requests
2016-01-13 14:13:32 +03:00
Evgeniy Khramtsov
776fe8b32a
Fix MAM MUC for v0.4.1
2016-01-13 11:45:08 +03:00
Holger Wei
64d96778b4
Don't return error for blocked MUC messages
...
If a message stanza is blocked as per XEP-0016 or XEP-0191, return an
error only if the type of the blocked message is "normal" or "chat".
This makes sure users won't be kicked from MUC rooms when blocking other
participants.
Closes #897 .
2016-01-12 10:20:35 +01:00
Holger Weiss
3e1425b905
Merge remote-tracking branch 'processone/pr/899'
...
* processone/pr/899:
mod_http_upload: Use application/octet-stream instead of text/html for security reasons
2016-01-11 12:38:51 +01:00
Evgeniy Khramtsov
65e6dfb9dd
Do not fail on incorrect data coming from SQL (898)
2016-01-11 14:35:11 +03:00
Evgeniy Khramtsov
c7931b4a4f
CVE-2016-1232: Add Dialback Key Generation and Validation support (XEP-0185)
2016-01-11 14:22:17 +03:00
Matthias Rieber
0ad0fd2187
mod_http_upload: Use application/octet-stream instead of text/html for security reasons
2016-01-11 12:13:19 +01:00
Badlop
c7b67ff00b
Clarify a little more room error string (thanks to Genghis Khan)
2016-01-08 13:14:40 +01:00
Holger Weiss
e1539a11be
mod_http_upload: Use full PUT URL for process name
...
Don't just use the "put_url" domain name, but also any path components
of the specified URL, to generate a mod_http_upload process name. This
way, a single domain name can be used for multiple virtual hosts by
specifying a "put_url" such as "https://example.com/@HOST@/ ".
2016-01-06 00:12:36 +01:00
Holger Weiss
3f5a20c90a
mod_http_upload: Rename variable for clarity
2016-01-05 22:06:34 +01:00
Badlop
c01e3f24a5
Error converting times in mod_fail2ban ( #889 )
2016-01-05 12:29:21 +01:00
Paweł Chmielowski
da45a064a8
Fix handling of some options in old style configs
...
This fixes issue #893 .
2016-01-04 22:06:19 +01:00
Alexey Shchepin
fb8a511365
Use crypto:rand_uniform instead of random:uniform
2016-01-04 13:59:37 +03:00
Holger Weiss
94c620cc27
mod_http_upload: Fix logging of file size mismatch
2016-01-04 01:01:14 +01:00
Holger Weiss
5deb6a91f7
mod_admin_extra: Replace deprecated function calls
2016-01-02 21:27:48 +01:00
Holger Weiss
b73678992b
mod_muc_admin: Allow for setting MAM option
...
Fixes #890 .
2016-01-02 20:57:01 +01:00
Badlop
91d205715e
New send_stanza command (ejabberd_contrib#142)
2015-12-30 12:53:40 +01:00
Holger Weiss
1d2dc6cdc1
mod_muc_room: Replace deprecated function call
2015-12-29 11:11:50 +01:00
Holger Weiss
4cdb30d59e
mod_mam: Use <stanza-id/> tags for deduplication
...
Use <stanza-id/> elements instead of <delay/> tags to check for messages
resent by the stream management code. The <stanza-id/> element is
preferable, as it is added by mod_mam itself.
2015-12-29 09:54:48 +01:00
Badlop
0df6d7ae39
Improve explanation in registration page ( #876 )
2015-12-28 15:08:59 +01:00
Paweł Chmielowski
a18a3dfbb1
Add commands for generating html or markdown documentation for commands
2015-12-28 12:20:06 +01:00
Evgeniy Khramtsov
babb484cfc
Restrict access to MAM archives for members-only rooms
2015-12-24 15:04:06 +03:00
Badlop
c42e026f9c
Degenderise room error message ( #747 )
2015-12-23 19:34:23 +01:00
Holger Weiss
8cf0d31ee9
Revert "mod_mam: Keep 'to' attribute for MUC MAM messages"
...
This reverts commit 0e330da2a6
. XEP-0313
says: "When sending out the archives to a requesting client, the 'to' of
the forwarded stanza MUST be empty".
2015-12-22 13:20:23 +01:00
Paweł Chmielowski
cfe0aea219
Use built-in nif for integer_to_binary/binary_to_integer
2015-12-22 11:49:12 +01:00
Badlop
88c9991f90
Adding WEBIRC, custom realname & ident, ISO-8859-15 (thanks to iwalkalone69)( #877 )
2015-12-21 16:20:20 +01:00
Alexey Shchepin
d88d5d6807
Support presence_broadcast in default_room_options mod_muc option
2015-12-21 02:25:31 +03:00
Holger Weiss
2d22507636
ejabberd_http: Cope with large POST/PUT requests
...
gen_tcp returns 'enomem' if we try to receive more than 64 MiB.
2015-12-20 23:30:11 +01:00
Holger Weiss
d039b9b72b
ejabberd_http: Log debug message on receive errors
2015-12-20 23:26:57 +01:00
Christophe Romain
bb5a8a42c3
Fix pubsub virtual nodetree plugin
2015-12-17 10:16:17 +01:00
Christophe Romain
6957e892dd
Fix last item message type as message attribute
2015-12-16 17:04:45 +01:00
Christophe Romain
c8986ffa5e
Use correct notification_type for last items ( #827 )
2015-12-16 16:19:35 +01:00
Alexey Shchepin
c6798fc515
Add accept_interval option in ejabberd_listener
2015-12-16 17:26:44 +03:00
Christophe Romain
08b0530164
Don't read pubsub options when plugin does not use them
...
This also revert commit 6052f7b
2015-12-16 12:56:06 +01:00
Holger Weiss
5fd1aa0d04
Advertise MAM in disco info for account/room JID
...
As per XEP-0313 version 0.2 and newer, advertise the MAM feature in the
service discovery information for the bare account (or MUC room) JID.
Some clients check the server's discovery information instead, so we'll
continue to advertise the feature there as well.
2015-12-16 00:08:23 +01:00
Holger Weiss
11ad96fced
Use MUC domain for 'by' attribute of <stanza-id/>
...
Let mod_mam specify only the domain part of the room JID in the 'by'
attribute of <stanza-id/> tags.
2015-12-15 21:37:41 +01:00
Holger Weiss
0e330da2a6
mod_mam: Keep 'to' attribute for MUC MAM messages
2015-12-15 21:05:04 +01:00
Christophe Romain
6efdf78ce3
PubSub plugin for online users only
2015-12-15 16:23:04 +01:00
Christophe Romain
3b69d26368
Fix pubsub headers
2015-12-15 16:12:20 +01:00
Paweł Chmielowski
6052f7bfa8
Fix pubsub test error
2015-12-14 10:21:23 +01:00
Christophe Romain
e3005f68e7
Remove undefined macro injected in 3bdd5d0d
2015-12-11 15:33:22 +01:00
Christophe Romain
8ee5f9fb6f
Remove http supervisors
2015-12-11 14:13:24 +01:00
Christophe Romain
3bdd5d0d25
Remove receiver's supervisor
2015-12-11 14:11:44 +01:00
Christophe Romain
1a32f20c07
Disable use of multi-subscribe and subscription-option on standard plugins
2015-12-11 12:46:49 +01:00
Christophe Romain
6357ea1d5d
Limit number of subscriptions per node and allow custom default node configuration
2015-12-11 12:46:44 +01:00
Christophe Romain
86a8606fd1
Virtual nodetree is not attached to any backend
2015-12-11 12:46:40 +01:00
Christophe Romain
c4943cffe8
Follow pubsub configuration when using virtual nodetree
2015-12-11 12:46:35 +01:00
Christophe Romain
10c920ef13
Don't force max_items_node to MAXITEMS if not defined
2015-12-11 12:30:16 +01:00
Holger Weiss
469e93f37b
mod_mam: Don't store resent messages
...
Make sure messages that were resent by the stream management code aren't
stored in MAM.
2015-12-09 22:44:45 +01:00
Holger Weiss
e09afe367f
Document XEP-0334 support
2015-12-09 22:28:44 +01:00
Evgeniy Khramtsov
4c47ee63f2
Do not forget to include xmlns in mam prefs response ( #859 )
2015-12-09 12:53:02 +03:00
Paweł Chmielowski
be4d687a86
Fix problem with handling of old db entries in mod_mam
2015-12-09 09:47:03 +01:00
Holger Weiss
07baf2d973
Don't let "reopen_log" rotate files (EJAB-1243)
...
Make sure the "reopen_log" command really just reopens log files without
also rotating them. For rotating log files, the new "rotate_log"
command can be used.
2015-12-08 22:48:04 +01:00
Holger Weiss
325c17f277
mod_mam: Update record field type
2015-12-08 22:21:39 +01:00
Holger Weiss
14609dbfa2
mod_mam: Remove unused code
2015-12-08 22:15:55 +01:00
Holger Weiss
59ba09826b
mod_offline: Fix outdated comments
2015-12-08 21:58:54 +01:00
Holger Weiss
90fd7f3780
mod_offline: Honor <store/> hint
...
Ignore the "store_empty_body" option for messages that have a <store/>
hint as described in XEP-0334, version 0.2.
2015-12-08 21:46:36 +01:00
Alexey Shchepin
c2f6bf0343
Improve muc#roomconfig_presencebroadcast support
2015-12-08 21:53:42 +03:00
Paweł Chmielowski
67f93b0d60
Don't keep 10 sec timeout that i used for testing...
2015-12-08 11:28:03 +01:00
Paweł Chmielowski
7a69dab596
Add ability to disable timeout for ejabberdctl command
2015-12-08 11:25:26 +01:00
Holger Weiss
5ce0b062ff
mod_mam: Honor Message Processing Hints (XEP-0334)
2015-12-08 00:10:00 +01:00
Badlop
3e57850da7
If mod_register access_from is 'none', then don't advertise IBR ( #857 )
2015-12-07 18:30:52 +01:00
Paweł Chmielowski
95a9100623
Fix more places where random:seed is used
2015-12-07 16:48:29 +01:00
Paweł Chmielowski
d0df7be722
Fix randoms.erl on R17 that don't have random:seed(integer())
2015-12-07 16:37:40 +01:00
Paweł Chmielowski
5ac10d6555
Remove now() in pubsub code
2015-12-07 16:16:11 +01:00
Paweł Chmielowski
29db302808
More now() replacements
2015-12-07 16:09:48 +01:00
Paweł Chmielowski
b9f751e099
Fix bug in last commit
2015-12-07 10:26:51 +01:00
Paweł Chmielowski
0a846d03bf
More now() removal
2015-12-06 15:58:46 +01:00
Paweł Chmielowski
5c329a7699
Remove now() - part 1
2015-12-04 15:08:43 +01:00
Badlop
daad71bc7e
trusted_proxies option not parsed correctly ( #860 )
2015-12-04 13:14:39 +01:00
Holger Weiss
ba916c3162
XEP-0198: Fix stanza counting corner case issue
...
Don't forget to count outgoing stanzas that are processed while the
ejabberd_c2s process is already waiting for stream resumption.
2015-12-02 19:25:10 +01:00
Badlop
f9e12d900c
No need for a top menu link as there's a top page link
2015-12-02 17:10:23 +01:00
Badlop
e412438aba
When user joins logged room, he must be warned (EJAB-726)
2015-12-02 12:07:29 +01:00
Badlop
086fbc6a50
Only filter rooms in Service Disco when more than 100 (EJAB-343)
2015-12-02 02:32:25 +01:00
Badlop
ff22782752
List in Service Disco non-empty rooms and provide Node for empty (EJAB-343)
2015-12-02 01:51:39 +01:00
Mickael Remond
e5ae35c66b
Update cache_tab app name
2015-12-01 19:17:51 +01:00
Evgeny Khramtsov
3397a9be5e
Merge pull request #849 from weiss/discard-chat-states
...
mod_offline: Support discarding chat state notifications
2015-12-01 14:57:49 +03:00
Evgeniy Khramtsov
f1ecbf80fb
Fix archive preference retreiving ( #848 )
2015-12-01 14:06:23 +03:00
Christophe Romain
9eeee67da7
Webadmin console visual refresh (thanks to Marek Foss) (EJAB-1142)
2015-11-30 11:35:53 +01:00
Evgeniy Khramtsov
9cc5a5d467
Simplify external components configuration
2015-11-28 17:38:34 +03:00
Holger Weiss
44f5e411c5
mod_offline: Support discarding chat states
...
XEP-0160 says that standalone chat state notifications should not be
stored offline. By default, mod_offline discards them now.
Closes #842 .
2015-11-26 08:35:49 +01:00
Holger Weiss
fee2530b1c
Always use occupant JID as 'from' for room subject
...
When sending the room subject to a new participant, always use the
occupant JID that corresponds to the subject author as the 'from'
address. It was already done this way when the subject was sent as part
of the room history.
2015-11-25 00:05:24 +01:00
Evgeniy Khramtsov
87fb5132be
Make JID related functions from jlib.erl deprecated
2015-11-24 20:31:26 +03:00
Evgeniy Khramtsov
95265dd3ad
Move JID related functions to jid.erl ( #847 )
2015-11-24 18:44:13 +03:00
Christophe Romain
16881597c9
Remove useless export_all flag
2015-11-23 12:03:08 +01:00
Christophe Romain
f3ff660eae
Export content_type/3 needed by mod_http_upload
2015-11-23 11:53:36 +01:00
Christophe Romain
4480749a52
Merge branch 'cluster_fix'
2015-11-20 14:52:36 +01:00
Christophe Romain
b4ae1b63bc
Allow longer command execution time
2015-11-20 10:39:32 +01:00
Christophe Romain
67a70b9107
Integrate join/leave cluster as ejabberd command
2015-11-20 10:39:27 +01:00
Evgeny Khramtsov
0e29307ad5
Merge pull request #840 from cenobites/mod_ping
...
Adding ping_ack_timeout in mod_opt_type configuration
2015-11-18 16:35:49 +03:00
Badlop
2659e2c4a0
Explain that reload_config only affects to ACL and Access
2015-11-18 13:25:19 +01:00
Nycholas de Oliveira e Oliveira
49a8de7c56
Adding ping_ack_timeout in mod_opt_type configuration
...
Avoid the error output
```
2015-11-18 12:02:40.297 [error] <0.37.0>@gen_mod:validate_opts:250 unknown option 'ping_ack_timeout' for module 'mod_ping' will be likely ignored, available options are: 'iqdisc', 'ping_interval', 'send_pings', 'timeout_action'
2015-11-18 12:02:40.334 [error] <0.37.0>@gen_mod:validate_opts:250 unknown option 'ping_ack_timeout' for module 'mod_ping' will be likely ignored, available options are: 'iqdisc', 'ping_interval', 'send_pings', 'timeout_action'
```
In setting mod_opt_type default, ping_ack_timeout parameter was added.
2015-11-18 10:25:01 -02:00
Holger Weiss
43626f5c97
mod_http_upload: Return error atoms, not strings
...
Don't convert error atoms to strings before actually logging them. This
avoids a bogus error message when a user who has no uploaded files is
removed.
2015-11-17 00:12:20 +01:00
Badlop
53d72bd85a
Disable vJUD by default also in mod_vcard_ldap source code
2015-11-13 19:33:23 +01:00
Badlop
f6d8f47451
Disable vJUD search in the default config and when not specified
2015-11-13 19:30:11 +01:00
Alexey Shchepin
aa5caa30e2
Support for muc#roomconfig_presencebroadcast option
2015-11-12 19:53:10 +03:00
Paweł Chmielowski
3ee5195b7a
Fix problem with pipelined http requests arriving in single packet
...
This fixes github issue ejabberd#835
2015-11-12 17:23:59 +01:00
Holger Weiss
55a92c2983
mod_http_upload: Log message if URL looks wrong
...
Log an [info] message if a PUT request looks like the specified
"put_url" contains a path component that doesn't match the
"request_handlers" path, as in the following configuration:
listen:
-
module: ejabberd_http
port: 5444
request_handlers:
"/": mod_http_upload
modules:
mod_http_upload:
put_url: "http://example.com/path/ "
2015-11-11 22:51:40 +01:00
Holger Weiss
415a75c25a
mod_http_upload_quota: Don't track all users
...
Don't track the disk usage of accounts that have an unlimited quota.
2015-11-10 22:08:16 +01:00
Holger Weiss
20709f9880
mod_http_upload: Make case indentation consistent
...
Use four spaces (or the corresponding amount of tab characters) for case
indentation everywhere in mod_http_upload and mod_http_upload_quota.
2015-11-09 19:23:52 +01:00
Holger Weiss
113c315857
mod_http_upload: Apply cosmetic changes
2015-11-09 19:12:08 +01:00
Holger Weiss
842db2ca15
mod_http_upload: Don't flatten command strings
2015-11-09 18:50:45 +01:00
Holger Weiss
9c80cb2b26
mod_http_upload: Don't let identify/1 return error
...
Let identify/1 return 'pass' when it failed to identify the file type,
as this doesn't (necessarily) indicate an error condition. This also
makes it consistent with the return value of convert/2.
2015-11-09 18:41:31 +01:00
Paweł Chmielowski
58c1bc4276
Use xml_stream:reset() when possible
2015-11-09 16:05:09 +01:00
Christophe Romain
341be9b682
Remove supervisor option, disable it for c2s and muc
2015-11-04 16:24:35 +01:00
Holger Weiss
fec7e47169
Add copyright and license to HTTP upload modules
2015-11-04 01:22:39 +01:00
Holger Weiss
46bf190fd0
mod_client_state: Add my email address to header
2015-11-04 01:19:19 +01:00
Paweł Chmielowski
e54e543a66
Faster string_to_jid/1 implementation
...
This version is about 10-15% faster than old one
2015-11-03 14:41:01 +01:00
Holger Weiss
ff46738218
mod_http_upload_quota: Omit info message
...
The mod_http_upload_quota module attempts to delete a directory whenever
it removes a file from that directory. However, if thumbnail creation
is enabled, directories will often contain two files. Therefore, don't
log an info (but only a debug) message if directory removal fails.
2015-11-03 00:00:44 +01:00
Holger Weiss
4566325241
mod_http_upload: Don't complain during shutdown
...
Ignore the case where, for some reason, no process is found to be
stopped.
Closes #810 .
2015-11-02 23:46:58 +01:00
Holger Weiss
1b368a86b7
mod_http_upload: Use binary strings in most places
...
Switch to binary strings to fix a type issue, and for consistency.
Closes #808 .
2015-11-02 23:46:31 +01:00
Holger Weiss
9d2f1d5f0d
mod_http_upload: Check availability of ImageMagick
...
Log an error message during startup if the thumbnail option is enabled
but ImageMagick is not installed.
2015-11-02 01:12:10 +01:00
Holger Weiss
eeb705fc2f
mod_http_upload: Suppress error on non-image files
...
Don't log an error (but only a debug) message if ImageMagick fails to
indentify the file type for thumbnail creation. The image might be
encrypted, or it could be a non-image file.
Closes #809 .
2015-11-01 23:29:22 +01:00
Evgeniy Khramtsov
8bff06bea9
Merge branch 'master' of github.com:processone/ejabberd
2015-10-30 17:20:50 +03:00
Evgeniy Khramtsov
99f506135b
Fix ipv6 configuration processing ( #803 )
2015-10-30 17:20:32 +03:00
Holger Weiss
915383e150
mod_http_upload: Add missing trailing dot
...
(Thanks to Matthias Rieber.)
2015-10-29 10:09:55 +01:00
Holger Weiss
43e7814714
mod_mam: Update supported XEP version
2015-10-28 23:53:53 +01:00
Holger Weiss
32fe74c923
mod_http_upload: Document protocol support
2015-10-28 23:52:33 +01:00
Holger Weiss
62ea763089
mod_http_upload: Fix string()/binary() type issue
2015-10-26 22:32:12 +01:00
Holger Weiss
3e7ee6af6d
mod_http_upload: Add/fix function specifications
2015-10-26 22:30:58 +01:00
Holger Weiss
b5a09f8b15
mod_http_upload: Strip newline from command output
...
The list_to_integer/1 function doesn't cope with trailing newline
characters.
2015-10-26 22:10:32 +01:00
Holger Weiss
5dfd95e5a7
Support user quotas for HTTP File Upload
...
mod_http_upload_quota implements two features:
- When a "hard quota" is exceeded during a file upload, old files are
removed until the disk usage equals or falls below the "soft quota".
- Once a day, all uploaded files (and directories) older than a
configurable number of days are deleted.
2015-10-26 13:10:10 +01:00
Evgeniy Khramtsov
6f2e178de1
Rename badly entitled record field
2015-10-26 15:05:28 +03:00
Evgeniy Khramtsov
137a4ee087
Add HTTP File Upload support (XEP-0363)
2015-10-26 14:10:55 +03:00
Evgeniy Khramtsov
b2eb9f197a
Don't crash on certificates without extensions (EJAB-1724)
2015-10-23 18:41:35 +03:00
Christophe Romain
2a115a83d2
Let modules_update_specs report failures ( #756 )
2015-10-23 17:21:19 +02:00
colm
d048d1e619
mod_ping: allowed the ping ack timeout (the length of time taken to deem that a ping has not being responded to) configurable. it still defaults to 32 seconds as per the constant IQ_TIMEOUT (in ejabberd_local.erl) this just makes it optionally configurable (in my case I needed to be more trigger happy than 32 seconds)
2015-10-22 13:48:40 +01:00
Christophe Romain
efdf5636be
Add simple metrics module for use with grapherl
2015-10-22 14:02:26 +02:00
colm
92b9fb30e0
Don't send full JID in 'from' of Roster Push (RFC 6121 section 2.1.6). This is a patch by @badlop in the comments of github issue #367
2015-10-21 23:22:53 +01:00
Badlop
c62bd0c911
Use homogeneous s2s connections stats ( #761 )
2015-10-21 12:51:22 +02:00
Alexey Shchepin
8a2fa62cac
Remove access_commands 'unrestricted' option, use [] instead. Fix unauthenticated calls to commands with policy=user.
2015-10-20 17:20:13 +03:00
Alexey Shchepin
7c1e7e5b5f
Improve access_commands option backward compatibility
2015-10-19 20:16:04 +03:00
Alexey Shchepin
1f2b7e8f20
Fix access_commands option handling
2015-10-19 18:50:44 +03:00
Holger Weiss
28e28e926a
ejabberd_listener: Fix ETS update on port reuse
2015-10-18 01:14:48 +02:00
Holger Weiss
5e467b96a1
ejabberd_c2s: Let stop/1 close XEP-0198 sessions
...
The stop/1 function now terminates stream management sessions
immediately, just as it does for other sessions. The new
ejabberd_c2s:close/1 function can be used to close the socket without
terminating the stream management session, like stop/1 did before.
2015-10-17 23:15:31 +02:00
Holger Weiss
53bd0ee818
ejabberd_c2s: Close socket when waiting for resume
...
Make sure the socket is closed when mod_ping calls ejabberd_c2s:stop/1
for an XEP-0198 session.
2015-10-17 22:07:29 +02:00
Paweł Chmielowski
7d99484859
Make KEEPALIVE_QUERY list as this is what sql_query/3 expects
2015-10-15 10:07:24 +02:00
Alexey Shchepin
4fce1a17d7
Fix cyrsasl_oauth:mech_new call
2015-10-12 20:53:52 +03:00
Evgeniy Khramtsov
87273619a6
Advertise MAM (XEP-0313) v0.4 support in room disco
2015-10-11 19:43:24 +03:00
Paweł Chmielowski
b5ac0db895
Be able to merge old style configs with {listen,...}
2015-10-08 13:07:00 +02:00
Paweł Chmielowski
6d25db6600
Handler module shouldn't be used for differentiating listeners when merging configs
2015-10-07 16:45:07 +02:00
Christophe Romain
880114a909
Enforce get_allowed_items_call
2015-10-07 16:40:37 +02:00
Christophe Romain
653105a44f
Fix acl issue from cleanup
2015-10-07 15:12:15 +02:00
Christophe Romain
f938c2a5e2
Revert "Avoid crypto:hmac/3 call for R15B compatibility"
...
This reverts commit 31e356c126
.
2015-10-07 14:18:56 +02:00
Christophe Romain
6a23cad454
Revert "Fix compilation on Erlang R15B"
...
This reverts commit a5d6044448
.
2015-10-07 14:18:47 +02:00
Christophe Romain
6aeb9dcb38
cosmetic cleanup
2015-10-07 14:18:38 +02:00
Evgeniy Khramtsov
6378c673df
Avoid MAM dups when routing to multiple resources
2015-10-02 16:09:55 +02:00
Evgeniy Khramtsov
c7750689e8
Fix force_update_presence
2015-10-02 16:06:47 +02:00
Paweł Chmielowski
24fa95fd60
Fix problem with --auth in ejabberd_ctl:process2/2
2015-10-01 21:09:03 +02:00
Paweł Chmielowski
67d3b50598
Switch macros resolving in config files to be global instead of per file
2015-10-01 14:34:48 +02:00
Alexey Shchepin
cf975da8f2
Update several commands for recent ejabberd_commands changes
2015-09-28 15:29:25 +03:00
Alexey Shchepin
88a206400a
Add oauth_access option
2015-09-25 19:48:53 +03:00
Badlop
1781a58929
Strip Nick element in message stanzas sent to a room ( #686 )
2015-09-25 17:00:00 +02:00
Christophe Romain
a1129dc96b
Add OAuth support (thanks to Aleksey)
2015-09-25 15:49:07 +02:00
Badlop
ee456cc2af
Fix regression introduced when code was binarized (EJAB-641)
2015-09-24 17:21:14 +02:00
Holger Weiss
484fd1f51f
Log TLS errors as [debug] messages only
...
Closes #652 and closes #679 .
2015-09-24 12:00:59 +02:00
Evgeniy Khramtsov
89b3471742
Add <stanza-id/> (XEP-0359) to archived messages
2015-09-22 21:15:34 +03:00
Paweł Chmielowski
e289344972
Nameprep host name passed to http-bind before using in (EJAB-1658)
2015-09-22 15:42:57 +02:00
Christophe Romain
23a1aceac0
Improve external module configuration management (EJAB-1746)
2015-09-22 12:49:55 +02:00
Evgeniy Khramtsov
70b1dc479c
Add MAM (XEP-0313) v0.4 support
2015-09-22 12:23:36 +03:00
Jerome Sautret
df3862cf84
Add set_loglevel command (EJABS-2524)
2015-09-21 17:07:44 +02:00
Christophe Romain
497cbb3ec2
Merge branch 'master' of github.com:processone/ejabberd
2015-09-18 09:06:51 +02:00
Christophe Romain
ec1969ddca
Remove unused functions from old get_items api
2015-09-17 18:00:17 +02:00
Paweł Chmielowski
f6b892b366
Guard against passing undefined C2SPid to xml parser before become_controller gets called
...
Our new nif xml parser don't handle this gracefully, so we better don't
call it that way.
This is only triggered on old style ssl sockets, where ssl layer must
be activated early, before association between socket and c2s is
established
2015-09-17 11:37:01 +02:00
Holger Weiss
4a4065c9c6
Let BOSH/WebSocket support "max_resume_timeout"
...
Allow for specifying the "max_resume_timeout" option in an ejabberd_http
listener for ejabberd_http_bind and/or ejabberd_http_ws.
2015-09-17 00:33:08 +02:00
Quan Zhuo
ae51277316
Comment unused type, unused term
2015-09-16 22:52:36 +08:00
Paweł Chmielowski
5593ebbbca
Properly handle define_macros in merged config files
2015-09-16 12:20:07 +02:00
Holger Weiss
59321ac56e
XEP-0198: Improve handling of non-message stanzas
...
When an XEP-0198 session times out, always return an error for
unacknowledged IQ stanzas, and always drop presence stanzas. That is,
the "resend_on_timeout" option no longer applies to those stanzas types,
but only to messages.
2015-09-15 22:42:22 +02:00
Evgeniy Khramtsov
fc7d3a44b8
Simplify MSSQL configuration
2015-09-13 18:34:10 +03:00
Evgeniy Khramtsov
25791cfde8
Fix MSSQL support
2015-09-13 18:31:49 +03:00
Christophe Romain
48c5e73321
ext_mod must be started before ejabberd_config
2015-09-11 15:14:12 +02:00
Badlop
a50f00f9e8
Include ext_mod modules when checking accepted options (ejabberd-contrib#116)
2015-09-10 20:11:02 +02:00
Paweł Chmielowski
f56a9e400d
Pass stream management options defined in http listener to http-bind and websocket
2015-09-04 12:42:53 +02:00
Holger Weiss
5095fdb6b0
New XEP-0198 option: "max_resume_timeout"
...
In the past, the "resume_timeout" option defined both the default resume
timeout and the maximum resume timeout clients are permitted to request.
Admins might want to allow clients to request a timeout value that's
larger than the default, though. This can now be done by specifying the
"max_resume_timeout" option.
2015-09-03 21:20:15 +02:00
Badlop
8d1ea87e02
Use hide_sensitive_log_data in eldap.erl
2015-09-03 16:28:21 +02:00
Evgeniy Khramtsov
6740b1f0e1
Rename idna.erl to ejabberd_idna.erl ( #702 )
2015-09-02 16:02:46 +03:00
Badlop
1bc2c8cbb1
Add verification of hide_sensitive_log_data global option
2015-09-02 13:46:03 +02:00
Evgeniy Khramtsov
eebd4bbd8f
Remove unused function now_to_iso/1
2015-09-02 14:13:23 +03:00
Evgeniy Khramtsov
14ddbce3a9
Do not forget to set from/to when fetching from MUC history
2015-09-01 12:35:51 +03:00
Paweł Chmielowski
e24bfe7b62
Fix problem with merging same port, different ip listeners in config files
...
Also switch to function used by ejabberd_listener to extract that
information instead of rolling our own code for that.
2015-09-01 10:57:48 +02:00
Evgeniy Khramtsov
190f76c676
Fetch MUC MAM messages from room history directly if it's not enabled in room configuration
2015-09-01 11:52:08 +03:00
oxpa
3d5d1ecbe4
get_room_options will not crash in case of query for a non-existent room
2015-08-28 03:34:51 -08:00
Evgeniy Khramtsov
832f6d39f9
Always include RSM in final message
2015-08-24 13:29:15 +03:00
Evgeniy Khramtsov
94444c87e8
Remove MAM archives on MUC room destroy
2015-08-24 13:28:58 +03:00
Badlop
247bd9eae5
More eye-candy mod_http_bind help page (thanks to Marek Foss)
2015-08-21 15:23:15 +02:00
Evgeniy Khramtsov
6177ae3ffb
Improve S2S certificate checks
2015-08-20 01:04:56 +03:00
Evgeniy Khramtsov
b570070834
Fix case clause during S2S certificate checks
2015-08-19 23:47:45 +03:00
Evgeniy Khramtsov
775cf2d459
Change namespace from muc#admin to muc#user
2015-08-19 15:31:35 +03:00
Paweł Chmielowski
6f0ee83317
Don't overwrite listeners for different transports in config merging
...
Before this having listeners on same port for both tcp and udp would after
config merging step left only one of them.
Many thanks to Holger Weiß for noticing this.
2015-08-19 10:14:39 +02:00
Paweł Chmielowski
f89db30d77
Catch errors when calling inet:peername in ejabberd_http
2015-08-17 15:50:35 +02:00
Badlop
ac6b436dcf
Prettify copyright links (thanks to GreenLunar)( #692 )
2015-08-13 12:22:14 +02:00
Badlop
994602c97d
Store and retrieve "mam" value in room configuration
2015-08-12 20:28:23 +02:00
Badlop
279d4b00ac
Fix and document create_rooms_file and destroy_
2015-08-12 17:18:41 +02:00
Badlop
8c9c556f1f
Changed API of some mod_muc_admin command arguments
...
With this commit, arguments change in two commands:
* destroy_room: does not require Host argument
* send_direct_invitation: instead of Room, now requires Name and Service
2015-08-12 13:26:24 +02:00
Badlop
ab0f488dda
Room response to disco#info node muc#traffic should be an error (EJAB-741)
2015-08-12 12:40:51 +02:00
Evgeniy Khramtsov
40feed723d
Add support for MUC MAM
2015-08-08 22:15:36 +03:00
Paweł Chmielowski
c71d57a05d
Handle merging of append_host_config as is done for host_config
2015-08-06 17:53:18 +02:00
Paweł Chmielowski
5a1ac4faf1
Add ability to override main config file options with data from included files
2015-08-06 17:12:15 +02:00
Christophe Romain
45a312a0eb
Remove obsolete pubsub migration command
2015-08-06 16:57:04 +02:00
Matthias Rieber
f5e857a5bd
typo
2015-08-06 08:44:15 +02:00
Alexey Shchepin
4125dfd166
mod_multicast changes:
...
- catch exceptions
- do ets:give_away for multicastp table on init
- don't send multicasts to itself
- don't check user@server for multicast support
- handle empty disco items
- ignore cdata in <addresses/>
- properly check for subdomains
2015-08-05 19:21:28 +03:00
Paweł Chmielowski
3a5dd51b42
Use websocket pings also on old style connections
2015-08-05 16:09:23 +02:00
Christophe Romain
dc0934bff7
Update FSF address
2015-08-05 09:52:54 +02:00
Holger Weiss
c0497d46af
mod_client_state: Throttle stanzas by default
...
Enable the mod_client_state options "drop_chat_states" and
"queue_presence" by default. These features are now well-tested in
practice.
2015-08-05 00:05:11 +02:00
Holger Weiss
13f7be682d
Rename muc_filter_packet to muc_filter_message
...
The hook is just triggered on groupchat messages, not on other types of
stanzas.
2015-08-04 21:16:45 +02:00
Holger Weiss
3d4e8ffac6
New hook: muc_filter_presence
...
Add a hook that allows for modifying or dropping presence stanzas sent
to MUC rooms.
2015-08-04 20:13:00 +02:00
Mickael Remond
e3b7d43b76
Add split_jid/1
...
This is a convenience reverse of make_jid/1. It allows extracting the jid parts
without relying on using the jid record structure, to abstract details.
2015-08-04 09:48:59 +02:00
Evgeniy Khramtsov
f377992232
Do not crash SIP authentication on SCRAMed passwords
2015-08-02 14:47:45 +03:00
wcy123
3e49bf0e83
bug fix: ejabberd:start_app need to pass Type to application:start
2015-07-30 18:57:59 +08:00
Holger Weiss
04094b3dcf
Don't copy messages of type "normal" without body
...
Don't carbon-copy messages of type "normal" that don't have a body
element as an immediate subtag. Those messages are usually generated by
clients or servers (as opposed to messages written by humans). This
includes MAM messages, for example.
2015-07-28 21:34:02 +02:00
Holger Weiss
8fe930c3d1
Also check for <no-storage/> hint
...
Check for the <no-storage/> and <no-permanent-storage/> hints in
addition to <no-store/> and <no-permanent-store/>. XEP-0334 (0.1)
mentions both variants, and unfortunately, both of them are in use.
2015-07-28 21:08:33 +02:00
Holger Weiss
1048e21643
XEP-0198: Don't add <delay/> tags to IQ stanzas
2015-07-28 21:00:12 +02:00
Badlop
d03d08539b
Reuse some strings in WebAdmin's Listening Ports
2015-07-27 11:40:56 +02:00
Paweł Chmielowski
76104cd117
Fix problem with merging values from multiple config files
2015-07-24 15:46:08 +02:00
Christophe Romain
e211bf7131
Ensure config snippet is loaded at module installation (EJAB-1741)
2015-07-24 15:09:57 +02:00
Christophe Romain
32fc586c08
Allow contribution to include .yml or .yaml config file
2015-07-24 14:30:31 +02:00
Christophe Romain
8fedc945bf
Allow migration of old pubsub items with xmlelement in body ( #479 )
2015-07-24 13:44:01 +02:00
Christophe Romain
d481017746
Merge pull request #642 from weiss/pep-on-caps-update
...
Also send PEP notifications when local contact updates CAPS
2015-07-24 12:07:22 +02:00
Badlop
19aad464da
Provide command for ODBC's convert_to_scram
2015-07-23 13:16:15 +02:00
Paweł Chmielowski
8df134e025
Don't crash web admin when displaying info about websocket using users
2015-07-22 11:54:11 +02:00
Christophe Romain
9091fcb1a1
Let nodetree call default flat plugin now
...
this fix mistake from previous commit 311fedaa
2015-07-22 11:20:06 +02:00
Christophe Romain
9aa2d92d90
Allow include of simple dependencies (EJAB-1737)( #391 )
...
Either contributed module include dependencies this way
deps/
dep1/
src/
include/
dep1/
src/
include/
Or includes rebar.config or rebar.config.script:
In this case, only git is supported (if git command available)
and ext_mod checkout code in deps directory.
In both case, only basic built procedure is supported. ext_mod
does not do more than bare compilation like this:
erlc -I include src/*erl
2015-07-22 10:48:44 +02:00
Christophe Romain
311fedaa12
Let flat be default plugin ( #609 )
2015-07-22 10:37:26 +02:00
Christophe Romain
9c36a9df78
Do not init nodes from mod_pubsub ( #609 )
...
Let each plugin do its own initialisation in init_plugins
init_nodes was an old function to be removed.
2015-07-22 08:03:27 +02:00
Christophe Romain
b47a27f3ac
Merge pull request #608 from weiss/bare-jid-subscription
...
PubSub: Check for node subscription of bare JID
2015-07-22 07:58:34 +02:00
Evgeny Khramtsov
531638e946
Merge pull request #632 from weiss/increase-max-ack-queue
...
XEP-0198: Increase default value of "max_ack_queue" option
2015-07-21 12:36:01 +03:00
Evgeny Khramtsov
a724893887
Merge pull request #618 from weiss/muc-message-hook
...
New hook: muc_filter_packet
2015-07-21 12:35:27 +03:00
Evgeniy Khramtsov
7f4c74dec9
Print content types more gracefully
2015-07-17 14:29:11 +03:00
Badlop
7395cc910e
Set direction of resource and connection ( #650 )
2015-07-15 21:39:13 +02:00
Badlop
c53d764119
If local guide.html file not found, redirect to the online guide
2015-07-15 20:45:55 +02:00
Badlop
3eb0b161b2
Update links to Guide in WebAdmin
2015-07-15 20:40:13 +02:00
Badlop
65551afcba
Support RTL page direction in WebAdmin for Hebrew ( #650 )
2015-07-15 19:01:32 +02:00
Badlop
f4376671ac
Set LTR direction to Raw links ( #650 )
2015-07-15 18:51:31 +02:00
Badlop
c012d7555b
Add links in WebAdmin to ejabberd and ProcessOne ( #661 )
2015-07-15 13:10:12 +02:00
Badlop
9ede414f01
Support more mod_muc_admin translation strings ( #659 )
2015-07-15 11:54:35 +02:00
Evgeniy Khramtsov
a53191fed5
Add "complete" attribute to MAM final response (EJABS-2484)
2015-07-10 14:05:47 +03:00
Evgeniy Khramtsov
8e27decdfd
Fix mod_mam compatibility with RSM for other backends
2015-07-10 13:59:33 +03:00
Evgeniy Khramtsov
0dfc8ade68
Fix tests related to MAM
2015-07-10 13:57:27 +03:00
Jerome Sautret
1db65e3614
Fix mod_mam compatibility with RSM (only with odbc backend).
2015-07-10 13:56:33 +03:00
Evgeniy Khramtsov
a168340838
During halt only shutdown MUC rooms on local node
2015-07-08 15:35:26 +03:00
Jerome Sautret
2598375051
Changed mam iq get to set as specified by XEP-0313 v0.3
2015-07-08 13:15:14 +03:00
Holger Weiss
0f96414279
Trigger PEP notifications on CAPS updates
...
Let mod_pubsub send last items whenever a contact updates the entity
capabilities. This was already done for remote contacts and is now also
done for local contacts.
2015-07-07 09:33:00 +02:00
Holger Weiss
edb18deb8f
mod_pubsub: Explain caps_update usage in a comment
...
The reason to use the caps_update hook for sending last items to remote
contacts is probably not obvious.
2015-07-06 23:45:25 +02:00
Mickael Remond
0770252e9b
Fix dialyzer warning
...
The function is call with binary format from ejabberd_c2s.
2015-07-05 13:33:34 +02:00
Holger Weiss
b7d7dc5201
XEP-0198: Increase timeout during resumption
...
Give gen_fsm:sync_send_all_state_event/3 a little more time to transfer
the (possibly somewhat large) c2s #state during session resumption.
2015-07-03 11:35:22 +02:00
Holger Weiss
5856f6d06a
XEP-0198: Increase default "max_ack_queue" value
...
During login, clients might receive a relatively large number of stanzas
in one go. For some users, the default value of the "max_ack_queue"
option turned out to be too small in that situation.
2015-07-03 11:35:22 +02:00
Holger Weiss
a25051fead
New hook: muc_filter_packet
...
Add a hook that allows for modifying or dropping MUC room messages.
Closes #491 .
2015-07-03 11:34:44 +02:00
Holger Weiss
4045c848c4
Send notifications on MUC configuration changes
...
Notify clients when the room configuration changes, as mandated by
XEP-0045, #10.2.1.
Closes #623 .
2015-07-02 00:36:16 +02:00
Evgeniy Khramtsov
3c12d1a960
Do not rely on behaviour info when doing config validation
2015-06-29 22:50:34 +03:00
Holger Weiss
7c7e51b6e8
Omit warning message regarding non-anonymous room
...
Previous versions of XEP-0045 suggested sending a warning message to new
occupants of a non-anonymous MUC room. The current revision (1.25) says
that a status code of "100" must be returned with the user's initial
presence, instead. We already do this (in addition to generating the
warning message).
Receiving the warning message each time the client joins the room can
become annoying, especially when reconnections occur frequently (e.g.,
on mobile devices). So, we omit it, now.
2015-06-28 14:05:55 +02:00
Badlop
4ae1b4db03
When passwords are scrammed, report check_password_hash cannot work ( #559 )
2015-06-25 13:39:45 +02:00
Badlop
72f35a6dc6
Add xep definition to mod_mam
2015-06-24 11:58:37 +02:00
Evgeniy Khramtsov
83cce468a5
Add MAM (XEP-0313) support
2015-06-22 16:56:08 +03:00
Badlop
6631078884
Document a few more supported protocols
2015-06-22 13:11:37 +02:00
Holger Weiss
fc0754c609
Add s2s_dhfile to list of known options
2015-06-20 00:14:54 +02:00
Holger Weiss
73a0fb418c
Update comment that explains how to set up node_mb
...
Specify settings that make sense with current ejabberd versions, and use
the YAML configuration format. Also, specify the "urn:xmpp:microblog:0"
namespace, as that's the microblogging node name currently defined by
XEP-0277.
2015-06-19 23:13:36 +02:00
Holger Weiss
04038c01f7
PubSub: Check for node subscription of bare JID
...
Don't just check whether the full JID is subscribed when a node
subscription is required to list or publish items. If the bare JID is
subscribed, these requests are now also accepted.
2015-06-19 00:50:08 +02:00
Badlop
36a96ae3f5
change_room_option misses handling some room options #604
2015-06-18 13:13:49 +02:00
Christophe Romain
d528457ba5
Don't force persistence if cache enabled (fix previous commit)
2015-06-18 12:54:46 +02:00
Christophe Romain
e5a98b100d
Fix max_items and don't let PEP depends on item cache
2015-06-18 12:06:29 +02:00
Badlop
1cf2dfe63a
New hide_sensitive_log_data option to hide client IP in log ( #452 #471 )
2015-06-17 11:32:42 +02:00
Holger Weiss
e608274243
Add s2s_dhfile option to configuration validator
2015-06-16 15:18:34 +02:00
Alexey Shchepin
2110b929bc
Merge pull request #581 from weiss/dh-param-file
...
New options: dhfile and s2s_dhfile
2015-06-16 11:59:06 +03:00
Paweł Chmielowski
dcf5aefea0
Add option to set net_ticktime (EJAB-1742)
2015-06-15 14:57:07 +02:00
Badlop
357ff6c8f7
Fix bug introduced in commit b88fa6f617
2015-06-04 15:47:02 +02:00
Badlop
fe10c6f6f2
Pick first local multicast service, otherwise remote (ejabberd-contrib#105)
2015-06-04 12:13:10 +02:00
Holger Weiss
6c712b6caa
Don't add body element to MUC subject messages
2015-06-04 09:55:38 +02:00
jpegger
6f48f22c71
Authmodule using old style XML:get_attr_s()
2015-06-03 18:11:35 +02:00
Evgeniy Khramtsov
9a9633dbc5
Do not ignore unknown options so far
2015-06-03 16:21:22 +03:00
Evgeniy Khramtsov
c1119b1f39
Remove unused validation code
2015-06-03 16:05:17 +03:00
Evgeniy Khramtsov
ab196b4b02
Move opt_type/1 function out of if-else block
2015-06-03 15:52:19 +03:00
Evgeniy Khramtsov
730fd55ec9
Fix typo
2015-06-03 15:45:15 +03:00
Evgeniy Khramtsov
0ae9ef2b41
Add missing options of ejabberd_logger to validator
2015-06-03 15:25:20 +03:00
Evgeniy Khramtsov
83faff37e5
Add missing options of mod_muc to validator
2015-06-03 15:18:09 +03:00
Badlop
4ed6a3d78f
Fix commands export2odbc, connected_users_vhost and push_alltoall ( #586 )
2015-06-02 12:52:15 +02:00
badlop
0de7864880
Merge pull request #585 from CorCornelisse/master
...
push_roster* not updated on binarification
2015-06-02 12:24:46 +02:00
Evgeniy Khramtsov
157ff4d093
Merge branch 'master' of github.com:processone/ejabberd
2015-06-01 15:38:37 +03:00
Evgeniy Khramtsov
fb6267f38e
Add config validation at startup
2015-06-01 15:38:27 +03:00
Badlop
9a802185ad
Fix anonymous user login, it wasn't stored in anonymous mnesia table
2015-06-01 14:34:49 +02:00
Evgeniy Khramtsov
a9f7d9481f
Do not try to fetch module options via eldap_utils
2015-06-01 15:22:31 +03:00
Evgeniy Khramtsov
ea7de2097f
Reorganize get_opt() code in some modules
2015-06-01 15:20:49 +03:00
Evgeniy Khramtsov
48213b09ce
Get rid of some fuzzy macros as it makes syntax tools getting mad
2015-06-01 15:19:56 +03:00
Cor Cornelisse
22d9011c0c
These arguments should be binary instead of strings, otherwise it won't work properly
2015-06-01 13:30:26 +02:00
Badlop
100827ec6e
In xmlrpc use process_unicode_codepoints instead of list_to_binary
2015-05-29 15:49:12 +02:00
Evgeniy Khramtsov
a291e7d4e6
Fix MUC room options vaildation
2015-05-29 12:08:36 +03:00
Evgeniy Khramtsov
e8ffbbb0b4
Validate MUC room options from the configuration file
2015-05-28 11:42:17 +03:00
Badlop
d0443bb714
An auth external module requires ext_mod to be started first ( #578 )
2015-05-27 13:10:15 +02:00
Holger Weiss
5585fb1ecf
New options: dhfile and s2s_dhfile
...
Let admins specify a file that contains custom parameters for
Diffie-Hellman key exchange.
2015-05-26 21:06:04 +02:00
Christophe Romain
b83c07251c
Fix pubsub/odbc crash on remote user unsubscribe (EJAB-1483)
2015-05-26 19:19:57 +02:00
Alexey Shchepin
b2f98099bb
Merge pull request #569 from weiss/send-element-error-checking
...
Update send_element error checking (EJAB-1739)
2015-05-26 15:59:50 +03:00
Mickael Remond
9574e71e8d
Include session record from header file instead of duplicating it
2015-05-26 10:08:46 +02:00
Paweł Chmielowski
3af507cc43
Fix merging of not yaml config files
2015-05-25 15:37:46 +02:00
Christophe Romain
e54e556e01
Fix use of publish_only affiliation with odbc backend
2015-05-22 18:47:17 +02:00
Badlop
b07cb1ed84
Use namespace definitions when possible
2015-05-21 17:04:14 +02:00
Badlop
0c725b5fac
Document protocol support (EJABS-1620)
2015-05-21 17:04:05 +02:00
badlop
b04f3a4c93
Merge pull request #573 from sezuan/fix_odbc
...
Fix some string/binary issues with non-native ODBC drivers
2015-05-21 11:31:47 +02:00
Holger Weiss
889459b45c
Fix function specification
2015-05-20 12:13:15 +02:00
Evgeniy Khramtsov
3b267eaa61
Do not bounce normal messages sent to unavailable resource
2015-05-19 10:58:36 +03:00
Holger Weiss
fba13a0b93
Simplify XEP-0203 (Delayed Delivery) code a bit
...
Now that XEP-0091 support is removed, the XEP-0203 code can be
simplified a little further. This doesn't change the behavior.
2015-05-18 21:26:51 +02:00
Christophe Romain
8bb994dbca
Call integer_to_binary using jlib ( #554 )
2015-05-18 17:30:25 +02:00
Badlop
2af659b737
Remove deprecated XEP-0090 Entity Time and 91 Delayed Delivery (EJAB-849)
2015-05-18 12:38:25 +02:00
Matthias Rieber
16532dd643
Fixed some string()/binary() issues in ejabberd_odbc
2015-05-18 12:14:56 +02:00
Matthias Rieber
f5c9dfbc93
fixed erl_prettypr in encode_term
2015-05-17 19:37:49 +02:00
Badlop
084d0c4efe
New command get_room_options ( #567 )
2015-05-15 17:47:10 +02:00
Holger Weiss
61afd668c2
Fix indentation
2015-05-15 15:50:43 +02:00
Paweł Chmielowski
de7ff536b2
Load config snippets for modules installed with ext_mod (EJAB-1741)
2015-05-15 12:30:15 +02:00
Paweł Chmielowski
5dbe7a3c6c
Export modules_dir/0
2015-05-15 12:27:59 +02:00
Holger Weiss
6efce7f706
Cosmetic change: Simplify error checking
...
Let send_stanza_and_ack_req/2 update the #state instead of propagating
the value returned by send_element/2. This doesn't change the behavior.
2015-05-14 01:04:23 +02:00
Holger Weiss
42c7205739
Don't assume send_element/2 returns ok or error
...
Let send_text/2 and (therefore) send_element/2 return {error, Reason}
instead of error for consistency, and let send_stanza_and_ack_req/2
interpret any non-ok value as an error. (EJAB-1739)
2015-05-14 00:58:36 +02:00
Badlop
d885435552
Fix setting 'description' with change_room_option command ( #567 )
2015-05-12 17:37:39 +02:00
Badlop
f817762cc4
New max_users_presence mod_muc option (thanks to anhcoi123)( #562 )
2015-05-08 13:09:25 +02:00
Badlop
25beb46391
Fix check_password_hash argument parsing ( #559 )
2015-05-08 12:04:04 +02:00
Badlop
7ab6c4b4fd
Try to support access_commands in YAML (ejabberd-contrib#45)
2015-05-07 18:34:05 +02:00
Badlop
b0b004b26e
Revert "Add private and roster local handlers (EJAB-682)" due to #556
...
This reverts commit 2e194bd997
.
2015-05-07 17:07:49 +02:00
Badlop
f7d9bb7ce4
Don't announce register feature once user is authenticated ( #41 )
2015-05-07 11:41:59 +02:00
Ben Langfeld
917d48f30b
Use SASL PLAIN authzid as client identity if auth module permits it
...
This allows the authentication modules to perform SASL proxy authentication. It puts the onus on them to authorize the authcid to masquerade as the authzid. Doesn't currently implement such functionality in existing auth modules, since they cannot currently codify a relationship between the two identities. Does not permit the authzid to use a domain differently from the one of the connection.
Note: digest might not work, but I have no interest in it, being deprecated.
2015-05-06 14:12:15 -03:00
Ben Langfeld
d9814709e2
Remove commented code
2015-05-06 12:55:35 -03:00
Holger Weiss
7297b23508
Tag private MUC messages with muc#user namespace
...
Make it possible for clients to identify private MUC messages. One use
case would be to filter out undesired carbon copies of those.
2015-05-05 22:00:05 +02:00
Badlop
fa99519f8b
Simplify internal code of get_last and set_last commands
2015-05-05 12:54:20 +02:00
Badlop
96c62acb1b
Improve get_last command to provide also last activity status
2015-05-05 12:46:21 +02:00
Badlop
77e57afae1
Fix set_last command to work with recent ejabberd ( #555 )
2015-05-05 12:45:53 +02:00
Evgeniy Khramtsov
60fe008268
Remove duplicated code
2015-04-29 14:51:45 +03:00
Christophe Romain
6987e85602
Improve module install code, allows better error checking
2015-04-29 13:30:03 +02:00
Badlop
7492ecae52
New command get_user_rooms
2015-04-29 13:22:49 +02:00
Christophe Romain
4440b03b89
Fix fetching from git@github url and allow compilation from ejabberd sources
2015-04-29 10:19:15 +02:00
badlop
6f99775115
Merge pull request #547 from weiss/fix-account-jid-disco
...
Fix service discovery handling for account JIDs
2015-04-27 19:39:32 +02:00
Badlop
987e337c66
Rely on core routine for handling affiliation changes (thanks to Ben Langfeld)
...
This ensures that all of the usual stanzas and such go out
2015-04-27 17:00:22 +02:00
Holger Weiss
dc449687a0
mod_disco: Apply minor readability improvements
2015-04-26 16:36:17 +02:00
Holger Weiss
0edba763fb
mod_disco: Omit 'roster_get' call if possible
...
As a small optimization, avoid running the 'roster_get' hook in the
(common) case where a client requests service discovery information for
its own bare JID.
2015-04-26 16:32:03 +02:00
Holger Weiss
50f35f1b07
Fix service disco handling for bare account JIDs
...
Don't swap the sending and receiving JIDs while checking whether the
client that requested service discovery information for a bare account
JID is a subscribed contact.
2015-04-26 16:22:09 +02:00
Evgeniy Khramtsov
9c85cb5f25
Fix validating function for iqdisc
2015-04-23 14:59:18 +03:00
Christophe Romain
38dd44e18f
Improve purge_offline filter and speed ( #543 )
2015-04-22 18:11:39 +02:00
Badlop
2e194bd997
Add private and roster local handlers to get listed in disco#info (EJAB-682)
2015-04-22 13:27:25 +02:00
Badlop
e280de8452
Allow to modify host when registering account in web ( #291 )
2015-04-22 11:01:47 +02:00
Christophe Romain
6e4d6caebf
Add support for publish-only ( #30 )
2015-04-21 17:23:59 +02:00
Christophe Romain
cf37f3977a
Fix typo, oups...
2015-04-21 16:13:23 +02:00
Christophe Romain
61f80396da
remove deferred Collection shim header
2015-04-21 16:11:00 +02:00
Christophe Romain
cbd45974e2
Owner can subscribe to its node ( #454 )
2015-04-21 15:24:31 +02:00
Christophe Romain
747d25b4ad
Fixed node type (thanks to saczawap) ( #435 )
2015-04-21 15:24:24 +02:00
Christophe Romain
e0563e3918
PubSub improvements
...
This commit contains
- code cleanup
- use of db_type instead of old mod_pubsub_odbc
- some minor optimizations
- some minor bugfixes
2015-04-21 15:24:16 +02:00
Christophe Romain
28090a3958
Merge pull request #540 from weiss/queue-error-stanza
...
Add privacy error stanza to XEP-0198 queue
2015-04-21 11:19:49 +02:00
Evgeniy Khramtsov
ed79a61752
Fix LDAP substrings filter (EJAB-1715)
2015-04-21 11:49:41 +03:00
Holger Weiss
94936b261e
Add privacy error stanza to XEP-0198 queue
2015-04-20 22:03:18 +02:00
Alexey Shchepin
fd54181435
Fixed error replying on blocked messages
2015-04-20 17:19:09 +03:00
Badlop
c2e6ce0f04
Remove load_config command because is superseded by reload_config ( #532 )
2015-04-20 15:57:44 +02:00
Evgeny Khramtsov
837706e9d9
Merge pull request #536 from weiss/fail2ban-whitelist
...
Add mod_fail2ban option to whitelist IP addresses
2015-04-18 12:28:36 +03:00
Holger Weiss
aa36742a40
mod_fail2ban: Add 'access' option for whitelisting
...
Closes #535 .
2015-04-18 11:08:05 +02:00
Holger Weiss
c01940f33c
cyrsasl_scram: Return user name with error message
...
Let ejabberd_c2s run the 'c2s_auth_result' hook (which needs the user
name) on SCRAM authentication failure.
2015-04-17 20:21:11 +02:00
Holger Weiss
afdc269825
ejabberd_s2s_out: Remove Erlang/OTP version check
...
The version check won't work for Erlang/OTP >= 17; and it's no longer
needed, as we don't support versions older than R16 anyway.
2015-04-16 23:51:16 +02:00
Badlop
d624753410
Update get_password_s description with SCRAM return values
2015-04-15 11:51:34 +02:00
Badlop
a5adaf5798
Revert "Hook on group message"
...
This reverts commit b81250d667
.
2015-04-15 11:51:29 +02:00
badlop
31c5775025
Merge pull request #426 from hairyhum/master
...
Migration of scram passwords with piefxis (riak and internal only)
2015-04-15 11:04:29 +02:00
Paweł Chmielowski
ba69c469b5
Remove http_poll module
...
For couple years browsers did limit ability to change cookies from js
for different domains, this made http_poll connections practically not
usuable. I don't think this module is used at all so it's time to put it
to rest.
2015-04-15 10:47:10 +02:00
Holger Weiss
e408276283
Don't forget gen_tcp:listen/2 options
...
Fixes #530 .
2015-04-14 20:22:34 +02:00
Badlop
b67af5e036
Fix nick logging in mod_muc_log plaintext ( #522 )
2015-04-14 15:46:59 +02:00
Badlop
25449a076f
Clean multicast routing code detected by xref
2015-04-10 16:02:45 +02:00
Paweł Chmielowski
8732817c3c
Fix problem with pushing bufferend #xmlel-s to receiver in websocket code
2015-04-09 13:35:37 +02:00
Badlop
f129c6530c
Fix bug when sorting the list of rooms in WebAdmin
2015-04-08 15:34:08 +02:00
Evgeniy Khramtsov
32b60d4250
Remove hack with binary to integer conversion
2015-04-08 16:11:06 +03:00
Evgeniy Khramtsov
7a89dda816
Merge branch 'master' of github.com:processone/ejabberd
2015-04-08 15:31:41 +03:00
Evgeniy Khramtsov
9b4942890d
Add virtual host support for SQLite
2015-04-08 15:31:28 +03:00
Badlop
0cf8d1fa6e
Copy multicast code from ejabberd-contrib to provide XEP-0033 ( #521 )
2015-04-08 14:01:16 +02:00
Evgeniy Khramtsov
675c428f21
Disable awkward trap_exit flag
2015-04-08 14:40:28 +03:00
Evgeniy Khramtsov
bdedcf8d8a
Enable FOREIGN KEYS by default
2015-04-08 14:39:47 +03:00
Evgeniy Khramtsov
2a3a2d9804
Make sure SQLite always returns binaries
2015-04-08 14:38:04 +03:00
Evgeny Khramtsov
5a820aca40
Merge pull request #486 from saa/sqlite_support
...
Add SQLite support
2015-04-08 14:34:56 +03:00
Jerome Sautret
c3280e9dad
Add mod_muc_admin contrib.
2015-04-07 17:05:43 +02:00
Holger Weiss
0fd4984c23
ejabberd_listener: Remove Erlang/OTP version check
...
We don't support Erlang/OTP versions older than R16 anyway.
2015-04-07 09:47:05 +02:00
Evgeny Khramtsov
b81b0d0be9
Merge pull request #518 from liudanking/master
...
fix otp version check in ejabberd_listener.erl listen_tcp/5
2015-04-07 10:34:18 +03:00
Mickael Remond
c140f98276
Explicitly start crypto with start
...
This is to please Elixir / Phoenix enviroment
2015-04-07 09:03:37 +02:00
liudan
f981a53f9a
fix otp version check in listen_tcp/5
2015-04-07 09:28:35 +08:00
Holger Weiss
2a94c68724
Don't call send_element/2 if previous call failed
...
Be sure not to try sending data over a TCP socket that is no longer
usable.
2015-04-06 22:34:48 +02:00
Paweł Chmielowski
81b0643036
Fix problem with c2s buffering on old style websocket connections
...
Old style websocket do use binaries for transferring data to C2S, so when
we buffer that data we need to handle it different than list of #xml structs
used by new style connections.
This fixes github issue #515 .
2015-04-06 17:54:45 +02:00
Paweł Chmielowski
64978b3d9c
Merge pull request #513 from weiss/ignore-header-case
...
ejabberd_websocket: Ignore case of HTTP header values
2015-04-06 17:49:51 +02:00
Mickael Remond
34f8f6d868
Explicitely start crypto module
...
Without explicit start, it causes issue when embedding ejabberd into other apps.
2015-04-06 13:46:09 +02:00
Evgeniy Khramtsov
69bff82301
Fix type spec
2015-04-06 12:38:54 +03:00
Mickael Remond
47537aa901
Make sure Mnesia dir environment and log file are list, not binary
...
This is useful for Elixir configuration, as binary is the more natural data type.
Closes #514
2015-04-06 11:36:16 +02:00
Holger Weiss
0cd77ab942
ejabberd_websocket: Ignore case of header values
...
RFC 6455 says that the client's opening handshake includes an Upgrade
header field "containing the value 'websocket', treated as an ASCII
case-insensitive value."
Closes #510 .
2015-04-05 14:48:08 +02:00
Mickael Remond
ea8db9967f
ejabberd can be embedded in an Elixir application
2015-04-04 17:42:12 +02:00
Badlop
7d3b2cad26
Replace crypto calls that will be removed in a future release
2015-04-04 14:09:58 +02:00
Badlop
cf40daf663
Replace undefined value with empty one ( processone/ejabberd-contrib#92 )
2015-04-04 13:48:17 +02:00
Holger Weiss
1fa73fd33f
Remove unused case clauses to make dialyzer happy
2015-04-03 20:37:42 +02:00
Badlop
94761ff31e
Improve srg_get_info result format ( processone/ejabberd-contrib#92 )
2015-04-03 12:16:11 +02:00
Paweł Chmielowski
088c5c4672
Fix output formatting in srg_get_info commend from mod_admin_extra
2015-04-02 16:55:51 +02:00
Paweł Chmielowski
b580da3547
Fix problems with get_vcard* functions from mod_admin_extra
2015-04-01 16:32:34 +02:00
Paweł Chmielowski
cf3b4dbc7b
Drop exmpp usage from mod_admin_extra
2015-04-01 15:44:49 +02:00
Evgeny Khramtsov
305b281c15
Merge pull request #493 from weiss/rfc-6121-routing
...
Update ejabberd_sm's routing rules as per RFC 6121
2015-04-01 11:41:05 +03:00
Evgeniy Khramtsov
821039b7d5
Swap 'mnesia' and 'internal' types correctly
2015-03-30 12:25:25 +03:00
Evgeniy Khramtsov
fb1fd50df5
The 'default_db' option should impact ejabberd_auth as well
2015-03-30 12:18:18 +03:00
Evgeniy Khramtsov
4af15df546
Add new 'default_db' option
2015-03-30 12:15:29 +03:00
Sergey Abramyan
15af88a09a
Fix lite.sql and convert binary to integer
2015-03-27 22:14:29 +03:00
Badlop
176114d28e
Try to fix more Dialyzer warnings
2015-03-27 15:55:57 +01:00
Badlop
9c96d30719
Ensure set_presence changes are kept in state (thanks to Davide Colombo)(EJAB-1184)
2015-03-27 15:03:14 +01:00
Badlop
30dc82a98a
Fix even more dialyzer warnings
2015-03-27 12:28:24 +01:00
Badlop
8707c0b045
Fix set_presence command (ejabberd-contrib#61)
2015-03-27 11:43:56 +01:00
Badlop
10dfd182f6
Fix more mod_admin_extra commands
2015-03-26 20:41:16 +01:00
Badlop
9b3dda105d
Fix problems in process_rosteritems command
2015-03-26 16:18:39 +01:00
Badlop
fbb6b65192
Detect correctly when vCard does not exist ( #21 )
2015-03-26 14:00:58 +01:00
Badlop
0c30beb93d
Fix return error when requesting non-existing vcard value ( #21 )
2015-03-26 14:00:54 +01:00
Mickaël Rémond
c9393bc4f4
Ignore errors when retrieving status if the users just got offline
...
Fix possible race condition.
2015-03-26 14:00:50 +01:00
Holger Weiss
5103ed1c3b
mod_admin_extra: Let send_message omit subject
...
Let the send_message command omit the subject if the user either
specified an empty subject or a message type of "chat".
2015-03-26 14:00:48 +01:00
Badlop
88cd8c7b12
Update FSF address (solves #73 )
2015-03-26 14:00:46 +01:00
HAMANO Tsukasa
00fe68ed06
fix connected_users_info in mod_admin_extra
2015-03-26 14:00:44 +01:00
Holger Weiss
09dd288ac0
mod_admin_extra: Fix private_get/private_set types
2015-03-26 14:00:42 +01:00
Badlop
2186c03a9c
Support TEL XXX in set and get_vcard commands
2015-03-26 14:00:40 +01:00
colm
441d48f080
Changed signature of user_sessions_info to take binaries rather than strings as it doesn't match anything in mnesia if it searches it by string
2015-03-26 14:00:38 +01:00
Badlop
c3afc3c7c0
Join three send_message_* commands in one (PR #68 )
2015-03-26 14:00:36 +01:00
HAMANO Tsukasa
9a64bfe605
add send_message_normal command
2015-03-26 14:00:34 +01:00
HAMANO Tsukasa
ca25d44c8b
fix mod_admin_extra stats command
2015-03-26 14:00:32 +01:00
Holger Weiss
4e9b4cbc11
mod_admin_extra: Fix stats(_host) argument types
2015-03-26 14:00:30 +01:00
Badlop
46b33b51b4
Update kick_session to work with ejabberd master
2015-03-26 14:00:28 +01:00
Sonny Scroggin
3eebf100f9
Binary conversions
2015-03-26 14:00:24 +01:00
Sonny Scroggin
5c0a1dde1c
More binary conversions
2015-03-26 14:00:21 +01:00
Badlop
949705b04a
Update add_roster_item and get_roster to ejabberd 13
2015-03-26 14:00:18 +01:00
Badlop
f682dfe3a6
Fix get_vcard and set_vcard when using option module_resource (issue #21 )
2015-03-26 14:00:16 +01:00
Sonny Scroggin
14a3662ca4
Fix add_rosteritem, delete_rosteritem, and get_roster
2015-03-26 14:00:14 +01:00
Badlop
ffea2bf350
Update get_vcard and set_vcard to ejabberd 13 (fixes issue #21 )
2015-03-26 14:00:12 +01:00
Rahul Gautam
f314da7b1f
mod_admin_extra: for support in ejabberd-v13.x changed args from string to binary : all changes tested with ejabberdv13.12
2015-03-26 14:00:10 +01:00
Badlop
d72c739630
Fix command change_password ( fixes #16 )
2015-03-26 14:00:08 +01:00
Badlop
57035b383c
Handle error when requesting information of a non-existing shared roster ( fixes #14 )
2015-03-26 14:00:06 +01:00
Badlop
2746e358b3
Fixes srg_* commands ( fixes #147 )
2015-03-26 14:00:04 +01:00
Badlop
d66f40d94f
Fix srg_create when calling ejabberd_regexp (fixes issue #12 )
2015-03-26 14:00:01 +01:00
Badlop
e6a9c5ccee
Add get_last to ejabberdctl for last user activity (thanks to lehrblogger)
...
The logic for determining the response is borrowed from here:
6d811f5178/src/web/ejabberd_web_admin.erl (L1583-L1601)
2015-03-26 13:59:59 +01:00
Badlop
f0cf90c11e
Initial import from ejabberd-modules SVN
2015-03-26 13:59:57 +01:00
Paweł Chmielowski
de26af3fdb
Make sure that we send each time <close> before closing websocket connection
2015-03-25 17:10:08 +01:00
Badlop
d9ad26b4ec
If command crashes, return restuple with error and explanation (ejabberd-contrib #21 )
2015-03-25 13:57:08 +01:00
Holger Weiss
f40e6a0421
Don't bother with filtering out PEP error messages
...
Now that ejabberd_sm won't deliver error messages that were sent to bare
JIDs anymore, PEP error messages should no longer arrive.
2015-03-25 02:02:08 +01:00
Holger Weiss
1b1878409f
Route headlines sent to bare JIDs to all resources
...
As per RFC 6121, deliver headline messages that were sent to a bare JID
to all resources with a non-negative priority, not just to those with
the highest priority. If no such resource is available, discard them
silently.
2015-03-25 01:17:35 +01:00
Holger Weiss
8f9a2d6df8
Don't route error/groupchat messages to bare JIDs
...
As per RFC 6121, drop error messages that were sent to bare JIDs, and
return an error if a groupchat message was sent to a bare JID.
2015-03-25 00:52:49 +01:00
Holger Weiss
bc008d4041
Update routing for unavailable resources
...
As per RFC 6121, don't reroute non-chat messages sent to unavailable
resources.
2015-03-25 00:13:05 +01:00
Holger Weiss
33c9f21171
Return error when incoming message is blocked
...
As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming message was blocked by a privacy list. This lets the user
appear offline to the contact.
2015-03-24 23:10:47 +01:00
Holger Weiss
27a4d783a5
Fix "IP address not available" error message
2015-03-24 17:32:57 +01:00
Alexey Shchepin
736710cc9c
Add support for ciphers and protocol_options in ejabberd_http
2015-03-24 18:14:47 +03:00
Holger Weiss
31e356c126
Avoid crypto:hmac/3 call for R15B compatibility
2015-03-21 22:56:23 +01:00
Holger Weiss
a5d6044448
Fix compilation on Erlang R15B
2015-03-21 22:06:38 +01:00
Christophe Romain
8b23727cc6
Start ext_mod before module as it's setup contrib path
2015-03-20 15:06:02 +01:00
Alexey Shchepin
5135e30633
Removed deprecated calls to crypto:sha_mac in scram.erl
2015-03-20 14:09:38 +03:00
Alexey Shchepin
f6db84282b
Add ejabberd_auth_odbc:convert_to_scram/1
2015-03-20 13:46:17 +03:00
Alexey Shchepin
e575c87ea2
Add SCRAM support to ejabberd_auth_odbc
2015-03-20 13:45:24 +03:00
Jerome Sautret
6b67a66a1b
Added MySQL support for delete_old_messages (offline) command.
2015-03-20 10:40:19 +01:00
Evgeniy Khramtsov
4d2924a3ef
Fix mod_offline termination
2015-03-20 10:40:13 +01:00
Alexey Shchepin
b7726ee392
Explicitly set standard_conforming_strings to off with PostreSQL
2015-03-20 10:39:29 +01:00
Evgeniy Khramtsov
51508a9fc3
Report TLS errors
2015-03-20 10:39:14 +01:00
Sergey Abramyan
5ae01e8bb4
Add SQLite support
2015-03-20 01:10:47 +03:00
Christophe Romain
aa1250a3dd
Add missing list_to_binary call
2015-03-13 17:59:19 +01:00
Christophe Romain
5b9635cc07
Add contributed modules code path on start
2015-03-13 12:20:25 +01:00
Christophe Romain
588f98fc3a
Rename module function to keep them grouped on help
2015-03-13 11:54:32 +01:00
Evgeniy Khramtsov
f72799b3cc
Improve module structure
2015-03-13 13:05:16 +03:00
Evgeniy Khramtsov
bbe5c6b74e
Do not fail on badly formed SQL results
2015-03-13 12:59:16 +03:00
Evgeniy Khramtsov
c7dc56c314
Fix unblock all when Riak is used as a backend
2015-03-13 12:47:08 +03:00
Paweł Chmielowski
bf5c7198fc
Update sockmod() type after adding websocket support
2015-03-12 13:15:31 +01:00
Christophe Romain
7209954a5f
Remove unused clause
2015-03-12 13:15:07 +01:00
Paweł Chmielowski
e855791f16
Update types to fix dialyzer warnings
2015-03-12 10:34:34 +01:00
Holger Weiss
b045bd806a
mod_offline: Remove a few superfluous newlines
2015-03-11 20:38:22 +01:00
Holger Weiss
0bfde19ebd
Don't crash in mod_offline:export/1
...
(Thanks to Christophe Romain.)
2015-03-11 20:35:08 +01:00
Christophe Romain
2d53f7f83e
start ext_mod in later stage at init
2015-03-11 17:39:07 +01:00
Christophe Romain
a1a46f7df5
Remove unused code
2015-03-11 17:15:42 +01:00
Christophe Romain
c9b82ff1e5
Compile contributed module with lager if enabled in ejabberd
2015-03-11 14:35:01 +01:00
Christophe Romain
f77622067b
Add packaging support for contributed modules
...
This is a preliminary version that is tested to work with the packaging
branch of ejabberd-modules repository
This version lacks automatic configuration include at runtime
2015-03-11 14:14:28 +01:00
Evgeniy Khramtsov
a0fafc383a
Add Redis backend for SM
2015-03-11 14:46:57 +03:00
Holger Weiss
d991b92a49
Always specify room JID for MUC <delay/> elements
...
As per version 1.25 of XEP-0045, use the room JID as the 'from' address
for <delay/> elements also when the room is non-anonymous, and specify
the original JID of the sender as an XEP-0033-style tag instead.
Closes #465 .
2015-03-10 00:02:32 +01:00
badlop
0a88255ef6
Merge pull request #467 from hamano/mod_offline_restart
...
change mod_offline restart type
2015-03-09 19:26:19 +01:00
Evgeniy Khramtsov
c0540e1377
Fix R15B compilation
2015-03-09 17:50:14 +03:00
Evgeniy Khramtsov
72d9b099c6
Make it possible to use SQL as an SM backend
2015-03-09 16:41:13 +03:00
Evgeniy Khramtsov
86e03f3828
Separate db backend from the SM
2015-03-09 14:57:33 +03:00
HAMANO Tsukasa
f55de94314
change mod_offline restart type
2015-03-09 20:28:55 +09:00
Mickaël Rémond
8fef3d1f3f
Reorganize / clean ejabberd_hooks header
2015-03-08 19:03:02 +01:00
Mickaël Rémond
a339df2d6a
More ejabberd_hooks refactor
2015-03-08 18:44:43 +01:00
Mickaël Rémond
fd91ee5169
ejabberd_hooks refactor and better types
2015-03-08 18:23:22 +01:00
Mickaël Rémond
750fefcd6d
Add Elixir test on ejabberd hooks
...
This is to prepare ejabberd_hooks module refactoring.
I also expanded API to help with testing.
2015-03-08 17:06:43 +01:00
Badlop
f18ce9564c
Fix: default_host is forgotten between consecutive HTTP requests ( #416 )
2015-03-06 12:40:48 +01:00
Badlop
e0228e9b7a
Access list editing broken in web_admin ( #252 )
2015-03-05 11:34:25 +01:00
Badlop
e575f401cd
Accept configuration file with .yaml extension ( #290 )
2015-03-04 17:18:57 +01:00
Mickaël Rémond
8a99287374
Merge branch 'master' of github.com:processone/ejabberd
2015-03-03 22:20:08 +01:00
Mickaël Rémond
f0f8301b5e
Fix typo on state reuse
...
It should help with the crash on #453
2015-03-03 22:19:51 +01:00
Christophe Romain
a265ea53f9
Merge pull request #384 from weiss/fix-last-item-type
...
Use correct message type when sending last published PEP/PubSub items
2015-02-27 11:40:12 +01:00
badlop
e10d5af303
Merge pull request #443 from mojolingo/feature/muc_admin/affiliation-change-propogate-xmpp
...
Permit modifying affiliations via an event
2015-02-26 11:48:17 +01:00
Ben Langfeld
a6c5a3593f
Permit modifying affiliations via an event
...
Allows us to implement mod_muc_admin:set_room_addiliation properly
2015-02-25 12:31:27 -03:00
Badlop
5bd8724801
Update FSF address
2015-02-25 15:19:33 +01:00
Paweł Chmielowski
ab3d38c9fc
Fix processing POST messages after changes from adding websocket handling
2015-02-25 14:36:48 +01:00
Paweł Chmielowski
8e33f31f50
Try not to use c2s:send_text, it causes problem with websocket
2015-02-25 13:57:03 +01:00
Paweł Chmielowski
b42b171613
Add support for websocket connections
2015-02-25 13:57:02 +01:00
Feotov Daniil
b81250d667
Hook on group message
2015-02-24 11:06:41 +03:00
Christophe Romain
0c0947a241
Add compatibility macros for deprecated types (thanks to Alexey)
2015-02-23 09:58:00 +01:00
Holger Weiss
e87d332394
mod_carboncopy: Apply small code simplification
2015-02-12 00:14:57 +01:00
Holger Weiss
bc7f93ad1e
Check availability before carbon copying
...
Before generating a carbon copy for a resource, make sure it's actually
available. This handles the case where, for some reason, the
'unset_presence_hook' wasn't called during logout of a resource. Carbon
copies sent to that resource would otherwise be re-routed to another
resource (which might've received a copy of that message already).
2015-02-11 16:12:08 +01:00
Holger Weiss
9f822dd2b8
Don't crash if 'request_path' has unexpected type
2015-02-11 15:38:55 +01:00
Holger Weiss
834c680f97
Remove unused function clause in mod_carboncopy
2015-02-11 00:52:47 +01:00
Mickaël Rémond
01e1f677c7
Add Elixir support to ejabberd
2015-02-10 17:56:44 +01:00
Holger Weiss
d00f0fb1f4
Don't convert configuration values to strings
2015-02-09 01:08:01 +01:00
Holger Weiss
7fd7e53e4a
Fix typo in debug message
2015-02-08 23:49:17 +01:00
Feotov Daniil
eb52c118d0
Migration of scram passwords with piefxis (riak and internal only)
2015-02-05 18:44:08 +03:00
Badlop
87d2eb5f9a
Support for "> ." in YAML configuration files
2015-01-28 17:16:10 +01:00
Holger Weiss
0a047d790f
Fix a few function specifications
2015-01-23 00:42:18 +01:00
Christophe Romain
c4d17d939d
Fix integer parameter which can be set to 0
2015-01-22 12:40:27 +01:00
Evgeny Khramtsov
561025ba32
Merge pull request #413 from weiss/fix-timestamp-overflow
...
Fix timestamp formatting
2015-01-22 11:00:41 +03:00
Badlop
15e77e9c0f
New command to reload config (EJAB-1140)
2015-01-21 15:18:46 +01:00
Christophe Romain
120e581865
Fix missing copyright dates to 2015 (EJAB-1733)
2015-01-21 14:52:37 +01:00
Holger Weiss
528aabf49c
Increment number of seconds on timestamp overflow
...
Increment the number of seconds and set the fractional part to zero if
the latter is too large.
2015-01-21 11:20:26 +01:00
Holger Weiss
18d9f18642
Don't match integer() against float() value
2015-01-21 11:06:06 +01:00
Nathan Bruning
a983df4848
Fix overflow in XEP-0203 delay: if microseconds exceeded 999499, *** was put in the formatted timestamp
2015-01-21 01:10:41 +01:00
Evgeny Khramtsov
104009b3a9
Merge pull request #409 from hamano/scram-stringprep-checking
...
Scram stringprep checking(correct fix)
2015-01-19 15:23:47 +03:00
HAMANO Tsukasa
e01eb734b4
correct fix for #396
2015-01-19 16:00:18 +09:00
HAMANO Tsukasa
cb57cfa1a6
correct fix for #396
2015-01-19 15:25:58 +09:00
Badlop
2c4647a980
Fix binaries when ejabberd_ctl passes auth details
2015-01-15 20:00:06 +01:00
Badlop
7690320f0f
Fix access_commands option in ejabberd_xmlrpc, now it works
2015-01-15 17:39:12 +01:00
Evgeniy Khramtsov
4575649e10
Get rid of asn1rt calls
2015-01-15 14:51:20 +03:00
Taufan Aditya
f650fc83ae
Fix spec comment and remove useless case block
2015-01-09 22:19:46 +07:00
Taufan Aditya
864e113256
Fix unused vars warning
2015-01-09 01:00:26 +07:00
Badlop
5a35405cd5
Update copyright dates to 2015 (EJAB-1733)
2015-01-08 17:34:43 +01:00
Evgeny Khramtsov
4ef2d08456
Merge pull request #396 from hamano/scram-stringprep-checking
...
checking stringprep in scram authentication
2015-01-08 11:02:23 +03:00
HAMANO Tsukasa
ede5a353e8
checking stringprep in scram authentication
2015-01-08 14:12:05 +09:00
Badlop
b88fa6f617
Fix missing presences when adding shared groups (Github PR#99, thanks to Bokner)
2015-01-07 13:11:53 +01:00
Badlop
3882c4d514
Fix binaries in command ejabberdctl stop_kindly
2015-01-07 11:44:04 +01:00
badlop
d24dc4e9c8
Merge pull request #383 from weiss/fix-shutdown
...
Give temporary processes a little time to stop cleanly
2015-01-07 11:42:22 +01:00
Holger Weiss
9dc9d75502
Fix ejabberd_captcha's listener parsing
...
If the "captcha_host" is specified without "http://" or "https://"
prefix, ejabberd_captcha tries to figure out the protocol automatically.
Fix the code that parses the listener configuration in order to do that.
2014-12-24 00:35:22 +01:00
Holger Weiss
06db65e108
Give temporary processes time to stop cleanly
...
Allow temporary processes to perform some final actions when shutting
down. For example, moc_muc_room:terminate/3 fails to send 'unavailable'
presence to the room participants when killed immediately.
2014-12-21 21:03:22 +01:00
Holger Weiss
d734f6beca
Use correct message type for last published items
...
When sending last published PubSub/PEP items, set the message type
that was used for broadcasting those items originally.
2014-12-21 20:11:05 +01:00
Holger Weiss
e5428c5500
Improve add_message_type/2 function
...
Let add_message_type/2 accept the type as an atom, and let the function
handle the 'normal' message type. This doesn't change the behavior, but
avoids some code duplication.
2014-12-21 18:44:53 +01:00
Jerome Sautret
cc958f7787
Fix upgrade of PubSub mnesia tables from older ejabberd version.
2014-12-18 11:51:28 +01:00
Evgeny Khramtsov
df88d9f2e5
Merge pull request #377 from weiss/new-timestamps
...
Add timestamps to stanzas resent from stream management queue
2014-12-13 09:42:30 +03:00
Holger Weiss
466278fde1
Let jlib use "B" instead of "w" to format integers
...
As a small optimization, use io:format's "B" control sequence to format
integers. We don't need to let Erlang figure out the data type if we
already know it.
2014-12-12 23:50:03 +01:00
Holger Weiss
0a19dac4fd
Add fractions of seconds to <delay/> timestamps
...
Include fractions of a second with XEP-0203 <delay/> timestamps, as
specified in XEP-0082.
Old timestamp: 2014-05-19T11:55:00Z
New timestamp: 2014-05-19T11:55:00.123Z
2014-12-11 23:11:35 +01:00
Holger Weiss
455039ae69
mod_muc_log: Fix configuration parsing
...
Fix mod_muc_log's parsing of the "file_permissions" option.
Resolves #373 .
2014-12-08 15:51:06 +01:00
Holger Weiss
a78a0a65fe
Let CSI code add timestamp at later point in time
...
As a small optimization, make sure we won't add timestamps to presence
stanzas which end up being thrown away by the CSI code.
2014-12-07 16:27:51 +01:00
Holger Weiss
ba8f38e2eb
XEP-0198: Add timestamp to resent stanzas
...
When an unacknowledged stanza is resent from the Stream Management
queue, add a timestamp so that the receiving client can display the time
at which the stanza was originally sent.
2014-12-07 16:12:06 +01:00
Holger Weiss
9899935e42
Improve interface for adding timestamps
...
Provide a simpler interface for adding <delay/> and <x/> timestamps to
stanzas. This also makes sure that only one <delay/> tag and one <x/>
tag is added to a given stanza.
2014-12-07 15:55:18 +01:00
Holger Weiss
2cb16bc509
Remove unused field from c2s #state
2014-11-26 00:15:19 +01:00
Evgeny Khramtsov
00dfcc1e10
Merge pull request #350 from flygoast/master
...
Used current working home as base directory to config relative path.
2014-11-25 14:24:37 +03:00
Evgeny Khramtsov
4163626844
Merge pull request #365 from weiss/csi-config
...
Fix mod_client_state's configuration parsing
2014-11-25 14:21:18 +03:00
Evgeny Khramtsov
f60c721f84
Merge pull request #364 from weiss/copy-normal-messages
...
Also carbon-copy messages of type "normal"
2014-11-25 14:21:06 +03:00
Evgeny Khramtsov
e97e56d776
Merge pull request #363 from weiss/drop-pep-errors
...
Don't route PEP error messages to clients
2014-11-25 14:20:11 +03:00
Evgeny Khramtsov
6b916e7a04
Merge pull request #354 from weiss/pep-privacy
...
Respect privacy lists for incoming PEP messages
2014-11-25 14:20:01 +03:00
Evgeny Khramtsov
6279c3fd8d
Merge pull request #352 from weiss/no-last-pep-duplicates
...
Don't duplicate last published PEP items
2014-11-25 14:19:53 +03:00
Holger Weiss
6900a41e7d
Fix mod_client_state's configuration parsing
...
Don't log an "invalid value" message when "queue_presence" or
"drop_chat_states" is set to "false".
2014-11-25 12:05:09 +01:00
Holger Weiss
a456482e2f
Also carbon-copy messages of type "normal"
...
It makes no sense to restrict carbon-copying to "chat" messages.
XEP-0280 is expected to be updated accordingly.
2014-11-24 22:37:14 +01:00
Holger Weiss
30687c40ef
Don't route PEP error messages to clients
2014-11-24 21:19:32 +01:00
Holger Weiss
16311b73c8
Add new hook: c2s_filter_packet_in
...
The c2s_filter_packet_in hook can be used to modify or drop incoming
packets before they are transmitted to the client.
2014-11-24 20:55:18 +01:00
Evgeny Khramtsov
946b64e166
Merge pull request #361 from weiss/parse-ldap-dn-filter
...
Fix parsing of "ldap_dn_filter" option
2014-11-22 10:36:21 +03:00
Holger Weiss
46d035c142
Fix parsing of "ldap_dn_filter" option
2014-11-22 01:33:23 +01:00
Leif Bredgaard Honore
5afa1f6ade
Fix for ejabbed bug #359 - now strings are formatted correctly.
2014-11-20 14:21:51 +04:00
Holger Weiss
c566b1d01e
Respect privacy lists for incoming PEP messages
2014-11-18 01:25:12 +01:00
Holger Weiss
84c227e6ae
Don't duplicate last published PEP items
...
When a contact becomes available, usually both the 'caps_update' hook
and the 'presence_probe_hook' are called. For remote contacts, both
hooks triggered PEP notifications, so each item was sent twice. Fix
this by ignoring the 'presence_probe_hook' for remote contacts.
2014-11-18 01:13:22 +01:00
Holger Weiss
3b96525550
Support floating point message/presence intervals
...
Let mod_muc support floating point values for "min_message_interval" and
"min_presence_interval", as documented in the guide.
2014-11-15 22:35:56 +01:00
Gu Feng
62ccf1cf0e
Used current working home as base directory to config relative path.
...
When a config relative path specified, get_absolute_path would not
return an absolute path. The patch fixed it using current working
home as base directory.
Signed-off-by: Gu Feng <flygoast@126.com>
2014-11-16 00:09:52 +08:00
Evgeny Khramtsov
d5ecd32cec
Merge pull request #345 from weiss/last-pep-items
...
Fix sending of last published PEP items to newly-available resources
2014-11-14 21:27:24 +03:00
Holger Weiss
2446b66016
Use correct type for initial c2s #state.user value
2014-11-14 15:32:48 +01:00
Holger Weiss
f69d1ca282
Send last PEP items to remote subscribers
...
When a remote subscriber becomes available, send him the last published
PEP items, as we do for local subscribers.
However, the current implementation depends on a running ejabberd_c2s
process of the publisher to send items to remote subscribers. So, for
those, the behavior is always like it is for local subscribers when
"ignore_pep_from_offline" is set to "true".
2014-11-14 01:33:11 +01:00
Holger Weiss
830fdccd21
Don't broadcast last published PEP items
...
When a client becomes available, don't send the last published PEP items
of all his peers to all his other peers, but only to that client.
2014-11-14 01:03:26 +01:00
Holger Weiss
5cc30c3977
Move routing of last PEP items into new function
...
This doesn't change the behavior, but avoids some code duplication.
2014-11-14 00:16:13 +01:00
Holger Weiss
8efae1f05b
ODBC: Sync last item notifications with mod_pubsub
...
A while back, mod_pubsub was modified to address EJAB-1456. However,
the change was only partially applied to mod_pubsub_odbc. This commit
adds the remaining part.
2014-11-14 00:02:59 +01:00
Matthias Rieber
8184326eb9
Fix kick_user command
2014-11-10 20:53:00 +01:00
Evgeny Khramtsov
f47a59de2f
Merge pull request #340 from weiss/disable-mechanisms
...
New option: disable_sasl_mechanisms
2014-11-10 11:47:10 +03:00
Holger Weiss
ee0ecd2419
New option: disable_sasl_mechanisms
...
The new "disable_sasl_mechanisms" option allows for restricting the list
of SASL mechanisms offered to the client.
Closes #339 .
2014-11-10 01:10:04 +01:00
Holger Weiss
41dc1efde4
Avoid duplicates of carbon copies
...
When multiple resources have the same (highest) priority, the session
manager routes messages sent to their bare JID to each of these
resources. When another resource has a lower priority but receives
carbon copies, make sure it won't receive multiple copies of such
messages.
2014-11-05 19:04:02 +01:00
Evgeny Khramtsov
56dab7ddbe
Merge pull request #328 from flygoast/master
...
Return an empty <vCard/> element in an IQ-result when no vCard exists.
2014-10-29 16:43:49 +03:00
Evgeniy Khramtsov
74b67fa0dc
Add new option: store_empty_body
2014-10-27 14:18:09 +03:00
Evgeniy Khramtsov
067958d705
Merge branch 'master' of github.com:processone/ejabberd
2014-10-27 13:44:59 +03:00
Evgeniy Khramtsov
dec1e1f67f
Revert "fix mod_offline to store only chat messages with body xml element"
...
This reverts commit 436f0832c1
.
2014-10-27 13:44:46 +03:00
Holger Weiss
2399aba67d
Accept trailing whitespace in Base64 strings
2014-10-25 02:05:02 +02:00
Gu Feng
94cdcd7b34
Return an empty <vCard/> element in an IQ-result when no vCard exists.
...
According to XEP-0054, if no vCard exists, the server MUST return a stanza
error (which SHOULD be <item-not-found/>) or an IQ-result containing an
empty <vCard/> element.
Signed-off-by: Gu Feng <flygoast@126.com>
2014-10-25 00:55:49 +08:00
Holger Weiss
2d748115ee
Don't advertise auth mechanisms too early
...
If "starttls_required: true" is specified for c2s connections,
authentication mechanisms shouldn't be offered before negotiating the
TLS connection.
2014-10-23 10:04:14 +02:00
Evgeny Khramtsov
0b22277b11
Merge pull request #321 from weiss/fix-http-request-record
...
Use 'request' record definition from header file
2014-10-21 12:12:55 +04:00
liudan
d2edcf1288
fix odbc keepalive interval bug
2014-10-21 10:05:44 +08:00
Holger Weiss
0c24e18b5e
XEP-0198: Abort immediately on queue overflow
...
Terminate the ejabberd_c2s process immediately once stanza queue
overflow is detected. This makes sure the FSM won't process additional
stanzas before terminating if the recipient is flooded.
2014-10-17 01:35:30 +02:00
Holger Weiss
96d6aacede
Use 'request' record definition from header file
...
This fixes a 'badrecord' crash in mod_http_fileserver.
2014-10-16 13:51:13 +02:00
Holger Weiss
1ccc0d8bcb
XEP-0198: Set #state.conn field on session resume
2014-10-12 19:44:35 +02:00
Holger Weiss
7bdc1151b1
Make sure "starttls_required" can't be bypassed
...
Don't allow clients to circumvent the "starttls_required" option by
enabling XMPP stream compression.
2014-10-12 02:08:08 +02:00
Evgeniy Khramtsov
4bbf16b21a
Fix list unblocking when Riak is used as a backend
2014-10-10 11:38:13 +04:00
Evgeniy Khramtsov
d87ca9fb7b
Fix format of an XML-RPC response
2014-10-04 12:55:59 +04:00
Evgeniy Khramtsov
7b3209cc7f
Switch to P1 implementation of XML-RPC
2014-10-04 12:49:33 +04:00
Evgeniy Khramtsov
1d782db84f
Process XML-RPC requests via p1_xml and ejabberd_http
2014-10-04 12:49:12 +04:00
Evgeniy Khramtsov
e109f352e3
Make directory creation more robust
2014-10-02 14:21:27 +04:00
Holger Weiss
277e1dc3ff
Offer CSI stream feature only if configured
...
Don't offer the CSI stream feature when mod_client_state isn't actually
configured to filter stanzas. This makes sure clients won't send CSI
tags that end up being ignored.
2014-09-25 18:28:20 +02:00
Holger Weiss
56175fef1b
Add new hook: c2s_post_auth_features
...
The c2s_post_auth_features hook can be used to extend the list of stream
features offered after authentication.
2014-09-25 18:15:33 +02:00
Holger Weiss
7aec0337e1
Remove invisible presence fields from c2s #state
...
Invisible presence isn't supported anymore, so the corresponding
ejabberd_c2s #state fields were unused.
2014-09-25 00:08:56 +02:00
Holger Weiss
61c8836740
Rename deref_aliases back to ldap_deref_aliases
...
The "ldap_deref_aliases" option has accidentally been renamed to
"deref_aliases". Revert that change (but accept both names for a
while), so that the option name now matches the documentation again.
2014-09-23 11:31:44 +02:00
Holger Weiss
0a9212583d
XEP-0198: Support "resend_on_timeout: if_offline"
...
If "resend_on_timeout" is set to "if_offline", resend unacknowledged
stanzas only if no other resource is online when the session times out.
In other words, allow for sending them to offline storage, but nowhere
else.
2014-09-16 22:42:34 +02:00
Holger Weiss
b8c98232b8
Support XEP-0352: Client State Indication
2014-09-11 17:44:29 +02:00
Evgeny Khramtsov
7a48e30523
Merge pull request #296 from weiss/remove-unused-clause
...
XEP-0198: Remove unused function clause
2014-09-07 07:27:17 +04:00
Holger Weiss
2ca563e328
XEP-0198: Remove unused function clause
...
In the 'wait_for_resume' state, #state.mgmt_pending_since is always
initialized. fsm_next_state/2 takes care of that.
2014-09-06 20:39:38 +02:00
Holger Weiss
2e169167d4
XEP-0198: Change state on gen_tcp:send/2 failure
...
When Stream Management is enabled and a gen_tcp:send/2 call fails, go
into the 'wait_for_resume' state immediately. This makes sure that
gen_tcp:send/2 won't be called again, which might avoid an Erlang issue
where gen_tcp:send/2 apparently hangs despite 'send_timeout' (and
'send_timeout_close') being set.
2014-09-06 20:34:32 +02:00
Holger Weiss
11b2921971
XEP-0198: Let fsm_next_state/2 check timeout value
...
Don't force the fsm_next_state/2 caller to check for 'mgmt_timeout = 0'.
2014-09-06 20:29:02 +02:00
Evgeniy Khramtsov
ac2ba399a9
Make sure x:data form possesses 'type' attribute
2014-09-03 21:28:55 +04:00
Evgeniy Khramtsov
fda73c3d16
Fix privacy checks of presence probes
2014-09-01 16:39:02 +04:00
Evgeniy Khramtsov
a1ce33ebf8
Automatically remove IPs from ban, add the documentation
2014-08-27 13:25:49 +04:00
Evgeniy Khramtsov
9be9949dab
Remove useless -include()
2014-08-27 13:18:29 +04:00
Evgeniy Khramtsov
0f1d95a074
Ban the IP if there are too many failed authentications
2014-08-27 13:18:22 +04:00
Evgeniy Khramtsov
2430e6691b
Add mod_fail2ban
2014-08-27 13:17:56 +04:00
Holger Weiss
f1ad6f017b
Fix a comment in ejabberd_hooks
2014-08-26 01:04:15 +02:00
vesvalo
01a3c1c2e1
Fix return value of mod_shared_roster:delete_group. Current one is not compatible with mod_admin_extra.
2014-08-21 15:13:43 +04:00
vesvalo
c48b7f272b
fix 404 on pep first publishing with odbc
2014-08-21 11:23:58 +04:00
Holger Weiss
2802b6cee2
Allow for "max_ack_queue: infinity", as documented
2014-08-20 12:53:26 +02:00
Holger Weiss
7274dafe10
Store persistent MUC room during creation
...
Make sure persistent rooms are stored to the database. Without this
change, a room got lost if the 'persistent' flag was handed over to
mod_muc:create_room/5 and the server was then restartet before any
activity took place in that room.
2014-08-19 11:12:51 +02:00
Evgeny Khramtsov
bc2e26fecd
Merge pull request #277 from weiss/xep-0198
...
XEP-0198: Create shorter session resume IDs
2014-08-15 19:15:32 +04:00
Holger Weiss
2d4c39cd54
XEP-0198: Create shorter resume IDs
...
Omit the user and server name from the 'previd' value.
2014-08-15 10:56:59 +02:00
Evgeny Khramtsov
9484b11383
Merge pull request #276 from weiss/xep-0198
...
XEP-0198: Don't crash if the resume ID is incorrect
2014-08-15 10:49:59 +04:00
Holger Weiss
848e1497d1
XEP-0198: Gracefully handle broken 'previd'
...
Produce a proper error message instead of crashing when the 'previd'
value of a <resume/> request has an unexpected format.
2014-08-15 01:54:41 +02:00
Holger Weiss
2daf95e93f
XEP-0198: Gracefully handle wrong credentials
...
Produce a proper error message instead of crashing when the JID encoded
in the 'previd' value of a <resume/> request is different from the
authenticated JID.
2014-08-15 01:53:47 +02:00
Evgeny Khramtsov
1b1d9b5a73
Merge pull request #269 from Iperity/master
...
Fix migration of pubsub nodes. Was deleting and re-creating all nodes on...
2014-08-15 03:20:36 +04:00
Evgeny Khramtsov
5836eb5bc2
Merge pull request #268 from benlangfeld/fix/ldap_filter_dnattributes_new_ejabberd
...
Set dnAttributes on when it's requested by a filter
2014-08-15 03:19:18 +04:00
Evgeniy Khramtsov
5c88f6423a
Fix the deprecation warning to reflect YAML format
2014-08-12 14:26:15 +04:00
Evgeny Khramtsov
0917209711
Merge pull request #273 from gamenet/master
...
odb_queries patch return value of functions update and update_t in case of sql insert
2014-08-08 16:03:03 +04:00
vesvalo
436f0832c1
fix mod_offline to store only chat messages with body xml element
2014-08-08 13:57:27 +04:00
vesvalo
92f89e3d45
Fix odbc update_t and update insert case return value
2014-08-08 13:26:16 +04:00
Holger Weiss
38c016a041
Log auth method for incoming s2s connections
...
Generate an [info] message that logs whether an incoming s2s connection
is authenticated using the SASL EXTERNAL mechanism or via Server
Dialback. While at it, also mention whether TLS is enabled.
2014-08-05 14:10:32 +02:00
Nathan Bruning
4f63cb21c2
Fix migration of pubsub nodes. Was deleting and re-creating all nodes on each startup.
2014-08-03 21:03:16 +02:00
Alexey Shchepin
f00725dffb
mod_offline now uses gen_server
2014-07-31 14:26:09 +04:00
Christophe Romain
4205108f30
typo fix on roster subscription (EJAB-1711)
2014-07-31 11:50:22 +02:00
Ben Langfeld
651de2ca8e
Set dnAttributes on when it's requested by a filter
2014-07-29 15:22:54 -03:00
Evgeniy Khramtsov
3d3a4f7543
Fix events broadcasting via C2S
2014-07-22 19:42:49 +04:00
Christophe Romain
320abee110
apply pull request #250 to pubsub_odbc as well
2014-07-21 17:14:59 +02:00
Christophe Romain
0579fc80ec
Merge pull request #250 from Iperity/master
...
Fix configuraton with custom nodetree plugin
2014-07-21 17:11:29 +02:00
Evgeniy Khramtsov
014d61955c
Move some namespaces definitions into header file
2014-07-21 08:32:26 +04:00
Evgeniy Khramtsov
1f4e0c8aea
Fix Record-Route signing
2014-07-17 20:30:36 +04:00
Paweł Chmielowski
e0c9242dcf
treap.erl was moved to p1_utils
2014-07-17 11:57:23 +02:00
Paweł Chmielowski
0456b78d87
Use p1_utils
2014-07-17 10:52:31 +02:00
Evgeniy Khramtsov
568068c79f
Get rid of p1_mnesia file
2014-07-17 08:32:13 +04:00
Evgeniy Khramtsov
b5c4fe6626
Change return type to reflect recent changes in p1_sip
2014-07-16 15:28:36 +04:00
Evgeniy Khramtsov
64205426bf
Fix returned types
2014-07-16 10:33:49 +04:00
Evgeniy Khramtsov
89025eea39
Fix blocklist get
2014-07-16 07:43:24 +04:00
Evgeniy Khramtsov
4ef0dd6997
Better Riak usage detection
2014-07-15 20:26:45 +04:00
Evgeniy Khramtsov
b5f1b17926
Fix broken hooked functions
2014-07-15 19:22:33 +04:00
Nathan Bruning
99c28ab4d6
Fix configuraton with custom nodetree plugin
2014-07-15 12:04:06 +02:00
Evgeniy Khramtsov
792b5a24df
Serialize records to proplists before storing then in Riak
2014-07-14 08:24:44 +04:00
Evgeniy Khramtsov
a5987633e0
Fix compile errors introduced by previous cherry picks
2014-07-10 14:16:33 +04:00
Evgeniy Khramtsov
2fe8e0dea5
Make it possible to check Riak connection status
2014-07-10 13:55:24 +04:00
Evgeniy Khramtsov
6a73b96459
Fix roster versioning support when Riak backend is enabled
2014-07-10 13:54:06 +04:00
Evgeniy Khramtsov
538d4ffbd0
Fix case clause
2014-07-10 13:53:57 +04:00
Evgeniy Khramtsov
c15dc01cff
Improve Riak pool management
2014-07-10 13:52:29 +04:00
Evgeniy Khramtsov
e82219185b
Add SQL to Riak converter
2014-07-10 13:29:01 +04:00
Evgeniy Khramtsov
0490c2f139
Improve Riak support
2014-07-10 13:26:37 +04:00
Alexey Shchepin
a4b02c38db
Updated riak support
2014-07-10 13:15:15 +04:00
Alexey Shchepin
47763c10e3
Preliminary Riak support
2014-07-10 13:04:39 +04:00
Evgeniy Khramtsov
fc692ea512
Add start_module/2
2014-07-08 20:58:03 +04:00
Evgeniy Khramtsov
2b8c4acd57
Rename options
2014-07-07 09:40:08 +04:00
Evgeniy Khramtsov
ee40c0e9a7
Add new option support: always_record_route
2014-07-07 09:40:01 +04:00
Matwey V. Kornilov
50a73d1188
Use -include_lib instead of -include for esip and p1_xml
...
-include_lib is used in order to find deps. Rebar include magic is not required anymore.
Rebar uses deps as library directory.
2014-07-05 17:57:35 +04:00
Evgeniy Khramtsov
76ebebf2a0
Revert "Fix IQ XML generation."
...
This reverts commit 26a4d91297
.
2014-07-05 17:53:45 +04:00
Jerome Sautret
aba7150af1
Return MySQL error messages as binary.
2014-07-04 17:39:28 +02:00
Jerome Sautret
26a4d91297
Fix IQ XML generation.
2014-07-04 15:21:40 +02:00
Christophe Romain
9265720f92
add ability to rotate logs on given date condition
2014-07-02 23:46:54 +02:00
Evgeniy Khramtsov
273631c242
New option support: log_rotate_count
2014-07-02 14:59:05 +02:00
Evgeniy Khramtsov
bb8a0f71e6
Support new options: log_rotate_size and log_rate_limit
2014-07-02 14:58:58 +02:00
Evgeniy Khramtsov
ffdb39d269
Disable SASL error logger if lager is enabled
2014-07-02 14:58:46 +02:00
Badlop
8fae4748a1
mod_caps doesn't provide Mnesia export feature
2014-06-27 13:49:17 +02:00
Evgeny Khramtsov
31440a586c
Merge pull request #238 from weiss/log-node-mismatch
...
Check for Mnesia node name mismatches on startup
2014-06-12 13:23:17 +04:00
Holger Weiss
1ef2dd45f3
Check for Mnesia node name mismatches
...
Log a proper error message if the node running ejabberd doesn't own the
Mnesia database.
2014-06-12 11:00:22 +02:00
Evgeniy Khramtsov
b29615561c
Change default flow timeout as recommended per the RFC
2014-06-12 09:30:10 +04:00
Evgeniy Khramtsov
7892b72bcb
Don't forget to close socket of timed out flow
2014-06-12 09:30:04 +04:00
Holger Weiss
c20acbf4d8
Mention configuration file path in error messages
...
If reading or parsing a YAML configuration fails, log the full path to
the configuration file (as we do for old-style ".cfg" files).
2014-06-11 15:03:33 +02:00
Evgeny Khramtsov
e66899e68e
Merge pull request #231 from hamano/case_clause_error_at_node_hometree_odbc
...
case_clause_error_at_node_hometree_odbc
2014-06-09 23:50:43 +04:00
Evgeniy Khramtsov
87f8c2ecd8
Don't stop roster table conversion on broken askmessage
2014-06-09 10:55:05 +04:00
Evgeniy Khramtsov
62be3bc111
Fix previous commit
2014-06-09 10:40:52 +04:00
Evgeniy Khramtsov
c485aea48b
Don't stop irc table conversion on broken JIDs
2014-06-09 10:36:42 +04:00
Evgeniy Khramtsov
6f4b4ad087
Ignore malformed parameters for mod_irc module
2014-06-07 07:45:36 +04:00
Evgeniy Khramtsov
3e8a0af6d1
Fix data convertion
2014-06-07 07:05:24 +04:00
Evgeniy Khramtsov
12ab5a749f
Clean up all timers gracefully
2014-06-06 22:29:50 +04:00
Evgeniy Khramtsov
ddfbca5830
Use a different timer for flow control
2014-06-06 13:53:13 +04:00
Evgeniy Khramtsov
9e72529544
SIP Outbound (RFC 5626) support
2014-06-06 09:36:45 +04:00
Christophe Romain
11aa51373a
add missing format handler
2014-06-05 16:23:17 +02:00
Holger Weiss
e0e74a9d5e
Don't "forget" listener options
...
If a listener is started or stopped via ejabberd_listener:add_listener/3
or ejabberd_listener:delete_listener/3, the configuration for all
listener modules is updated using the Module:transform_listen_option/2
function for each listener module that exports such a function.
However, for listener modules that don't provide that function (such as
ejabberd_stun), all but one option was dropped. This is now fixed.
The issue could be triggered e.g. by enabling mod_proxy65 in the modules
section.
2014-06-04 20:54:26 +02:00
HAMANO Tsukasa
cc228db337
e_clause error at node_hometree_odbc:get_items/3
2014-06-04 18:53:37 +09:00
Evgeniy Khramtsov
c546ce2439
Reply to pings
2014-06-03 21:18:30 +04:00
Evgeniy Khramtsov
6441c284e0
Don't add 'rport' paramater to 'Via' header
2014-06-02 20:46:29 +04:00
Evgeniy Khramtsov
0aea9c74bd
Rename option 'route' to 'record_route' and add new option 'routes'
2014-06-02 10:16:34 +04:00
Evgeniy Khramtsov
9a0d77571d
Add global static shared_key option
2014-06-01 14:20:09 +04:00
Evgeniy Khramtsov
f446e7fc0b
Sign 'Record-Route' in order to proxy unauthorized ACKs
2014-06-01 13:35:14 +04:00
Evgeniy Khramtsov
b75b5ebeb2
Fix 'via' option lookup
2014-05-31 14:22:39 +04:00
Evgeniy Khramtsov
d19903877d
Add new option: route
2014-05-31 14:22:31 +04:00
Evgeny Khramtsov
f271ea6eef
Merge pull request #229 from weiss/no-carbons-to-sender
...
XEP-0280: Don't send v1 carbon copies back to the sender
2014-05-31 12:53:18 +04:00
Evgeniy Khramtsov
c76201b6b4
Don't add 'Record-Route' header for mid-dialog requests
2014-05-31 10:00:51 +04:00
Evgeniy Khramtsov
86f2af6fdc
Process bindings from multiple UACs correctly
2014-05-31 09:06:53 +04:00
Evgeniy Khramtsov
da22da23cd
Don't substitute URI in ACK
2014-05-31 07:50:16 +04:00
Holger Weiss
f45654a16a
Simplify mod_carboncopy:check_and_forward/4
...
Use the existing is_carbon_copy/1 function, and combine multiple case
clauses into a single one.
2014-05-30 23:44:19 +02:00
Holger Weiss
bb952f9ecc
Let is_carbon_copy/1 recognize <received/> carbons
...
The mod_carboncopy:is_carbon_copy/1 function now returns true not only
for <sent/>, but also for <received/> carbon copies.
2014-05-30 23:36:02 +02:00
Holger Weiss
ad2d3964ef
Don't send XEP-0280 v1 copies back to sender
...
An earlier version of XEP-0280 specified the <received/> and <sent/>
tags to be siblings of the <forwarded/> element, whereas the current
version mandates them to be parents of <forwarded/>. The mod_carboncopy
module supports both variants. However, the check that makes sure
clients won't receive a copy of the messages they sent didn't work for
the old-style schema. This is now fixed.
2014-05-30 23:32:18 +02:00
Evgeniy Khramtsov
2cd17c7988
Fix previous commit
2014-05-30 23:49:50 +04:00
Evgeniy Khramtsov
32998f7e18
Process 'Contact' headers more accurately (as per RFC3261)
2014-05-30 23:14:52 +04:00
Holger Weiss
8fb1bb1f5f
Log just one [info] message on Carbons negotiation
...
Log one instead of three [info] messages when XEP-0280 (Message Carbons)
support is enabled or disabled successfully. On failure, log an
additional [warning].
2014-05-29 15:21:11 +02:00
Holger Weiss
0cb9ea3643
XEP-0198: Cosmetic change: Reuse event handler
...
On stanza queue overflow, pass a message to self() using the exclamation
mark operator instead of send_all_state_event/2. This allows for
reusing the existing handler for 'kick' events.
2014-05-28 11:24:38 +02:00
Holger Weiss
99ca8281fa
XEP-0198: Terminate session on queue overflow
...
On queue overflow, terminate the c2s session instead of just dropping
items from the queue. This makes sure all stanzas are either delivered
or bounced.
2014-05-27 22:56:33 +02:00
Evgeny Khramtsov
3a27b1dd0c
Merge pull request #226 from weiss/simplify-state-change
...
XEP-0198: Cosmetic change: Simplify state change
2014-05-27 23:30:30 +04:00
Holger Weiss
50a4c5a6ab
XEP-0198: Cosmetic change: Simplify state change
...
When the FSM goes into the 'wait_for_resume' state, let fsm_next_state/2
take care of updating #state.mgmt_state and of writing the log line.
This doesn't change the behavior, but simplifies the code.
2014-05-27 21:14:49 +02:00
Holger Weiss
ed0c89f876
Let ejabberd_c2s always use fsm_next_state/2
...
Make sure any logic implemented in ejabberd_c2s:fsm_next_state/2 is
always applied.
2014-05-27 21:07:53 +02:00
Evgeny Khramtsov
702cddd4ff
Merge pull request #220 from weiss/handle-send-failure
...
XEP-0198: Don't exit on socket send failure
2014-05-27 15:44:04 +04:00
Evgeny Khramtsov
4d1332c30f
Merge pull request #222 from weiss/keep-session-on-failed-resume
...
XEP-0198: Don't drop session on failed resume
2014-05-27 15:38:26 +04:00
Evgeny Khramtsov
402fb9665d
Merge pull request #221 from weiss/omit-redundant-guard
...
XEP-0198: Cosmetic change: Omit redundant guard
2014-05-27 15:34:34 +04:00
Evgeny Khramtsov
b2e84405c1
Merge pull request #218 from weiss/omit-iq-xmlns
...
Omit XML namespace declaration for <iq/> stanzas
2014-05-27 15:32:02 +04:00
Evgeniy Khramtsov
52221127cc
Fix odbc_port option processing
2014-05-27 15:27:42 +04:00
Evgeniy Khramtsov
dceab3689d
Don't forget to include 'Contact' header field in 2xx registrar responses
2014-05-26 21:34:23 +04:00
Holger Weiss
59f6efeaf7
XEP-0198: Don't drop session on failed resume
...
The 'previd' value provided by the client during a session resume
request includes the client's JID and ejabberd's session ID. If there
is a session for the requested JID but with a different session ID,
resumption should fail, but that session shouldn't be closed. This
commit makes sure the latter won't happen.
In practice, this will only make a difference in odd corner cases.
2014-05-23 23:38:04 +02:00
Holger Weiss
737b0ae5dc
XEP-0198: Cosmetic change: Omit redundant guard
...
The stream management state is never 'pending' when the c2s FSM is in
the 'session_established' state.
2014-05-23 20:46:17 +02:00
Evgeniy Khramtsov
8925975c86
Fix proxying of ACK requests for 2xx responses
2014-05-23 20:14:53 +04:00
Holger Weiss
ab9667f917
XEP-0198: Don't exit on socket send failure
...
If stream management is enabled, don't exit the c2s process when
ejabberd_socket:send/2 fails, but close the socket instead. This gives
the client a chance to resume the session.
Thanks go to Matthias Rieber for reporting the issue, providing detailed
logs, and testing the fix.
2014-05-23 11:38:54 +02:00
Badlop
735bd95659
Merge branch 'check-packet-type' of git://github.com/weiss/ejabberd into weiss-check-packet-type
...
Conflicts:
src/ejabberd_c2s.erl
2014-05-21 18:45:28 +02:00
badlop
69abb48c90
Merge pull request #217 from weiss/fix-extauth-cache-usage
...
Don't use cached passwords if "extauth_cache: 0"
2014-05-21 17:35:54 +02:00
badlop
419a98d45a
Merge pull request #216 from lavrin/p1-c2s
...
Cleanup some pieces of ejabberd_c2s
2014-05-21 17:35:24 +02:00
badlop
5d855f3723
Merge pull request #207 from weiss/xep-0334
...
Honor XEP-0334: Message Processing Hints
2014-05-21 17:31:22 +02:00
Holger Weiss
6b996061a2
Omit XML namespace declaration for <iq/> stanzas
...
Only the child elements of <iq/> stanzas are qualified by the namespaces
in question, not the <iq/> stanzas themselves.
This change just clarifies the code. It doesn't alter the behaviour, as
those <iq/> stanzas are handed over to jlib:iq_to_xml/1, and that
function ignores the 'xmlns' attribute anyway.
2014-05-21 00:07:57 +02:00
Holger Weiss
fca640f50f
Don't use cached passwords if "extauth_cache: 0"
...
Regarding "extauth_cache", the guide says: "The integer 0 (zero) enables
caching for statistics, but doesn't use that cached information to
authenticate users." Make sure the cached password isn't used even if
the user is currently logged in with another resource.
2014-05-20 23:00:28 +02:00
Badlop
5010cea1a4
If log uses file:write, no need to double escape ~ in messages (EJAB-1696)
2014-05-20 14:49:52 +02:00
Radosław Szymczyszyn
5726636053
Fix check_from/2 formatting
2014-05-20 12:31:28 +01:00
Radosław Szymczyszyn
b7a542e074
Sanitize copy-pasted get_statustag/1
2014-05-20 12:28:14 +01:00
Radosław Szymczyszyn
9c37450fe4
Fix formatting
2014-05-20 12:26:33 +01:00
Radosław Szymczyszyn
c39ce133de
Build proceed/compressed elements in a sane way
2014-05-20 11:52:02 +01:00
Badlop
6d06f22f64
MUC messages with ~ were not logged (EJAB-1696)
2014-05-19 19:07:46 +02:00
Badlop
a6ddab1e9d
Fix bug when joining empty path
2014-05-14 13:28:39 +02:00
Holger Weiss
6e8dd5bdff
Don't miss incoming presence updates
2014-05-14 01:04:38 +02:00
Holger Weiss
f6da708b02
XEP-0198: Check whether routed packets are stanzas
...
Only stanzas are subject to stream management, so when XEP-0198 support
is enabled, we must distinguish them from non-stanza elements. This
commit adds a send_packet/2 function that can be used in place of
send_stanza/2 or send_element/2 whenever a packet is delivered that
might or might not be a stanza.
2014-05-12 19:20:25 +02:00
Holger Weiss
9121ca14de
Rename disconnect_user/2 command
...
The mod_admin_extra module provides a kick_session/4 command. Rename
the disconnect_user/2 command to kick_user/2 for consistency.
2014-05-12 12:44:40 +02:00
Holger Weiss
47efe4e6a9
Don't log MUC messages with <no-store/> hint
...
Honor the <no-store/> and <no-permanent-store/> hints defined in
XEP-0334.
2014-05-12 00:27:20 +02:00
Holger Weiss
03fd88e4ec
Don't store messages with <no-store/> hint
...
Honor the <no-store/> hint defined in XEP-0334.
2014-05-12 00:00:34 +02:00
Holger Weiss
9b16d09261
Don't carbon copy messages with <no-copy/> hint
...
Honor the <no-copy/> hint defined in XEP-0334.
2014-05-11 23:52:20 +02:00
Evgeny Khramtsov
5d22159e9a
Merge pull request #205 from weiss/xep-0198
...
XEP-0198: Improve handling of incorrect stanza counts reported by client
2014-05-10 00:05:17 +04:00
Evgeniy Khramtsov
003fd321ee
Do not try to retreive vCards via local SM for foreign JIDs
2014-05-09 21:26:55 +04:00
Holger Weiss
6d5bfcfe9b
XEP-0198: Improve handling of too large 'h' values
...
If the client says that it handled more stanzas than we sent (due to a
bug in the client's or in our code), increase our outgoing stanza count
accordingly. There's no point in sticking to the old value even if it
was correct, as the client surely won't fix its count during the current
session.
2014-05-09 18:28:14 +02:00
Holger Weiss
15369ff9d7
XEP-0198: Reject <resume/> with negative 'h' value
...
Make sure the 'h' attribute sent with a <resume/> request is
nonnegative, as mandated by XEP-0198.
We already have this check for <a/> elements.
2014-05-09 18:01:31 +02:00
Holger Weiss
a60fda7df4
XEP-0198: Don't warn on invalid ACK elements
...
Do not log a warning (but only a debug message) if the client sends an
invalid </a> packet. Some clients do that occasionally, and there's
nothing server admininistrators could do about that.
2014-05-09 17:54:12 +02:00
Evgeniy Khramtsov
318b0f2208
Fix previous commit (C2S session close on server shutdown)
2014-05-08 21:47:50 +04:00
Evgeniy Khramtsov
181e7a823e
Fix C2S session close on server shutdown
2014-05-08 21:39:53 +04:00
Evgeniy Khramtsov
90a5c054d4
TURN support (EJAB-1017)
2014-05-08 16:14:21 +04:00
Evgeny Khramtsov
115da54557
Merge pull request #203 from hamano/added_get_random_pid_error_handling
...
improve error handling when sql calling with (empty|unknown) host.
2014-05-08 10:02:27 +04:00
Badlop
79a49b1175
Webadmin with extauth requires internal to run at least once (issue #201 )
2014-05-07 17:13:51 +02:00
HAMANO Tsukasa
d3ed12d4ba
fix mod_offline:count_offline_messages/2
2014-05-07 15:38:18 +09:00
Holger Weiss
d343447cc9
Merge remote-tracking branch 'processone/master' into xep-0198
...
Conflicts:
doc/guide.tex
src/ejabberd_c2s.erl
2014-05-06 21:41:29 +02:00
Christophe Romain
cc1f93d7a0
Fix PEP broadcasting issue on ODBC (EJAB-1680)
2014-05-06 13:29:35 +02:00
Christophe Romain
58717923eb
Fix PEP broadcasting issue (EJAB-1680)
2014-05-06 12:37:44 +02:00
Holger Weiss
8b1f92575a
XEP-0198: Use "mgmt_" prefix for all #state fields
...
Prefix all ejabberd_c2s #state fields that are used for stream
management with "mgmt_".
2014-05-06 07:27:10 +02:00
Christophe Romain
a6244275b7
remove compilation warnings
2014-05-05 18:16:48 +02:00
Christophe Romain
4bdf1bc7a6
avoid sending duplicated events
2014-05-05 17:53:50 +02:00
Christophe Romain
faa6ad26a0
avoid sending empty events
2014-05-05 17:53:44 +02:00
Christophe Romain
530ac43758
store item when persist_item=false and cache_last_item=false but need last_item
2014-05-05 17:40:42 +02:00
Nathan Bruning
f3aa74a043
Fix small bug in presence_based_delivery implementation
2014-05-05 14:14:03 +02:00
Badlop
872cc12dd8
Temporary room not destroyed when the last participant is expulsed (EJAB-520)
2014-05-05 13:50:52 +02:00
Badlop
70f00a1b1f
extauth_cache can have value 0
2014-05-05 13:13:35 +02:00
Holger Weiss
3b3f3b9131
XEP-0198: Don't log protocol issues
...
There are corner cases where certain clients acknowledge more stanzas
than they received. Nothing really bad will happen in those cases, and
server administrators can't do anything about such issues anyway.
2014-05-05 01:11:14 +02:00
Holger Weiss
32abcbca6c
XEP-0198: Accept stream elements in pending state
...
Due to timing issues, ejabberd_c2s might receive stream elements from
the client while the session is waiting for stream resumption. Those
elements are now accepted.
2014-05-05 00:02:55 +02:00
Holger Weiss
a0917a8e9b
XEP-0198: Log message when waiting for resumption
...
Log an informational message when a session goes into the pending state
(waiting for resumption) after the connection was lost. Administrators
may well be interested in this state change when looking into issues.
2014-05-04 23:08:42 +02:00
Evgeniy Khramtsov
fafec77e56
Make it possible to get/set vCards for MUC rooms
2014-05-04 23:23:17 +04:00
Evgeniy Khramtsov
806c0e56e1
Do not crash on version downgrade
2014-05-03 17:55:03 +04:00
Evgeniy Khramtsov
d0ffcb7fd4
Assume udp_recv/5 now returns new options
2014-05-03 17:48:26 +04:00
Evgeniy Khramtsov
955487391d
Assume tcp_init/2 and udp_init/2 now return new options
2014-05-03 17:48:17 +04:00
Evgeniy Khramtsov
47a39ce738
Remove unused function
2014-05-02 17:43:23 +04:00
Evgeniy Khramtsov
ebd760b7c9
Forking support
2014-05-02 17:43:17 +04:00
Evgeniy Khramtsov
f8417f7c1f
Remove empty line
2014-05-02 17:43:09 +04:00
Evgeniy Khramtsov
3c98de69dc
Some cleanup
2014-05-02 17:43:03 +04:00
Evgeniy Khramtsov
ab6774d93d
Fix CSeq comparison
2014-05-02 17:42:57 +04:00
Evgeniy Khramtsov
58aa200297
Optimize request processing
2014-05-02 17:42:51 +04:00
Evgeniy Khramtsov
a1337cb73f
Do not proxy stray responses statelessly (as per RFC 6026)
2014-05-02 17:42:45 +04:00
Evgeniy Khramtsov
e7e4055cbb
Don't use erlang:integer_to_binary/1
2014-05-02 17:42:37 +04:00
Evgeniy Khramtsov
1d771fe646
Rewrite 'Contact' headers in REGISTER requests
2014-05-02 17:42:31 +04:00
Evgeniy Khramtsov
8e2bc8d19e
Check for 'max_user_sessions' option
2014-05-02 17:42:13 +04:00
Evgeniy Khramtsov
0117787317
Process gen_server timeouts correctly
2014-05-02 17:40:25 +04:00
Evgeniy Khramtsov
16e5d66572
Move some code in a separate function
2014-05-02 17:38:47 +04:00
Evgeniy Khramtsov
6a95422af8
Multiple REGISTER bindings support
2014-05-02 17:38:28 +04:00
Evgeniy Khramtsov
35faffe7da
Locate sessions by proxy processes directly
2014-05-02 17:31:17 +04:00
HAMANO Tsukasa
d83368d73d
fix ejabberd_system_monitor:s2s_out_info/1 error
2014-05-01 15:12:04 +09:00
Evgeny Khramtsov
c545b3de6d
Merge pull request #178 from hamano/devel
...
undefined ejabberd_socket:get_conn_type/1
2014-04-30 21:49:54 +04:00
Evgeniy Khramtsov
02e0649d18
SIP support
...
Conflicts:
configure
configure.ac
doc/guide.tex
2014-04-30 19:38:15 +04:00
HAMANO Tsukasa
0904b8b8ff
improve error handling when sql calling with (empty|unknown) host.
...
see #191
2014-05-01 00:20:58 +09:00
Badlop
ec6c58a21c
Fix error reporting in previous commit
2014-04-30 16:02:20 +02:00
Badlop
b3714a1b2e
Fix formatting string argument (thanks to Locojay)(github #129 )
2014-04-30 15:59:44 +02:00
Evgeny Khramtsov
81a906af01
Merge pull request #191 from hamano/added_get_random_pid_error_handling
...
fix error handling when sql calling with unknown host.
2014-04-30 17:02:39 +04:00
badlop
65519cf262
Merge pull request #190 from hamano/mod_register_web_response_404
...
mod_register_web should response 404 instead of process crash.
2014-04-30 12:42:43 +02:00
badlop
a1b8c54c16
Merge pull request #187 from weiss/fix-ejabberdctl-output
...
Let ejabberdctl accept binary string arguments
2014-04-30 12:41:12 +02:00
HAMANO Tsukasa
a6408e9281
fix error handling when sql calling with unknown host.
2014-04-30 15:32:07 +09:00
HAMANO Tsukasa
0e0bd3329d
mod_register_web should response 404 instead of process crash.
2014-04-30 13:39:17 +09:00
Evgeny Khramtsov
9563b0228f
Merge pull request #177 from weiss/log-tls-sasl-external
...
Log TLS status for outgoing s2s with SASL EXTERNAL
2014-04-30 00:38:18 +04:00
Evgeny Khramtsov
8419322884
Merge pull request #181 from weiss/check-tls-before-auth
...
Check TLS state before requesting SASL EXTERNAL for outgoing s2s connections
2014-04-30 00:36:08 +04:00
Evgeny Khramtsov
c37aa1b46d
Merge pull request #185 from weiss/verify-cert-for-s2s-out
...
Support certificate verification for outgoing s2s connections
2014-04-30 00:08:24 +04:00
Evgeny Khramtsov
599fdb9ac2
Merge pull request #186 from weiss/add-disconnect-command
...
New ejabberd command: disconnect_user/2
2014-04-29 15:41:41 +04:00
Holger Weiss
ebbceab93f
Translate disconnect_user/2 string sent to client
2014-04-29 11:56:28 +02:00
Holger Weiss
bb2c8b59f8
Avoid #state.lang type errors in corner cases
...
If #state.lang is used before being initialized to some binary string,
the translation code would crash.
2014-04-29 11:41:24 +02:00
Evgeny Khramtsov
4073394e7a
Merge pull request #182 from hamano/register_account_acl
...
fix checking acl in mod_register_web
2014-04-29 13:06:53 +04:00
Evgeny Khramtsov
29aead19d9
Merge pull request #179 from hamano/added_get_random_pid_error_handling
...
added get_random_pid/1 error handling
2014-04-29 13:05:58 +04:00
Holger Weiss
d09c268b20
Let ejabberdctl accept binary string arguments
...
Don't print the following message if an ejabberd command expects binary
string arguments: "This command cannot be executed using ejabberdctl.
Try ejabberd_xmlrpc."
2014-04-29 01:11:08 +02:00
Holger Weiss
6d1055abec
New ejabberd command: disconnect_user/2
2014-04-29 00:50:43 +02:00
Holger Weiss
49bdbf2895
Support certificate verification for outgoing s2s
...
Handle "s2s_use_starttls: required_trusted" the same way for outgoing
s2s connections as for incoming connections. That is, check the remote
server's certificate (including the host name) and abort the connection
if verification fails.
2014-04-28 01:42:02 +02:00
Holger Weiss
a21d2298af
XEP-0198: Turn some warnings into info messages
...
Don't log warnings on events that will happen during normal operation.
2014-04-28 01:01:30 +02:00
Holger Weiss
1aa4ed3f35
Don't mess with s2s out when aborting s2s in
...
Don't try to look up and close outgoing connections to a given server
when aborting incoming connections from that server due to certificate
verification errors. The ejabberd_s2s:find_connection/2 call actually
created one or more *new* connections if less than 'max_s2s_connections'
connections were found. Then, no more than one of those possibly new
connections were stopped by the ejabberd_s2s_out:stop_connection/1 call.
It's not really necessary to bother with outgoing connections at all,
here.
2014-04-28 00:17:05 +02:00
Holger Weiss
eabca82765
Send stream trailer before closing s2s connection
...
When aborting an incoming s2s connection due to certificate verification
errors, send a stream trailer before closing the socket.
2014-04-27 00:28:42 +02:00
HAMANO Tsukasa
71dba66330
fix checking acl in mod_register_web
2014-04-24 18:15:39 +09:00
Holger Weiss
d805d198ac
Check TLS state before requesting SASL EXTERNAL
...
Make sure a remote server can't circumvent "s2s_use_starttls: required"
by offering SASL EXTERNAL authentication over a non-TLS connection.
2014-04-24 11:04:10 +02:00
HAMANO Tsukasa
ffe9f3c192
added get_random_pid/1 error handling
2014-04-24 15:34:41 +09:00
HAMANO Tsukasa
219f9276d1
undefined ejabberd_socket:get_conn_type/1
2014-04-24 12:42:22 +09:00
Holger Weiss
f988aad940
Log TLS status for outgoing s2s with SASL EXTERNAL
2014-04-23 23:28:13 +02:00
HAMANO Tsukasa
9ec014c184
added error handling in mod_pubsub_odbc.
2014-04-23 23:35:34 +09:00
Holger Weiss
86e17c379c
Verify host name before offering SASL EXTERNAL
...
Prior to this commit, ejabberd handled certificate authentication for
incoming s2s connections like this:
1. Verify the certificate without checking the host name. On failure,
behave according to 's2s_use_starttls'. On success:
2. Offer SASL EXTERNAL.
3. If the remote server chooses SASL EXTERNAL, compare the authorization
identity against the certificate host name(s). On failure, abort the
connection unconditionally.
ejabberd now does this instead:
1. Verify the certificate and compare the certificate host name(s)
against the 'from' attribute of the stream header. On failure,
behave according to 's2s_use_starttls'. On success:
2. Offer SASL EXTERNAL.
3. If the remote server chooses SASL EXTERNAL, ignore the authorization
identity (if any) and consider the peer authenticated.
The old behavior was suggested by previous versions of XEP-0178, the new
behavior is suggested by the current version 1.1.
2014-04-23 11:45:17 +02:00
Holger Weiss
4bc8b6bc9f
Fix extraction of host names from certificates
2014-04-22 22:12:04 +02:00
badlop
37d4109e8a
Merge pull request #161 from weiss/fix-carbons
...
Let mod_carboncopy take care of messages sent to bare/unavailable JIDs
2014-04-22 13:52:11 +02:00
Holger Weiss
d350cc6361
Accept "extauth_cache: false"
...
Don't log a "configuration problem" message if "extauth_cache: false" is
explicitly specified, as that's a valid configuration setting as per the
documentation.
2014-04-16 14:15:14 +02:00
Paweł Chmielowski
7af7b7d3f0
Fix compilation on pre-R17
2014-04-15 17:05:25 +02:00
Paweł Chmielowski
d97b4fd9ca
Fix loading translation files on R17
2014-04-15 17:05:22 +02:00
Alexey Shchepin
f93758a3cd
Merge pull request #160 from runcom/protocol_options
...
Add option to specify openssl options
2014-04-15 19:01:21 +04:00
badlop
285c4c17cf
Merge pull request #146 from jamielinux/master
...
Update FSF address
2014-04-11 13:35:46 +02:00
Evgeniy Khramtsov
a21edc2f3a
Pretty print accepted transport address
2014-04-11 12:30:58 +02:00
Holger Weiss
b3b12effbc
Carbons: Handle unavailable resource like bare JID
...
As the session manager handles messages sent to unavailable resources
just like messages sent to bare JIDs, mod_carboncopy must do that, too.
That is, forward them only to those carbon-copy-enabled resources that
don't have a top priority, in order to avoid duplicates.
2014-04-08 23:32:30 +02:00
Antonio Murdaca
fbf71f86f3
Add option to specify openssl options
2014-04-08 18:46:52 +02:00
Holger Weiss
9d5426315f
Carbons: Also forward messages sent to bare JIDs
...
Don't ignore messages sent to bare JIDs, but forward them to all
carbon-copy-enabled resources that don't have the highest priority.
2014-04-07 22:10:08 +02:00
Holger Weiss
c114eb3736
XEP-0198: Don't bounce/resend forwarded messages
...
On connection timeout, drop any messages that were forwarded by some
encapsulating protocol, such as XEP-0280 carbon copies or XEP-0313
archive messages. Bouncing or resending them could easily lead to
unexpected results.
2014-04-07 21:21:11 +02:00
badlop
766ab1eb46
Merge pull request #158 from weiss/fix-lang-type
...
Fix a type error
2014-04-07 13:28:41 +02:00
badlop
76fb7d284a
Merge pull request #157 from weiss/fix-mod-update
...
Fix badarg issue on module update web site
2014-04-07 13:27:31 +02:00
Holger Weiss
37f409d254
Fix a type error
2014-04-06 00:39:51 +02:00
Holger Weiss
e02a4913d2
Fix badarg issue on module update web site
2014-04-05 23:23:44 +02:00
HAMANO Tsukasa
1250ee5d77
mod_register_web: check same acl as mod_register.
2014-04-04 04:07:29 +09:00
Badlop
8b9c49440a
Fix user_resources command, and ejabberd_xmlrpc parsing auth details in call
2014-03-31 16:51:47 +02:00
Badlop
a5a065290b
Small change in ejabberd_ctl output format to support bash completion
2014-03-26 16:43:53 +01:00
Badlop
ac0e199d36
Provide meaningful text to user when admin kicks session (EJAB-1455)
2014-03-26 16:01:37 +01:00
Holger Weiss
a97c716352
XEP-0198: Bounce unacked stanzas by default
...
If the new "resend_on_timeout" option is set to false (which it is by
default), bounce any unacknowledged stanzas instead of re-routing them.
2014-03-25 23:23:38 +01:00
Evgeniy Khramtsov
2150b10901
Fix service_info options processing
2014-03-25 09:52:57 +04:00
Evgeniy Khramtsov
5c36c44689
Remove annyoing warnings
2014-03-25 09:42:12 +04:00
Badlop
d5f90965d7
Fix ACLs syntax change (thanks to jokker23)(issue #140 )
2014-03-24 19:40:55 +01:00
Holger Weiss
2da6933bb7
Remove "fun" element from c2s #state
...
Memory consumption wise, local "fun" references are quite expensive.
2014-03-22 20:25:43 +01:00
Holger Weiss
e360c56f87
Support XEP-0198 session resumption
...
Implement the optional session resumption feature described in XEP-0198.
A client that supports this feature may now resume the previous session
(within a configurable number of seconds) if the connection was lost.
During resumption, ejabberd will retransmit any stanzas that hadn't been
acknowledged by the client.
2014-03-19 00:51:33 +01:00
badlop
2b527f5e9a
Merge pull request #149 from iulianlaz/carboncopy-fix-msg-back-to-original-sender
...
#148 Carbon copy sends message back to original sender solved
2014-03-16 20:59:49 +01:00
Holger Weiss
88a200e100
Remove some commented out code
...
The code that had been commented out at some earlier point in time would
now break XEP-0198.
2014-03-16 00:12:47 +01:00
Badlop
633d47f784
Update copyright dates to 2014 (EJAB-1679)
2014-03-13 12:30:57 +01:00
Holger Weiss
7d594086c3
Add initial XEP-0198 support (EJAB-532)
...
Implement partial support for XEP-0198: Stream Management. After
successful negotiation of this feature, the server requests an ACK for
each stanza transmitted to the client and responds to ACK requests
issued by the client. On session termination, the server re-routes any
unacknowledged stanzas. The length of the pending queue can be limited
by setting the "max_ack_queue" option to some integer value (default:
500). XEP-0198 support can be disabled entirely by setting the
"stream_management" option to false (default: true).
So far, stream management is implemented only for c2s connections, and
the optional stream resumption feature also described in XEP-0198 is not
(yet) supported.
This addition was originally based on a patch provided by Magnus Henoch
and updated by Grzegorz Grasza. Their code implements an early draft of
XEP-0198 for some previous version of ejabberd. It has since been
rewritten almost entirely.
2014-03-12 23:34:14 +01:00
iulianlaz
9ef1ad0b6e
#148 Carbon copy sends message back to original sender solved
2014-03-06 08:40:38 +00:00
Badlop
e211bf522e
Support XEP-0321: Remote Roster Management (EJAB-1381)
2014-02-26 18:02:37 +01:00
Badlop
46b2d91105
Convert DB details to string when calling odbc:connect/2 (EJAB-1681)
2014-02-26 17:26:46 +01:00
Badlop
c29ba14dbf
Don't provide current password in webinterface (github issue #137 )
2014-02-26 17:19:07 +01:00
Jamie Nguyen
8538997d61
Update FSF address
2014-02-22 10:27:40 +00:00
Holger Weiss
e82a79efd5
Add missing parenthesis
2014-02-21 23:33:13 +01:00
Badlop
63a7011c38
When occupant changes nick, include status 110 in stanzas sent to him
2014-02-14 16:22:14 +01:00
Badlop
4c8b6fe16b
Fixing mod_carboncopy sends carbons of carbons ( fixes #107 )
2014-01-23 17:29:24 +01:00
mrjameshamilton
5ccc6db093
Fixed parameter order in call to restore_room/3
2014-01-23 14:39:52 +00:00
Alexey Shchepin
9422164dda
Clear SASL state after finishing auth
2014-01-21 13:44:29 +02:00
Alexey Shchepin
cbbfd921b4
Fix for the previous commit
2014-01-21 11:54:18 +02:00
Alexey Shchepin
d63be79df9
Use 'to' field only in the first client stream initialization
2014-01-20 16:06:05 +02:00
Badlop
e107e78773
Fix auth verification in ejabberd_xmlrpc (thanks to Vicis)
2014-01-02 16:10:19 +01:00
Evgeniy Khramtsov
d03de1bb43
Fix some type specs and errors
2013-12-10 21:44:46 +10:00
Evgeniy Khramtsov
33764bb931
Add ejabberd_xmlrpc
2013-12-10 21:25:12 +10:00
Badlop
5a1300bc70
Add access rule to mod_roster (EJAB-72)
2013-12-04 14:57:44 +01:00
Christophe Romain
9c17163b55
bind values for get_parentnodes_tree
2013-12-03 10:51:01 +01:00
Christophe Romain
e11c835bd3
fix use of virtual nodetree
2013-12-03 10:34:59 +01:00
Alexey Shchepin
1dd94ac0d0
Support for OpenSSL ciphers list in ejabberd_c2s, ejabberd_s2s_in and ejabberd_s2s_out
2013-11-28 19:39:11 +02:00
Badlop
a6b0e18bde
add Pubsub data migration from mnesia to odbc (EJAB-1126)
...
By calling:
ejd2odbc:export_pubsub("localhost","/tmp/aa.txt").
it will generate SQL files like these:
/tmp/pubsub_item.txt
/tmp/pubsub_node.txt
/tmp/pubsub_state.txt
Conflicts:
src/ejabberd_admin.erl
src/ejd2odbc.erl
2013-11-14 19:29:16 +01:00
Evgeniy Khramtsov
89a17ba84a
Correctly convert ACLs into YAML representation
2013-11-07 02:43:43 +10:00
Evgeniy Khramtsov
a87b475361
Do not use functions from crypto module wherever possible
2013-11-05 20:07:38 +10:00
Evgeniy Khramtsov
b7c7d2747b
Fix some type errors
2013-11-05 19:49:30 +10:00
Evgeniy Khramtsov
c0240e7249
Do not try to start STUN application during config checks
2013-11-02 10:30:19 +10:00
Evgeniy Khramtsov
6dd31299cf
Avoid case clause crash when loading permanent rooms
2013-10-23 12:23:00 +10:00
Badlop
cd0381bab5
Fix display ACLs in WebAdmin
2013-10-01 23:23:01 +02:00
Badlop
2c09d7c8a7
Fix handling of format_status arguments (thanks to Nbaronov)
2013-09-26 17:19:56 +02:00
Badlop
389a99b2db
Fix bypass for tls-required (thanks to Zeha)
2013-09-26 16:41:57 +02:00
Evgeniy Khramtsov
07c8bf5064
Fix roster version support
2013-09-24 18:59:20 +10:00
Evgeniy Khramtsov
7fd91a4b12
Better web-handlers detection
2013-09-22 21:47:59 +10:00
Evgeniy Khramtsov
ae4356265f
Merge branch 'master' of github.com:processone/ejabberd
2013-09-19 19:00:08 +10:00
Evgeniy Khramtsov
a0396620f2
Reflect modules name changes in p1_mysql
2013-09-19 18:59:32 +10:00
Paweł Chmielowski
7e73ed88f7
Fix problem with decoding http headers over tls connections
...
This fixed GitHub issue 96.
2013-09-16 16:32:02 +02:00
Christophe Romain
63b2d21b13
clean subscriptions handling and avoid function_clause
2013-08-27 14:46:54 +02:00
Christophe Romain
1b8876bf55
fix build of Parents list in #pubsub_node
2013-08-27 14:46:35 +02:00
Christophe Romain
b82eeeeec9
fix call to get_session_pid with binary arguments
2013-08-27 14:46:22 +02:00
Evgeniy Khramtsov
e3483ef9e1
Do not rely on p1_logger_h module when lager is enabled
2013-08-27 17:45:07 +10:00
Evgeniy Khramtsov
91a74e3e27
Change configuration file format to YAML
2013-08-21 22:17:59 +10:00
Evgeniy Khramtsov
f68dfacbbf
Do not try to read/write the deprecated "config" table
2013-08-21 19:37:22 +10:00
Evgeniy Khramtsov
0b9754884e
Do not distribute the ACL table
2013-08-21 19:37:08 +10:00
Evgeniy Khramtsov
cc6dcd161c
Get rid of global configuration options
2013-08-21 19:36:35 +10:00
Evgeniy Khramtsov
807a1fe164
Fix timestamp processing
2013-07-23 15:27:18 +10:00
Evgeniy Khramtsov
8ce22b790d
Fix some type errors
2013-07-22 19:24:09 +10:00
Evgeniy Khramtsov
f75d78d3f5
Make it possible to import without cursor usage
2013-07-22 10:46:47 +10:00
Evgeniy Khramtsov
ca6463ed78
Typo fix
2013-07-22 00:22:05 +10:00
Evgeniy Khramtsov
d58148fa8d
Add SQL to Mnesia converter
2013-07-21 23:10:38 +10:00
Evgeniy Khramtsov
a2ead99c83
Make it possible to enable/disable TLS compression
2013-07-17 22:46:18 +10:00
Evgeniy Khramtsov
986f4d1a7f
Do not forget to re-define the crash.log path
2013-07-15 11:51:09 +10:00
Badlop
0d7a5476c0
Allow room member to get members list using XEP
2013-07-11 12:11:48 +02:00
Christophe Romain
4e72dd6751
fix badmatch in send_loop (EJAB-1650)
2013-07-10 09:47:49 +02:00
Christophe Romain
48819d163a
fix badmatch on remove_user on PEP nodes (EJAB-1649)
2013-07-09 21:50:56 +02:00
Christophe Romain
8621a8f006
fix invalid response on get_options when no options set (EJAB-1648)
2013-07-09 18:11:27 +02:00
Badlop
b66e4fbdc4
Apparently configure.erl is not needed anymore
2013-07-08 15:58:38 +02:00
Alexey Shchepin
b5623d6bee
gen_iq_handler:check_type was missing
2013-07-08 10:40:39 +03:00
Evgeniy Khramtsov
0aca3a4585
Improve the applications start-up
...
* Check if all modules present for every application loaded.
* Get rid of now obsoleted 'ejabberd_check' module.
2013-07-07 02:19:51 +10:00
Christophe Romain
0266207e9d
fix pubsub unsubscription without SubId on odbc
2013-07-04 15:13:21 +02:00
Christophe Romain
60600c341e
improve pubsub odbc use of i2l
2013-07-04 10:07:53 +02:00
Christophe Romain
ac3cd2ebaa
ip_adresse() does not need binary representation in config
2013-06-28 18:32:22 +02:00
Evgeniy Khramtsov
2636da0d98
Fix IDNA conversion
2013-06-28 02:45:42 +10:00
Badlop
91744733c1
Store only messages with body or subject (EJABS-2034)
2013-06-27 11:58:31 +02:00
Evgeniy Khramtsov
8a9743ab3b
Avoid custom loglevels processing for lager
2013-06-27 19:27:56 +10:00
Evgeniy Khramtsov
597934637c
Logger improvements.
...
lager:
* It is now possible to change the loglevel.
* Log rotation is now supported as well.
p1_logger:
* When rotating a log file, add suffix ".0" to the renamed file.
This is needed in order to be consistent with lager
rotation mechanism.
2013-06-27 19:03:33 +10:00
Evgeniy Khramtsov
aab70fc066
Fix external authentication
2013-06-26 12:30:32 +10:00
Christophe Romain
ae1af885ce
fix feature build on node disco#info
2013-06-25 14:49:22 +02:00
Badlop
9840b8395e
Fix previous commit
2013-06-25 13:46:21 +02:00
Badlop
b524e79f55
Normalize HTTP path (thanks to Justin Kirby)
2013-06-25 11:26:44 +02:00
Christophe Romain
277ba798fc
typo fix in spec
2013-06-24 22:38:15 +02:00
Christophe Romain
b07b820c4e
fix missing binarization switch on pep nodes
2013-06-24 19:56:27 +02:00
Christophe Romain
1cc76ebb68
cosmetic change
2013-06-24 19:56:14 +02:00
Christophe Romain
1cb03439f2
add missing list conversion
2013-06-24 18:05:42 +02:00
Christophe Romain
3976351c4d
decode_jid always gets binary(), encode_jid lets mod_pubsub handle conversion
2013-06-24 18:04:42 +02:00
Christophe Romain
6bfa34e8e0
minor improvements and binary fix
2013-06-24 16:31:38 +02:00
Christophe Romain
4195259d47
typo fix, related to commit 9194872
2013-06-24 16:29:43 +02:00
Christophe Romain
95546ac20d
remove obsolete node attribute
2013-06-24 13:55:30 +02:00
Christophe Romain
0e28e4b600
Merge branch 'master' of github.com:processone/ejabberd
2013-06-24 13:46:44 +02:00
Christophe Romain
831ae2927a
change default PEP config for simpler setup (EJAB-1494)
2013-06-24 13:46:27 +02:00
Christophe Romain
91948729e9
remove need of extra _odbc in pubsub plugin name
2013-06-24 13:43:11 +02:00
Christophe Romain
222a94300b
fix decode function for binaryzed data
2013-06-24 13:42:34 +02:00
Evgeniy Khramtsov
f9390f3e9a
Fix some dialyzer warnings
2013-06-24 20:04:56 +10:00
Evgeniy Khramtsov
7b07c2a9b2
Improve the type spec
2013-06-24 13:15:07 +10:00
Evgeniy Khramtsov
521bae7fa0
Get rid of useless clause
2013-06-24 13:13:43 +10:00
Evgeniy Khramtsov
a3354f5dc4
Do not generate LDAP's ASN.1 code when compiling ejabberd.
...
We need ASN.1 codec to decode messages into binaries, so we
fixed generated ELDAPv3.erl. A better solution is needed to be found.
2013-06-22 03:27:59 +10:00
Badlop
109ed1a8b1
According to XEP-0045, a MUC member is allowed to retrieve the members list
2013-06-21 11:43:23 +02:00
Christophe Romain
0c60718bef
fix empty itemid on publish when passing Access
2013-06-20 17:51:07 +02:00
Christophe Romain
4221d56c04
fix pubsub issue on binary switch
2013-06-20 17:07:40 +02:00
Evgeniy Khramtsov
4dc80dddd4
Fix all calls to functions of p1_tls application
2013-06-20 18:40:44 +10:00
Evgeniy Khramtsov
89c3cf3677
Shutdown rooms before starting test cases
2013-06-19 21:46:22 +10:00
Jerome Sautret
fedea8bca0
Added missing license and copyright headers.
2013-06-18 16:56:29 +02:00
Christophe Romain
c030e8e136
sync pubsub_odbc with last fix
2013-06-18 12:23:32 +02:00
Evgeniy Khramtsov
8ea41718ac
Fix node auto-creation
2013-06-18 04:11:54 +10:00
Christophe Romain
20598c7be4
sync and cleanup pubsub_odbc
2013-06-17 16:34:21 +02:00
Christophe Romain
08fc6df853
fix auto-create issue due to bad binary matching
2013-06-17 16:30:20 +02:00
Alexey Shchepin
62fb432e3e
Fixed broadcast messages handling
2013-06-17 16:41:02 +03:00
Alexey Shchepin
862a08e9eb
Fixed conversion to ezlib
2013-06-17 16:33:25 +03:00
Evgeniy Khramtsov
0baf4e6088
Advertise privacy lists support via disco#info
2013-06-17 16:10:30 +03:00
Evgeniy Khramtsov
7865c6a146
Don't include sub-elements in IQ results where it's not required
...
by the corresponding spec (RFC or XEP).
2013-06-17 16:09:54 +03:00
Evgeniy Khramtsov
b50a4948ed
Fix the error report of an incorrect certfile
2013-06-17 16:04:43 +03:00
Badlop
243d24015c
Remove old obsolete R14 code
2013-06-14 16:18:22 +02:00
Badlop
4c445b37fd
In frontends, if result is in binary then convert to string
2013-06-14 16:08:47 +02:00
Paweł Chmielowski
f6e39f64e2
Make ejabberd_ctl not die for ejabberd_commands with binary arguments
2013-06-14 16:08:02 +02:00
Christophe Romain
26b815f52d
cosmetic changes, move badly placed comments
2013-06-14 00:04:25 +02:00
Evgeniy Khramtsov
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
Badlop
0080f1f308
Detect correctly newer Darwin versions (EJAB-1594)
2013-06-06 12:24:18 +02:00
Christophe Romain
58e769d68f
fix getting ServerHost from Host due to binary portage (EJAB-1638)
2013-06-06 11:32:52 +02:00
Christophe Romain
c8cba04f05
access_createnode acl also applies to auto created nodes ported to pubsub_odbc
2013-06-06 11:11:37 +02:00
Badlop
d1e1191793
Handle multiple < and > in mod_muc_log plaintext mode (EJAB-1640)
2013-05-31 13:23:08 +02:00
Badlop
3025bfd3ff
Handle ~ control sequence in text of mod_muc_log (EJAB-1639)
2013-05-30 14:28:39 +02:00
Paul Donohue
089c664bad
Fix a bug when reading tuples from config
...
If the config contains a tuple of integers (for example, if a bind IP
address is specified) then strings_to_binary() calls tuple_to_list()
followed by strings_to_binary(), which then calls list_to_binary()
because the list looks like a string. Then list_to_tuple() is called on
the returned binary, causing a crash.
This patch corrects the problem by calling strings_to_binary1() instead,
which ensures that the value that is passed into list_to_tuple() is a
list.
2013-05-24 14:29:41 -04:00
Anton Ryzhov
e71650325b
Removed wrong option for ejabberd_service
module (since 174c16a1
)
2013-05-16 01:22:02 +04:00
Badlop
c0bf054583
Tweak ejabberd_listener to allow ejabberd_xmlrpc work properly
2013-05-14 18:50:54 +02:00
Badlop
80f165a55c
Fix get of announcement form
2013-04-25 16:00:24 +02:00
badlop
54667511f6
Merge pull request #62 from PaulSD/master
...
Fix errors when generating random binary strings
2013-04-25 03:48:55 -07:00
Badlop
d38ccbea6b
access_createnode acl also applies to auto created nodes (thanks to Matthias Rieber)
2013-04-25 12:37:16 +02:00
Badlop
dfee84374f
Include actor element in MUC stanzas when kicking (thanks to Purvesh Sahoo)(EJAB-1206)
2013-04-24 11:01:02 +02:00
Badlop
3e93fbfd2e
Revert "Include actor element in MUC stanzas when kicking (thanks to Purvesh Sahoo)(EJAB-1206)"
...
This reverts commit 066c47ca96
.
2013-04-23 13:57:18 +02:00
Badlop
066c47ca96
Include actor element in MUC stanzas when kicking (thanks to Purvesh Sahoo)(EJAB-1206)
2013-04-23 13:55:40 +02:00
Stephen Röttger
9fa415e557
SCRAM optional parameter parsing bugfix
...
The server gave an authentication error, if optional parameters
were present in the GS2 Header. Specifically, the "a=" parameter,
that can be used by admins to login as a different user.
2013-04-23 13:55:36 +02:00
Paul Donohue
b33a482582
Fix error when generating random binary strings
2013-04-19 15:30:13 -04:00
Badlop
c0afb1f282
Fix bug when getting room config
2013-04-15 11:14:32 +02:00
Badlop
abc1341b3f
Fix mod_http_fileserver work with binaries (GITHUB-59)
2013-04-12 12:55:49 +02:00
Badlop
c7eaa9aeac
ejabberd 13 requires Erlang/OTP R15B or higher (EJAB-1630)
...
Fix documents and remove useless code.
2013-04-11 17:12:53 +02:00
Janusz Dziemidowicz
74808b25a1
Change message type of carbon copies from 'chart' to 'chat'
2013-04-09 23:21:06 +02:00
Badlop
cbd3062365
Don't overwrite inetrc when installing (thanks to skeltoac)
2013-04-04 13:36:15 +02:00
Evgeniy Khramtsov
7a00622aa8
Merge branch 'master' of github.com:processone/ejabberd
2013-03-29 19:38:19 +10:00
Evgeniy Khramtsov
0d80e7e68a
Get rid of references to non-existent module
2013-03-29 19:38:01 +10:00
Evgeniy Khramtsov
299a0f823a
Fix several refactoring related bugs
2013-03-29 19:23:52 +10:00
Badlop
fc7360068a
Update version number to beta2
2013-03-29 10:04:30 +01:00
Badlop
4c2d2bd4e9
Add mod_carboncopy that implements XEP-0280 v0.8
2013-03-27 17:53:56 +01:00
Badlop
9b510579b3
Fix room configuration after binarization
2013-03-22 17:14:47 +01:00
Badlop
d901aa982b
Fix privacy list broadcast internal stanza after binarization
2013-03-22 13:57:45 +01:00
Badlop
2c6b12228a
Change version number
2013-03-20 20:54:53 +01:00
Badlop
f92a94a737
Copied PostgreSQL erlang library from ejabberd-modules SVN
2013-03-19 13:30:17 +01:00
Badlop
1b304aaf0a
Copied MySQL erlang library from ejabberd-modules SVN
2013-03-19 13:30:15 +01:00
Badlop
9deb294328
Accumulated patch to binarize and indent code
2013-03-14 10:33:02 +01:00
Badlop
9c41abde10
list_to_integer/2 only works in OTP R14 and newer
2013-03-14 10:25:41 +01:00
Badlop
907e239d4e
Fix bug when displaying offline messages in WebAdmin
2013-03-14 10:25:38 +01:00
Badlop
c058687bf9
Update ejabberd version number to 2.1.12
2013-02-05 17:22:34 +01:00
Badlop
3f93931409
New mod_muc_log option file_permissions (EJAB-1588)
2013-02-05 16:20:14 +01:00
Steven Lehrburger
426f1107c5
Fix issue with ejabberd_xmlrpc user auth and SCRAM
...
After enabling SCRAM password hashing and SSL in ejabberd, XMLRPC ejabberdctl commands were resulting in errors like this:
W(<0.2623.0>:ejabberd_xmlrpc:328) : Error -118
A problem '{error,invalid_account_data}' occurred executing the command user_sessions_info with arguments
It seems that this because ejabberd_commands was using a different authentication check than everything else, which wasn't properly taking account for potential password hashing. (Note I'm not really sure what AccountPassMD5 is doing, but it seems to be different than the ejabberd_auth_internal's SCRAM hasing.)
2013-02-04 12:57:56 +01:00
Badlop
2704378d43
Fix compatibility of LDAP support with Erlang R16A (EJAB-1612)
...
As explained in Erlang/OTP git log:
eldap: Remove calls to undocumented asn1rt* functions.
We are about to remove the old asn1rt* modules, so we must remove
the calls that eldap make to them. Since the calls are just a
sanity check, we can just remove the calls. Just doing the decode
will do roughly the same tests and generate similar exceptions.
2013-02-04 10:31:54 +01:00
Badlop
e500fd74ad
Fix warning about unused variable
2013-02-01 16:50:42 +01:00
Badlop
e7f85411fe
Update Hebrew translation (thanks to Isratine Citizen)
2013-01-31 17:27:47 +01:00
Badlop
15073aafa5
Fix angle brackets handle in MUC plaintext log (EJAB-1610)
2013-01-31 17:25:03 +01:00
Alexey Shchepin
0ae400533c
Update copyright dates
2013-01-24 16:25:13 +02:00
Evgeniy Khramtsov
d47dee8009
Make sure update_info returns atoms only (EJAB-1595) (Thanks to Jose M Herrero)
2013-01-03 20:26:16 +10:00
Alexey Shchepin
d5506a3ff0
Fixed signedness issue in tls_drv GET_DESCRYPTED_INPUT (EJAB-1591)
2012-12-20 14:01:45 +02:00
Remco Wendt
d81eb95cab
Added command to list all the vhosts registered in an ejabberd node
2012-12-19 15:00:57 +02:00
alexeyshch
1f290c8a29
Merge pull request #37 from rraptorr/tls
...
TLS driver impovements
2012-12-17 04:53:09 -08:00
Evgeniy Khramtsov
be33ab890e
Fix broken JPEG photo (EJAB-1526)
2012-12-12 18:08:24 +10:00
Badlop
2c26926689
Copy, fix and document export2odbc command from mod_admin_extra.erl
2012-11-26 13:22:29 +01:00
Evgeniy Khramtsov
9208f4dd50
Make terms serialization faster
2012-11-22 16:18:48 +02:00
Alexey Shchepin
dfcdf1ca7a
Fixed mod_offline:store_offline_msg argument (EJAB-1581)
2012-11-09 12:48:25 +02:00
Badlop
ec51ba7bc6
New Hebrew translation (thanks to Isratine Citizen)
2012-10-17 18:26:55 +02:00
Badlop
2dc2769c92
Log IP address when auth attempt fails (thanks to Zach Calvert)
2012-08-27 17:40:01 +02:00
Badlop
8a737f875f
Add SCRAM and remove MD5 support to ejabberd commands auth verification
2012-08-27 16:57:56 +02:00
Badlop
4147081f0b
Added clause so ejabberdctl number of arguments error report works with R15
2012-08-27 16:38:52 +02:00
Badlop
a47fd96cc8
On shutdown, first stop listeners, then modules (thanks to Vishal Xica)(EJAB-1566)
2012-07-25 13:02:21 +02:00
Badlop
4d54bce621
Send announce Message stanzas as Headline type instead of Normal
2012-07-24 18:35:41 +02:00
Janusz Dziemidowicz
5e7a1c8829
Detect OpenSSL version at runtime, not at compile time
2012-07-24 07:40:07 +02:00
Janusz Dziemidowicz
bc65b5008e
Enable DHE key exchange in TLS driver
2012-07-19 12:06:03 +02:00
Janusz Dziemidowicz
a407382d9f
Enable ECDHE key exchange in TSL driver
2012-07-18 22:33:38 +02:00
Janusz Dziemidowicz
d2d51381ec
Disable old and unsecure ciphers in TLS driver
...
Disable:
- export ciphers - broken by design, 40 and 56 bit encryption
- low encryption ciphers - 56 and 64 bit encryption
- SSLv2 ciphers - some ciphers using MD5 MAC
2012-07-18 22:00:58 +02:00
Janusz Dziemidowicz
e06c1c49c1
Disable SSL 2.0 in TLS driver
...
SSL 2.0 is not used anywhere as it has security problems. Disable it
unconditionally both in server and client mode. This does _not_
disable support for SSL 2.0 compatible client hello which still will
be accepted in the server mode.
2012-07-18 21:57:28 +02:00
Evgeniy Khramtsov
0cc920579c
Fix regression introduced in odbc/mnesia merge
2012-07-17 23:35:16 +10:00
Janusz Dziemidowicz
efc0b0ba5a
Reduce size of XML stream state
...
This makes size of hibernated ejabberd_receiver a lot smaller (from
~290 words down to ~40).
2012-07-09 17:03:33 +03:00
Badlop
2bf8125abf
Allow multiple fqdn values in configuration (EJAB-1578)
2012-06-27 11:10:48 +02:00
Badlop
75756f0fc9
Check node name is available before starting ejabberd (EJAB-1572)
2012-06-08 17:33:21 +02:00
Badlop
bc077266d9
Fix MUC start when Mnesia tables don't exist yet
2012-06-08 16:39:15 +02:00
Badlop
a99c1e7031
Fix account registration
2012-06-06 12:55:35 +02:00
Badlop
bb026ef598
Update Slovak translation (thanks to Marek Bečka)
2012-05-15 12:00:04 +02:00
Badlop
e5d5ea49be
Revert "Update ejabberd version number to 2.1.11"
...
This reverts commit 453e249de3
.
2012-05-15 11:46:31 +02: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
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
Evgeniy Khramtsov
437f68a9f3
Merge SQL and Mnesia code into one module (EJAB-1560)
2012-04-27 19:52:05 +10:00
Badlop
453e249de3
Update ejabberd version number to 2.1.11
2012-04-26 16:04:16 +02:00
Badlop
6e2003c2e2
Recompile translation files
2012-04-26 15:54:54 +02:00
Badlop
5ed8959eba
Update Italian translation (thanks to Luca Brivio)
2012-04-25 00:00:52 +02:00
Maxim Ignatenko
7623ebd327
mod_irc: Make use of MUC password
2012-04-24 15:21:46 +02:00
Badlop
522eb0fe9d
Update PO files manually according to the English fix
2012-04-24 13:52:59 +02:00
Badlop
7dd171322d
Fix English strings (thanks to Andreas van Cranenburgh)
2012-04-24 13:51:54 +02:00
Badlop
752652e56c
Update German translation again (thanks to Nikolaus Polak)
2012-04-24 13:51:04 +02:00
Badlop
2582a478ab
Update Portuguese-Brazil translation (thanks to Otávio Fernandes)
2012-04-23 09:58:03 +02:00
Badlop
52ff5de564
Update Polish translation (thanks to Zbyszek Żółkiewski)
2012-04-23 09:58:01 +02:00
Badlop
ba793af8b7
Update Norwegian translation (thanks to Stian B. Barmen)
2012-04-23 09:57:59 +02:00
Badlop
3304ecd1f0
Update Catalan translation (thanks to Jan Kusanagi)
2012-04-23 09:57:56 +02:00
Badlop
4e0394cab3
Update Japanese translation (thanks to Mako N)
2012-04-20 15:42:41 +02:00
Badlop
eaa963a840
Update Greek translation (thanks to James Iakovos Mandelis)
2012-04-20 15:42:38 +02:00
Evgeniy Khramtsov
31c13cc1c8
Remove useless mnesia call
2012-04-20 16:52:33 +10:00
Badlop
310aa7a00d
Update Czech translation (thanks to Jan Pinkas)
2012-04-18 11:13:36 +02:00
Badlop
fafd605d4d
Update Chinese translation (thanks to Shelley Shyan)
2012-04-18 10:13:34 +02:00
Badlop
078f3583f0
Update Turkish translation (thanks to Doruk Fisek)
2012-04-18 10:13:15 +02:00
Badlop
0b337329ba
Update Russian translation (thanks to Evgeniy Khramtsov)
2012-04-18 10:12:47 +02:00
Badlop
f5df63554f
Update Dutch translation (thanks to Andreas van Cranenburgh)
2012-04-18 10:12:22 +02:00
Badlop
46c4f46451
Update Esperanto translation (thanks to Andreas van Cranenburgh)
2012-04-18 10:12:09 +02:00
Badlop
e034864c12
Update German translation (thanks to Nikolaus Polak)
2012-04-18 10:11:36 +02:00
Badlop
91f38cc849
Extract new strings
2012-04-18 10:08:30 +02:00
Evgeniy Khramtsov
e616d2686f
Perform user part substitution in ldap_rfilter (EJAB-1555)
2012-04-17 17:19:53 +10:00
Badlop
5a09d671ab
Photos from LDAP not displayed in some clients, lacking TYPE (thanks to Alex Crycheck)(EJAB-1554)
2012-04-16 12:25:14 +02:00
Badlop
58d49d2867
Update Spanish translation
2012-04-15 00:21:22 +02:00
Badlop
8bb58ba3c3
Extract new strings
2012-04-15 00:21:15 +02:00
Badlop
49859683b0
Document how to provide a long announcement (EJAB-1553)
2012-04-14 23:29:55 +02:00
Badlop
169b83b36d
Handle the scenario of disabled mod_muc (EJAB-1553)
2012-04-14 23:29:30 +02:00
Evgeniy Khramtsov
86435ba9aa
ODBC support for mod_blocking
2012-04-12 14:22:56 +10:00
Paweł Chmielowski
e2d6bc95a4
Parse and encode https header names like native http parser does
...
This code adds case normalization step to https headers parsing, making
it correctly use atoms for some special header no matter how upper/lower
case letters are used in input string
2012-04-11 17:28:18 +02:00
Christophe Romain
06f570f4ff
return user affiliation for a specified node (thanks to Karim Gemayel) (EJAB-1294)
2012-04-11 16:50:36 +02:00
Badlop
730dfe8fc7
Add comments about Dialyzer warnings
2012-04-11 16:34:03 +02:00
Evgeniy Khramtsov
5619d39bd3
Add odbc modules to Makefile.win32
2012-04-09 14:53:15 +10:00
Evgeniy Khramtsov
959e0ff1c9
Remove obsoleted function call
2012-04-09 10:43:49 +10:00
Paweł Chmielowski
2c228e6414
Don't use binary:match to extract lines from binaries
...
This was added in R13B3, lets roll our own implementation to make sure it
works on older erlang versions.
2012-04-06 18:55:27 +02:00
Paweł Chmielowski
82468bff00
Fix makefile rules for building dll-s in Makefile.win32 files
2012-04-06 16:31:17 +02:00
Paweł Chmielowski
5f82846732
Parse correctly https request split into multiple packets
...
This fixes case when SockMod:recv() calls returns only part of first line
of http request (GET/POST/OPTION/HEAD line). Before that change request
like that (and if keep-alive was active, all further request) were dropped.
This fixes EJAB-1537.
2012-04-06 16:22:08 +02:00
Paweł Chmielowski
09c75af15c
Make sure that res is initialized in all cases
2012-04-06 12:00:43 +02:00
Alexey Shchepin
91964b1aba
Added missed tls:recv_data/2
2012-04-06 11:53:53 +02:00
Paweł Chmielowski
af2e9169e6
Don't ignore Length parameter in tls:recv
2012-04-06 11:53:21 +02:00
Alexey Shchepin
4637e2c66b
Avoid quadratic behavior in reading SSL data
2012-04-06 11:47:53 +02:00
Paweł Chmielowski
1f1a98d7ae
Properly handle HEAD request in mod_http_bind (this fixes EJAB-1538)
2012-04-06 11:47:38 +02:00
Evgeniy Khramtsov
cea23b055b
Get rid of duplicated code
2012-04-06 12:31:29 +10:00
Evgeniy Khramtsov
41a0eae0bd
ODBC support for mod_shared_roster
2012-04-04 20:37:43 +10:00
Evgeniy Khramtsov
5fab00011e
ODBC support for mod_irc
2012-04-03 20:23:41 +10:00
Evgeniy Khramtsov
ca5f028016
ODBC support for mod_vcard_xupdate
2012-04-02 15:21:54 +10:00
Evgeniy Khramtsov
b43444f674
ODBC support for mod_announce
2012-04-02 14:49:13 +10:00
Evgeniy Khramtsov
866085c918
Add ODBC exporting function for privacy table
2012-04-02 12:39:23 +10:00
Evgeniy Khramtsov
6ec5c7c4d8
Use proper module name
2012-03-31 22:56:51 +10:00
Evgeniy Khramtsov
6b3875814c
ODBC support for mod_muc
2012-03-31 21:41:54 +10:00
Evgeniy Khramtsov
3a51c801e1
Change log level from informational to error
2012-03-19 18:52:20 +10:00
Badlop
983da9c887
Relax digest-uri handling (thanks to Daniel Willmann)(EJAB-1529)
...
This patch introduces a new config option - fqdn - to set the fully
qualified domain name of the host:
{fqdn, "foo.example.com"}.
This fixes a problem with Pidgin not being able to log in on a server
that used SRV records.
2012-03-16 14:16:17 +01:00
Evgeniy Khramtsov
f7b6446c74
Assume we have only one CPU when an auto-detection fails (EJAB-1516)
2012-02-29 00:45:45 +10:00
Evgeniy Khramtsov
deb87f2dfa
Cache caps timestamp before the IQ-request is done
2012-02-28 16:38:24 +10:00
Alexey Shchepin
b1e2538488
Update copyright dates
2012-02-23 17:52:34 +02:00
Christophe Romain
f7ffdfa15d
Fix typo in xep number, bosh is xep0206 (thanks to Ludovic Bocquet)
2012-02-20 14:15:08 +01:00
Badlop
112a18f966
Work also with some unicode strings in PgSQL (EJAB-1490)
2012-02-14 13:18:18 +01:00
Badlop
7d623d5eb4
Option default_host for handling HTTP requests with ambiguous Host (EJAB-1261)
2012-02-14 11:35:52 +01:00
Evgeniy Khramtsov
4819738e8f
Receiver should not generate an exception
2012-02-14 17:03:08 +10:00
Evgeniy Khramtsov
89aa7baa5b
Replace a single quote with double quotes in
...
an ODBC escape (thanks to Vladislav Chugunov)
2012-01-31 11:18:37 +10:00
Badlop
95928a7cd4
http_bind webserver TLS fail on Chrome (thanks to Adam Langley)(EJAB-1530)
2012-01-19 13:21:25 +01:00
Alexey Shchepin
1ecc9ac48c
Fixed ejabberd_http:get_line
2012-01-19 12:20:48 +02:00
Badlop
288196c7e8
Foreign shared rosters items not pushed (thanks to Nathan Bruning)(EJAB-1509)
2012-01-04 19:21:31 +01:00
Badlop
0283c6cdfe
Revert "Update ejabberd version number to 2.1.10"
...
This reverts commit bcdae19141
.
2011-12-31 20:40:04 +01:00
Alexey Shchepin
d4e7b0cda0
mod_private.erl: misc errors cases fixes (thanks to Karim Gemayel)
2011-12-30 16:08:24 +02:00
Badlop
bcdae19141
Update ejabberd version number to 2.1.10
2011-12-23 12:27:30 +01:00
Badlop
684cac274d
Support undefinition of ssl:seed in R15B
2011-12-23 12:19:38 +01:00
Badlop
ce7b008b8f
Use the regexp frontend module (EJAB-921)
2011-12-23 11:33:33 +01:00
Alexey Shchepin
a3c58f2896
Always allow packets from user's server and bare jid in mod_privacy*
2011-12-22 16:37:47 +02:00
Alexey Shchepin
3839f1055a
Fixed the previous mod_blocking patch
2011-12-21 18:28:04 +02:00
Alexey Shchepin
94350ddb3a
Corrected mod_blocking hooks return value, activate "Blocked Contacts" privacy list after it is changed
2011-12-21 16:25:01 +02:00
Badlop
919cdc27db
Fix update with stripped beams (thanks to Jose M Herrero)(EJAB-1520)
2011-12-21 12:58:58 +01:00
Badlop
2029e39299
Support Erlang/OTP R15B driver (EJAB-1521)
2011-12-21 12:15:21 +01:00
Evgeniy Khramtsov
707bb0a321
Replace regexp with ejabberd_regexp
2011-12-19 16:10:48 +10:00
Evgeniy Khramtsov
298a4a3acf
Get rid of +driver option because it is incompatible with R15B
2011-12-19 16:01:04 +10:00
Badlop
262157c88d
Preliminary support for groupname@vhost in Displayed Groups (EJAB-506)
2011-12-15 17:27:28 +01:00
Badlop
37107af7b4
Fix command "update" to return response in the expected format
2011-12-08 19:39:36 +01:00
Badlop
13a9ca65a4
Don't reveal invitee's resource when room informs invitor
2011-12-08 16:35:31 +01:00
Badlop
d3369c83e7
Add callback function print_state/1 for behavior p1_fsm
2011-12-08 12:50:40 +01:00
Badlop
48308042b6
Use the regexp frontend module (EJAB-921)
2011-12-08 12:40:04 +01:00
Badlop
d30ad8ba28
Frontend module to Re and Regexp (EJAB-921)
2011-12-08 12:39:58 +01:00
Pablo Polvorin
cf973f27bb
Prevent overload of incomming s2s connections
...
Three changes were introduced:
1) ejabberd_s2s_in now uses p1_fsm instead of gen_fsm. And uses
the {max_queue, N} option to kill the process if its input
queue grows too much.
2) If a ejabberd_s2s_in process is overload and killed, the server
that originated that connection is not allowed to connect back
to us for X seconds (set to 60seconds on the source)
3) The list of blocked (both statically and dynamically by the above
method) host is now also checked for hosts authenticating by
starttls+sasl. Previusly it was only used during dialback.
2011-12-02 15:30:20 -03:00
Pablo Polvorin
87df27109a
Fix bug on s2s shaper when TLS is used
...
The shaper was not enabled if the remote server authenticates
using a certificate instead of dialback.
2011-12-01 13:16:21 -03:00
Christophe Romain
89e4e822bf
add hooks for node creation/deletion (EJAB-1470)
2011-11-29 14:13:13 +01:00
Badlop
b89d4c7476
Use httpc instead of the deprecated http
2011-11-26 17:20:06 +01:00
Badlop
ee968b5573
Fix error in mod_vcard when lowercasing some vjud search result fields (EJAB-1490)
2011-11-26 17:08:17 +01:00
Badlop
1f97740cfa
Avoid a possible race condition
2011-11-26 17:03:24 +01:00
Evgeniy Khramtsov
944791e888
Fix presence problem after first unavailable (thanks to Christopher Faulet) (EJAB-1466)
2011-11-09 15:09:02 +10:00
Badlop
0656377165
Support to update modules in R14B04 and higher
2011-11-03 19:47:11 +01:00
Evgeniy Khramtsov
96800e9b75
Get rid of useless mnesia transaction (EJAB-1502)
2011-10-14 16:57:51 +10:00
Badlop
c1d479f863
Set ejabberd version to 2.1.x
2011-10-13 17:56:19 +02:00
Badlop
4be7984a0e
Update ejabberd version number to 2.1.9
2011-09-26 18:11:18 +02:00
Evgeniy Khramtsov
39bc499b10
Fix instruction and error text
2011-09-26 20:00:43 +10:00
Evgeniy Khramtsov
de4d4a4bbb
Change "muc#role" field type to "hidden"
2011-09-26 19:54:55 +10:00
Evgeniy Khramtsov
8631dd14e9
Correct lists:keysearch output processing and fix dialyzer warning
2011-09-26 19:06:34 +10:00
Evgeniy Khramtsov
e7d12f4b9e
Code cleanup
2011-09-26 18:44:41 +10:00
Maxim Ignatenko
f17a531e15
Use treap correctly
2011-09-26 11:16:30 +03:00
Maxim Ignatenko
ff57c8a58c
Apply patch from Evgeniy Khramtsov
2011-09-26 11:16:30 +03:00
Maxim Ignatenko
499b884c67
Use treap for keeping last voice request timestamps
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
0c261fb903
Fix voice request/approvement detection and extract_jid_from_voice_approvement/1
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
322263fd5c
Fix typo
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
845f5cabec
Fix patterns in check_voice_request_fields/2 and check_voice_approvement_fields/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
f919349173
Use more pattern-matching
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
a91ae03dc6
Remove try/catch
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
faed7698c2
Use pattern matching in check_voice_request_fields/2 and check_voice_approvement_fields/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
eb8347f92b
Reverse arguments order for timer:now_diff/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
c53ffe6dc5
Fix return value inconsistency in last_voice_request_time/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
7c8eab4f43
Use jlib:parse_xdata_submit/1 in is_voice_request/1 and is_voice_approvement/1
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
b1d8168dd3
Use bare JID as key in state.last_voice_request_time
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
c196c1f5e5
Use lists:foreach instead of lists:map in send_voice_request/2
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
604563af76
Remove needless time conversions
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
6848d3affe
Ignore any extra elements in voice approvement form submission
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
6708914e99
Add 2 room config options
...
- Allow voice requests?
- Minimum interval between voice requests
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
5921f9c506
Simple rate control
...
Visitor allowed to send new voice request only after specified amount of
time (or after rejoining).
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
6193ed63b1
Voice approvement support
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
18dd0d08cb
Implement basic voice request processing logic.
...
No rate control or configuration for now
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
8dd6f128bf
Implement voice approvement detection and remove some debug code
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
04267930de
Fix form instructions
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
d83716dece
Use ejabberd_router:route/3 directly, instead of send_packet_to/3
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
c77358bdc1
Use exception handling in is_invitation/1
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
44987479a5
Fix exception handling in is_voice_request/1
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
30d89abf66
Implemented sending voice request and fixed some bugs
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
f175be6b78
Add function for detecting voice requests
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
2a41ca0628
More correct dispatching of normal messages to conference room
...
is_invitation/1 function returns true if <x> element of message is
an invitation
2011-09-26 11:16:27 +03:00
Janusz Dziemidowicz
c4f9a050c9
Decrease CPU usage caused by tls:send with large data.
...
Sending one large chunk of data with tls:send eats lots of
CPU power and blocks whole Erlang emulator. This is caused by the
fact that encrypted output is read from memory BIO in 1k chunks.
Memory BIO, after reading data, shifts the remaining part.
If large chunks of data (few MB) is sent and then read in 1k
chunks, then a _lot_ of shifting is performed eating CPU.
The solution is to simply allocate binary of the needed size
(amount of data in memory BIO can be retrieved with
BIO_ctrl_pending) and then issue only one read that reads the
whole data.
2011-09-25 00:23:31 +02:00
Badlop
32ff6b56eb
Fix mod_muc_log crash when first log entry is room being destroyed (EJAB-1499)
2011-09-23 17:00:50 +02:00
Christophe Romain
33c0ebb100
fix broken PEP after EJAB-1498 (thanks to Karim Gemayel)
2011-09-22 20:51:59 +02:00
Badlop
cb9aecf35e
ejabberdctl doesn't support parameters with blankspaces (EJAB-1458)
...
Revert "Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)"
This reverts commit 6dea2d2307
.
2011-09-22 16:18:04 +02:00
Christophe Romain
d5b4d67858
Fix Denial of Service when user sends malformed publish stanza (thanks to Oleg Smirnov) (EJAB-1498)
2011-09-21 14:39:50 +02:00
Badlop
9f4ae07100
added svg mimetype to default content types (thanks to Markus Kohlhase)
2011-09-20 16:50:22 +02:00
Badlop
32fc36b17d
Add support for @online@ to add_user_to_group
2011-09-20 16:44:51 +02:00
Evgeniy Khramtsov
33766a124d
New option support: ldap_deref_aliases (EJAB-639)
2011-09-19 16:58:55 +10:00
Evgeniy Khramtsov
ede8d57373
Fix dialyzer warnings
2011-09-17 10:48:52 +10:00
Evgeniy Khramtsov
2494e39c9e
Fix dialyzer warnings
2011-09-15 16:59:45 +10:00
Badlop
07fdd089a0
No need to explicitly skip old useless tables, simply fix keep_tables
2011-09-14 12:15:53 +02:00
Evgeniy Khramtsov
228a587fc5
Fix previous commit
2011-09-09 12:40:07 +10:00
Evgeniy Khramtsov
e432ff58f9
Avoid crash when performing admin action
2011-09-09 12:34:06 +10:00
Badlop
b8969f68e0
Fixed support for multi-resource occupants (EJAB-305)
2011-09-08 16:10:38 +02:00
Badlop
dbb2d1c229
Fix room config change logging, due to allow_private_messages_from_visitors
2011-09-08 12:34:25 +02:00
Badlop
609b7ed5c5
Support to import XML files without password-format attribute
2011-09-08 11:41:45 +02:00
Badlop
20f3fc96c3
Fix SCRAM to support attributes which value has only one character
2011-09-05 23:21:38 +02:00
Evgeniy Khramtsov
0fde148a9f
Fix dialyzer warnings
2011-09-05 22:00:50 +10:00
Evgeniy Khramtsov
6b0eb1f09d
Reorganize the code to shut up the dialyzer
2011-09-05 21:27:31 +10:00
Evgeniy Khramtsov
f3c90ee266
Get rid of useless check
2011-09-05 21:06:18 +10:00
Evgeniy Khramtsov
2482c9c5ed
Merge set_affiliation/3 and set_affiliation_and_reason/4 into set_affiliation/4
2011-09-05 20:53:01 +10:00
Badlop
da555fb908
Fix SCRAM auth of uppercase passwords (EJAB-1196)
2011-09-05 12:50:24 +02:00
Evgeniy Khramtsov
7ae7d6315f
Remove useless clauses
2011-09-05 18:07:50 +10:00
Evgeniy Khramtsov
eccb499346
Add some magic in order to shut up the dialyzer (because I do not want to replace the macro with a function)
2011-09-05 17:33:51 +10:00
Evgeniy Khramtsov
0c1796ea40
Fix potential case-clause crash
2011-09-05 17:27:15 +10:00
Evgeniy Khramtsov
826fab9999
Remove useless case clause
2011-09-05 17:12:45 +10:00
Evgeniy Khramtsov
3b95108a3a
Replace VVALUEL macro with function in order to shut up the dialyzer
2011-09-05 17:09:36 +10:00
Evgeniy Khramtsov
ab2a298ebf
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
2011-09-05 16:53:10 +10:00
Evgeniy Khramtsov
8b5fa88b6f
Export do_client_version/3 in order to shut up the dialyzer
2011-09-05 16:52:36 +10:00
Evgeniy Khramtsov
de712e5ccb
Remove useless case clauses
2011-09-05 16:48:04 +10:00
Evgeniy Khramtsov
ffdf5cb206
Remove useless case clause
2011-09-05 16:47:18 +10:00
Evgeniy Khramtsov
f1a91108ef
Correct some function clauses and value types
2011-09-05 16:31:58 +10:00
Evgeniy Khramtsov
ffe063a0e9
Get rid of useless code
2011-09-05 15:59:30 +10:00
Evgeniy Khramtsov
d74f02e367
ejabberd_auth:remove_user/2 always returns ok
2011-09-05 15:39:55 +10:00
Evgeniy Khramtsov
0da2107974
Fix some case clauses
2011-09-05 15:35:46 +10:00
Evgeniy Khramtsov
1994c8a174
Change argument of open_port/2 to string in order to shut up the dialyzer
2011-09-05 15:28:14 +10:00
Evgeniy Khramtsov
2434be4803
Get rid of useless function clause
2011-09-05 15:13:54 +10:00
Badlop
d6fcee4faa
Replace calls of OTP's Binary, since they would require R14
2011-09-04 14:56:56 +02:00
Badlop
41d028d101
First check occupant existence, later check the message
2011-09-04 13:28:32 +02:00
Christophe Romain
75fc431fb8
enable pubsub#deliver_notification checking (thanks to Karim Gemayel)(EJAB-1453)
2011-08-31 16:11:01 +02:00
Badlop
917d1be994
Explicitly skip useless ejabberd 2.0* mnesia tables when restoring backup
...
Reference:
http://www.ejabberd.im/node/4867
2011-08-29 12:36:49 +02:00
Christophe Romain
900b013658
typo fix (thanks to Artem Sh)(EJAB-1424)
2011-08-25 17:22:48 +02:00
Badlop
84486dcb2c
Support multiple sessions per nick in muc_online_users, relevant for max_user_conferences (EJAB-305)
2011-08-23 21:53:41 +02:00
Badlop
9a190f3bc4
Send private messages to all the sessions with same nick (EJAB-305)
2011-08-23 21:53:30 +02:00
Badlop
c76bbdf16f
Don't send unavailable presence when leaving occupant has other nicks in the room (EJAB-305)
2011-08-23 21:53:19 +02:00
Badlop
24c5063b99
Allow multiple entry with same nick to MUC rooms (thanks to Magnus Henoch)(EJAB-305)
2011-08-23 21:52:20 +02:00
Badlop
a0f8a2c3a4
New option resource_conflict defines server action (thanks to Lee Boynton)(EJAB-650)
2011-08-17 19:44:39 +02:00
Badlop
3edea6c806
Fix bug in scram is_alpha
2011-08-17 19:33:58 +02:00
Badlop
abebabc487
Fix ODBC account counting (thanks to Artem Sh)(EJAB-1491)
2011-08-16 19:33:22 +02:00
Badlop
1ee6eae684
Fix and improve support for SCRAM auth method (EJAB-1196)
2011-08-16 00:26:49 +02:00
Badlop
24852b9be8
Indicate license and copyright (thanks to Stephen Röttger)(EJAB-1196)
2011-08-16 00:25:40 +02:00
Badlop
e80b92b481
Preliminary patch for SASL SCRAM-SHA-1 (thanks to Stephen Röttger)(EJAB-1196)
2011-08-16 00:25:03 +02:00
Pablo Polvorin
573a84b2ec
handle case when roster version on DB is enabled but version is not found.
...
Thanks Evgeniy.
2011-08-05 12:21:24 -03:00
Badlop
75f8e174dc
Add comment about ping requests sent even to non-supporting clients
2011-08-04 18:29:13 +02:00
Badlop
e690afc33b
Verify username provided in registration web form
2011-07-27 12:25:51 +02:00
Badlop
493b664f19
Handle case when ejabberd_auth_* says the account exists
2011-07-27 11:44:35 +02:00
Badlop
83014fb77b
Include status 110 in presence to new occupant (EJAB-740)
2011-07-16 19:35:59 +02:00
Badlop
369fefd5a8
Use #roster record instead of direct tuple
2011-07-13 17:06:17 +02:00
Evgeniy Khramtsov
7e14b2d46a
Add ldap_tls_cacertfile and ldap_tls_depth options (EJAB-1299)
2011-07-13 15:40:27 +10:00
Badlop
1e88c3f180
Room option to ignore private messages from visitors (thanks to Maxim Ignatenko)
2011-07-11 17:34:07 +02:00
Maxim Ignatenko
49ee637a5c
One more fix
2011-07-11 12:55:38 +02:00
Maxim Ignatenko
71f085fec0
Improve spelling and fix some typos
2011-07-11 12:55:35 +02:00
Alexey Shchepin
2787df035c
Merge branch '2.1.x' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline.git into 2.1.x
2011-07-03 18:58:45 +03:00
Alexey Shchepin
32da749041
Minor mod_version bugfix
2011-07-03 18:58:07 +03:00
Juan Pablo Carlino
0cbd702419
is_user_in_group/3 must check if user belongs to given Group from Host specified on third argument.
...
* is_user_in_group/3 was checking if given user (passed on first parameter as
a bare jid) belonged to group of the server derived from this jid.
2011-07-01 12:51:52 -03:00
Alexey Shchepin
15f664af26
Optimized mod_roster_odbc:get_roster
2011-06-29 11:56:23 +03:00
Badlop
d673ff5fad
Support servers that reply error on any command before registration (thanks to Gelraen)
...
This makes mod_irc actually work with servers that reply with error
on any command before the registration procedure is completed.
Such servers, after NICK/USER they send PING and wait for client response.
In such situation they reply with message 451 to CODEPAGE command,
and mod_irc thinks that connection failed.
Example IRC server that works thanks to the patch: irc.mibbit.com
2011-06-28 23:04:12 +02:00
Badlop
f112df2cfc
Comment in the cfg file the correct node name used in ejabberdctl.template
2011-06-28 00:31:13 +02:00
Evgeniy Khramtsov
35644cf73c
Match ldap_uidattr_format case-insensitively (EJAB-1449)
2011-06-23 15:14:15 +10:00
Evgeniy Khramtsov
6cc6c04c4a
Log an error when an LDAP filter is incorrect (EJAB-1395)
2011-06-15 20:06:32 +10:00
Evgeniy Khramtsov
f4d0b201ad
Escape iolist correctly when NIFs are disabled (EJAB-1462)
2011-06-11 23:28:10 +10:00
Badlop
aff99097e7
Fix compilation in Windows (thanks to flyingwow99)
...
See http://www.ejabberd.im/node/4549
2011-06-07 13:27:00 +02:00
Badlop
33544569fb
Fix crash when user publishes an item (EJAB-1457)
2011-06-01 23:22:25 +02:00
Badlop
9f6afab09c
Update ejabberd version number to 2.1.7
2011-05-31 22:31:22 +02:00
Badlop
2137c03da1
Recompile translations
2011-05-31 22:31:20 +02:00
Badlop
bd1df027c6
Disable all entity expansions (thanks to Alexey Shchepin)(EJAB-1451)
2011-05-31 21:12:29 +02:00
Badlop
20290cab01
Update the 'configure' script with: aclocal; autoconf
2011-05-31 21:03:45 +02:00
Christophe Romain
adcf2d5c4e
Pubsub node maxitem forced to 0 if non persistent node (thanks to Karim Gemayel)(EJAB-1434)
2011-05-31 15:51:30 +02:00
Christophe Romain
8faafc5b0d
apply filtered notification to PEP last items (thanks to karim Gemayel)(EJAB-1456)
2011-05-31 15:40:07 +02:00
Badlop
32d3d1626b
New ERL_EPMD_ADDRESS that works since Erlang/OTP R14B03
2011-05-31 12:26:44 +02:00
Badlop
d4d28e038b
Cut the string when calling halt/1
2011-05-30 17:11:32 +02:00
Evgeniy Khramtsov
d6a076dae8
Under some circumstances the "uri" variable in StartNamespaceDeclHandler could be NULL. We check this now.
2011-05-30 22:39:56 +10:00
Badlop
2cacf21d51
Fix a recent commit about "Set script as executable"
2011-05-30 11:46:13 +02:00
Badlop
0874b93e7c
Support anonymous accounts in Shared Roster @all@ directive (EJAB-1264)
...
With this change, logged anonymous accounts are considered to be registered.
2011-05-30 11:00:21 +02:00
Badlop
ba9094a089
Add link in the Backup page to the Guide
2011-05-29 20:51:33 +02:00
Badlop
bfebcebeb7
Support XEP-0191 Simple Communications Blocking (thanks to Stephan Maka)(EJAB-695)
2011-05-27 11:47:22 +02:00
Badlop
1c0b99e162
A user can query his own Last activity, even if not subscribed to oneself
2011-05-26 12:50:40 +02:00
Badlop
f850bcbbc9
Several fixes and improvements in ejabberd.init.template
...
Changes:
* Set script as executable
* Add LSB tags and overrides, copied from Debian's ejabberd package
* Add chkconfig support (thanks to Ivan Martinez)(EJAB-1450)
* Don't use nounset, as that breaks when no argument is provided
* Add status command
2011-05-24 23:46:44 +02:00
Evgeniy Khramtsov
7bc879c6f4
When checking captcha setup, try to generate image only when captcha is enabled in order to avoid logging of confusing error
2011-05-18 12:48:02 +10:00
Badlop
f7d532f2f7
When module start fails during server start, stop erlang (EJAB-1446)
2011-05-16 22:33:59 +02:00
Christophe Romain
17abbf3d82
Owner can delete any items from its own node (EJAB-1445)
2011-05-06 13:58:49 +02:00
Evgeniy Khramtsov
dfbfd90f8c
Take into consideration internal queue length when sorting processes queues
2011-05-05 16:08:28 +10:00
Evgeniy Khramtsov
84c1cf8033
Do not accept XML with undefined prefixes (EJAB-680)
2011-05-03 20:26:07 +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
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
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
90ea752046
Updated Japanese translation (thanks to Mako N)
2011-03-30 19:18:26 +02:00
Badlop
e4b3bd5005
Fix typo (thanks to Krzee)
2011-03-17 12:15:31 +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
Badlop
db0962804d
Tweak pg2_backport.erl to work with Erlang older than R13A (EJAB-1349)
2011-02-22 23:44:45 +01:00
Badlop
677d8b1a29
Add support for '@online@' Shared Roster Group (thanks to Martin Langhoff)(EJAB-1391)
...
New version of the @online@ patch originally by Collabora.
Notes:
- the presence push is mediated via the group rather than
per user - this may reduce memory footprint... _if_ ejabberd
has some smart optimisation in that codepath
- it assumes that any group with membership @online@ _displays_
online as well -- this is a simplification and breaks the
decoupling that ejabberd has in this regard.
2011-02-21 22:34:15 +01:00
Badlop
850218c2df
Forward old messages to newly spawned extauth process (thanks to Mika Seppänen)(EJAB-1385)
2011-02-21 16:13:41 +01:00
Badlop
1c89914382
New route_iq/5 accepting Timeout (thanks to Edwin Fine)(EJAB-1398)
...
Also new register_iq_response_handler/5
2011-02-21 13:44:39 +01:00
Badlop
fe40a9c5f6
New DIST_USE_INTERFACE to restrict IP where erlang connections are listened (EJAB-1404)
2011-02-16 23:53:29 +01:00
Badlop
bc0ae5a017
New Indonesian translation (thanks to Irfan Mahfudz Guntur)(EJAB-1407)
2011-02-16 13:46:20 +01:00
Christophe Romain
91ab7e029b
fix empty pubsub payload check on odbc version
2011-02-14 16:45:49 +01:00
Christophe Romain
c3a88c713b
fix empty pubsub payload check
2011-02-14 16:41:32 +01:00
Christophe Romain
fd52f2cb7d
update copyright up to 2011
2011-02-14 13:50:55 +01:00
Badlop
f91eb52890
Provide HTTPS URL in CAPTCHA form when listener has 'tls' option (EJAB-1406)
2011-02-14 13:11:21 +01:00
Badlop
ca59a7f027
Fix typo in French translation
2011-02-11 20:19:59 +01:00
Badlop
6dea2d2307
Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)
2011-02-09 16:38:54 +01:00
Badlop
650b2802b5
Remove erroneous comment (EJAB-645)
2011-02-03 17:23:09 +01:00
Badlop
6ddc66db9f
Handle Tigase's unexpected version=1.0 when ejabberd doesn't announce it (EJAB-1379)
2011-01-31 19:43:28 +01:00
Badlop
792512459d
mod_pres_counter prevents subscription flood (thanks to Ahmed Omar and Alexey Shchepin)(EJAB-1388)
2011-01-31 18:52:07 +01:00
Badlop
0359e345b0
Add to example config file access_from comment
2011-01-28 17:13:44 +01:00
Badlop
36166aa40e
Comment unused code
2011-01-28 12:11:34 +01:00
Badlop
a25c9c5df3
Don't let presence-in privacy rule block a presence subscription using ODBC (EJAB-255)
2011-01-19 20:58:57 +01:00
Badlop
6e3a9ac4fd
Fix delayed response of a timeout call was reused for next login (EJAB-1385)
2011-01-19 19:06:46 +01:00
Badlop
0edda6150b
Clarify error message when BOSH query is sent to non-running module
2011-01-12 21:22:43 +01:00
Mickaël Rémond
bd43505db9
Use route instead of send_element to go through standard workflow Offline messages should thus be tracked for ack if needed (TEXTO-226).
...
Signed-off-by: Evgeniy Khramtsov <ekhramtsov@process-one.net>
2011-01-04 15:21:10 +01:00
Badlop
a2e1d2030a
Keep the order of stanzas when BOSH sends several (EJAB-1374)
2010-12-30 13:42:53 +01:00
Evgeniy Khramtsov
4c8b034874
Change c2s state before offline messages resending
2010-12-28 21:09:15 +09:00
Alexey Shchepin
b47c50145d
Make jlib:ip_to_list safe to use
2010-12-20 19:29:05 +02:00
Badlop
b9f4daca46
Revert branch name back to 2.1.x
2010-12-20 13:10:33 +01:00
Evgeniy Khramtsov
606c207e21
Make sure 'closed' event is correctly processed on every state
2010-12-17 17:26:20 +09:00
Badlop
3e9c9fc750
Remove Type and Spec, backport list comprehensions, so R12B-5 can compile
2010-12-13 12:17:28 +01:00
Badlop
6242fd2bb8
Update ejabberd version number to 2.1.6
2010-12-13 11:15:18 +01:00
Badlop
1c566057f8
Recompile translations
2010-12-13 11:15:16 +01:00
Badlop
6dd35923b0
Fix warning about unused variables
2010-12-13 11:14:39 +01:00
Badlop
b9bbe19d4c
Option to reject S2S connection if untrusted certificate (EJAB-464)
2010-12-11 02:29:53 +01:00
Badlop
44b2002504
Include From attribute in the stream header of outgoing S2S connections
2010-12-11 02:29:52 +01:00
Badlop
faf422202f
When TLS is required in s2s, add subelement to stream:features starttls
2010-12-11 02:29:50 +01:00
Badlop
eb884c80d0
Add option to require encryption in S2S connections (EJAB-495)
2010-12-11 02:29:48 +01:00
Badlop
b83dd9f954
Support for X-Forwarded-For HTTP header (EJAB-1356)
2010-12-07 16:47:55 +01:00
Christophe Romain
fd828c3e9b
update pubsub_odbc patch
2010-12-07 14:00:40 +01:00
Christophe Romain
79648ce853
add node attribute to pubsub subscribe event (EJAB-1361)
2010-12-07 13:51:10 +01:00
Badlop
ddc94a8c96
Update Czech Translation (thanks to Lukáš Polívka)
2010-12-06 12:04:12 +01:00
Badlop
aa413d63da
Fix detection of mod_last at server start (EJAB-641)
2010-12-03 17:26:12 +01:00
Pablo Polvorin
0e5b0b43fa
Revert "Fix cyrsasl_digest RFC-2831 2.1.2.1 (EJAB-476)"
...
This reverts commit c890b17834
.
This change made ejabberd more strict in protocol compliance, which breaks Psi 0.14 and other clients.
We must grant a grace period to client developers to fix their clients. So this isn't going to be included
in 2.1.x.
2010-12-03 11:12:43 -03:00
Badlop
8258f5940b
Support PostgreSQL 9.0 (EJAB-1359)(thanks to Stephen Gibberd and Konstantin Nikiforov)
2010-12-03 12:43:05 +01:00
Pablo Polvorin
c890b17834
Fix cyrsasl_digest RFC-2831 2.1.2.1 (EJAB-476)
...
Fix sasl digest bug when username|password|resource strings had
all characters <= U+00FF and at least one character >= U+0080.
Warnning:
Note that by fixing the bug, we may be broking compatibility with clients
that "implements" it.
See comments on https://support.process-one.net/browse/EJAB-476
2010-12-02 12:55:06 -03:00
Christophe Romain
f0a848ef45
fix pubsub cross domain eventing (EJAB-1340)
2010-12-02 13:56:45 +01:00
Badlop
20d66e6736
Update Greek translation (thanks to James Iakovos Mandelis)
2010-12-01 13:28:20 +01:00
Evgeniy Khramtsov
731c9b86e0
Increase maximum restart strategy of the ODBC supervisor. Do not brutally kill ODBC processes on supervisor shutdown to avoid polution of the mnesia table
2010-12-01 14:24:51 +09:00
Badlop
955343f6aa
When the Password attribute is missing in PIEFXIS file, don't check account auth.
2010-12-01 00:55:09 +01:00
Otavio Fernandes
1b73ac5118
Corrections on pt_BR translations.
2010-11-30 22:43:04 +01:00
Badlop
9ee8191939
Update Ukrainian translation (thanks to Ruslan Rakhmanin)
2010-11-30 22:43:02 +01:00
Christopher tofu Zorn
f2231a2282
expose find_connection for routing in other modules (if needed)
2010-11-29 20:05:39 +01:00
Christopher tofu Zorn
3e24408710
add the ability to send raw xml packets over http bind
2010-11-29 20:05:37 +01:00
Badlop
3e67200d64
Update mod_register_web string in PO files
2010-11-29 19:35:18 +01:00
Badlop
6374b5b1e7
Fix characters not allowed in username. Don't include that in translatable string.
...
List mentioned in:
http://xmpp.org/rfcs/rfc3920.html#nodeprep-prohibited
2010-11-29 19:34:26 +01:00
Badlop
26ac75bdc9
Support negative part-hour TZ values (thanks to Alexander Zhukov)(EJAB-1301)
2010-11-29 14:36:09 +01:00
Alexey Shchepin
1d1496a667
Don't loop when there is nothing after a stream start
2010-11-26 17:08:00 +01:00
Andreas Köhler
e34eebb5ad
Correct domain_certfile tlsopts modifications for s2s connections (EJAB-1086)
...
* In ejabberd_s2s_out:wait_for_feature_request/2, the domain to use for
looking up domain_certfile options is #state.myname and not
#state.server
* If s2s_certfile is not specified, connect should still be part of the
tls options used by ejabberd_s2s_out
* Add #state.server to ejabberd_s2s_in processes and store the to
attribute in :wait_for_stream/2. Then use that server in
:wait_for_feature_request/2 to change the tls options like in
ejabberd_s2s_out.
Fixes EJAB-1086.
2010-11-26 00:14:46 +01:00
Badlop
776930fa06
Update French translation (thanks to Nicolas Vérité)
2010-11-25 21:31:21 +01:00
Badlop
38af7c85a6
Update German translation (thanks to Nikolaus Polak)
2010-11-25 21:31:19 +01:00
Badlop
99b7a285d7
Update Japanese translation (thanks to Tsukasa Hamano)
2010-11-24 17:10:54 +01:00
Badlop
19e20f75d7
Update Chinese translation (thanks to Shelley Shyan)
2010-11-24 13:42:19 +01:00
Evgeniy Khramtsov
b8d6aee1ce
Merge branch 'caps' into 2.1.x
...
Conflicts:
src/ejabberd_c2s.erl
2010-11-24 16:45:05 +09:00
Otavio Fernandes
48b768b5b0
Updating Brazilian Portuguese (pt_BR) translations for v2.1.6
2010-11-23 17:54:37 +01:00
Badlop
bd604945c9
Update Polish translation (thanks to Zbyszek Żółkiewski)
2010-11-23 13:07:14 +01:00
Badlop
0a59ebe405
Use pg2 from R14B in systems with older versions (EJAB-1349)
...
pg2_backport.erl is a copy of pg2.erl from Erlang/OTP R14B.
That module is used in ejabberd installations where an OTP
previous to R14 is installed.
2010-11-22 16:04:07 +01:00
Christophe Romain
32eaa01929
Revert "populate pubsub#roster_groups_allowed in node configuration options (EJAB-1344)"
...
This reverts commit dfaeb3bc88
.
2010-11-22 11:15:04 +01:00
Badlop
12aaa0125b
Update Russian translation (thanks to Evgeniy Khramtsov)
2010-11-19 15:15:47 +01:00
Badlop
cb7cd9abb8
Update translate files
2010-11-19 13:47:24 +01:00
Badlop
ca701e1675
Update the Spanish translation
2010-11-19 13:45:32 +01:00
Badlop
9b88fd6646
Fix some English strings
2010-11-19 13:44:30 +01:00
Badlop
76ca7ae7f0
Translate mod_register_web to Ukrainian (thanks to Rain)
2010-11-19 00:23:40 +01:00
Badlop
043effc3ce
Translate mod_register_web to Spanish
2010-11-17 23:16:46 +01:00
Badlop
4fd1a8ba63
Translate mod_register_web to Russian (thanks to Rain)
2010-11-17 22:42:43 +01:00
Badlop
36303fb4be
Update strings to translate
2010-11-17 22:36:56 +01:00
Badlop
808029b868
Fix http-bind supervisor to support multiple vhosts (EJAB-1321)
2010-11-17 20:31:28 +01:00
Andreas Köhler
cfd377b98e
Fix R12B5 compatibility in ejabberd_http_bind.erl (EJAB-1343)
...
erlang:max/2 and :min/2 are new functions
2010-11-17 13:01:17 +01:00
Andreas Köhler
6eeb355a22
Use LFrom and LTo consistently in ejabberd_s2s_in:stream_established/2 (EJAB-1342)
2010-11-17 12:57:05 +01:00
Evgeniy Khramtsov
a0e2e943b4
Do not start mod_proxy65 if it is unable to bind an address (EJAB-1336)
2010-11-17 18:13:19 +09:00
Evgeniy Khramtsov
78931d8efa
Use MEDIUMTEXT type for vcard avatars in MySQL schema (EJAB-1252)
2010-11-17 17:36:51 +09:00
Evgeniy Khramtsov
0d2a8cd04f
Do not print full error message when LDAP timeout occurs (EJAB-1324)
2010-11-17 17:14:47 +09:00
Evgeniy Khramtsov
97087eb3b9
Set SSL_MODE_RELEASE_BUFFERS mode when available (EJAB-1351)
2010-11-17 13:54:27 +09:00
Badlop
6eeef62ce4
Provide new, not old, affiliation in kick/ban presence with codes 321 and 301
2010-11-16 00:03:09 +01:00
Evgeniy Khramtsov
0ccff15599
Strip status when needed in presence-unavailable as well
2010-11-15 13:47:31 +09:00
Badlop
325fb8caef
Fix typos in the example configuration file
2010-11-12 21:24:01 +01:00
Andreas Köhler
18ef908759
Before binding tcp ports, checks the socket type and listener options
...
If the callback module has a socket type of independent and needs to
create the listener itself, do not pre-bind the port. The same holds if
there are errors in the listener configuration.
2010-11-10 23:46:18 +01:00
Andreas Köhler
1f1d2bd5f5
Bind listener ports early and start accepting connections later
...
It may happen that auth or rdbms client tcp connections bind a local
socket to a port number required by a configered listener. The ejabberd
applications fails to start up and needs to be restarted.
In plain C you would bind(2) the listener port and listen(2) later on.
gen_tcp:listen/2 does not allow to separate these two steps though, so
another way is not to accept connections while start up. OTOH, the
kernel will syn/ack incoming connections and receive data, leaving them
in a buffer for the ejabberd to read from. If this is unwanted, a load
balancer would need to receive data from the ejabberd server before
adding the node to its pool.
This patch binds tcp ports while initializing the ejabberd_listener
process, storing ListenSockets in an ets table. start_listeners/0 will
reuse these ports later on.
2010-11-10 23:46:16 +01:00
Andreas Köhler
0c484369c9
In mod_last*:get_last_iq/4, check for user resources first to return 0 seconds if there is one
...
Fixes problem 2 of EJAB-1158.
2010-11-10 15:40:04 +01:00
Andreas Köhler
100f2e9a13
Refactor mod_last to use the same core get_last/2 functionality, but keep api stable
...
The local function get_last/4 has been renamed to get_last_iq/4, since
it converts the result of get_last/2 (typically {ok, TimeStamp, Status})
to an iq packet.
2010-11-10 15:40:03 +01:00
Andreas Köhler
510fd8cf73
Before forwarding last activity requests to a user, check that the user's presence is visible for From
...
According to XEP-0012, 4. Online User Query, "if the requesting entity
is not authorized to view the user's presence information (normally via
a presence subscription as defined in XMPP IM), the user's server MUST
NOT deliver the IQ-get to an available resource but instead MUST return
a <forbidden/> error in response to the last activity request."
So check for a subscription of from of the jid and bare jid and whether
outgoing presences to From are allowed.
Fixes problem 3 of EJAB-1158.
2010-11-10 15:40:01 +01:00
Andreas Köhler
080922a3de
Remove dead code for NS_VCARD iq packets from ejabberd_c2s
...
For EJAB-1045, the special NS_VCARD block for handling incoming vcard
iqs on behalf of clients has already been restricted to cases where the
user or resource part of the recipient is empty. But then the packets
should not have been routed to the c2s process anyway. This patch
completely removes it.
2010-11-10 15:40:00 +01:00
Andreas Köhler
cb7d8c8ead
Use ejabberd_c2s:privacy_check_packet/5 for all those hook folded runs in the c2s module
2010-11-10 15:39:59 +01:00
Andreas Köhler
c47252aea1
Use c2s state data as user and server in ejabberd_c2s:is_privacy_allow
...
is_privacy_allow is only used in ejabberd_c2s:handle_info/3 to determine
for a few presence types whether the packet is allowed to be forwarded
to the user's client. This only makes sense if To#jid.user and
To#jid.server match StateData#state.user and StateData#state.server.
Also, add the atom in as parameter to a new argument Dir of
is_privacy_allow and extract from that function
privacy_check_packet(StateData, From, To, Packet, Dir) which runs the
privavcy check without converting allow/deny to true/false.
2010-11-10 15:39:57 +01:00
Andreas Köhler
f96074057c
Correct error responses of forbidden offline last activity queries
...
According to XEP-0012 Last Activity, the server must return iq errors
with forbidden instead of not-allowed.
Fixes problem 1 of EJAB-1158.
2010-11-10 15:39:55 +01:00
Christophe Romain
dfaeb3bc88
populate pubsub#roster_groups_allowed in node configuration options (thanks to Karim Gemayel)(EJAB-1344)
2010-11-10 15:15:03 +01:00
Christophe Romain
c31f59e326
fix bad plugin order issue injected in previous patch (EJAB-1286)
2010-11-09 14:32:40 +01:00
Andreas Köhler
7c2b9eaf97
Correct privacy check direction in mod_last (EJAB-1339)
...
The change for EJAB-1271 to change the direction of the privacy check
from out to in violates the idea that the check should imitate a
subscription state check of from. Rather correct the order of the From
and To parameters.
2010-11-09 13:57:57 +01:00
Andreas Köhler
79f5251d69
Change max restart strategy of ejabberd_odbc_sup to handle some SQL timeouts.
2010-11-08 18:41:03 +01:00
Christophe Romain
917e8640c2
avoid node_call to break transaction (thanks to Karim Gemayel)(EJAB-1286)
2010-11-08 11:16:51 +01:00
Andreas Köhler
c4bc0e7252
Re-raise exceptions caught in gen_mod:start_module/3 (EJAB-1335)
...
Modules configured by the administrator normally should not be treated
as optional, so a exception (error, exit, throw) to start them should not
be caught and logged only.
This patch re-raises a caught exception instead of ignoring the
exception and inserting the module's opts on success. That way
gen_mod:get_module_opt/4 should work while calling Module:start/2.
2010-11-07 00:49:52 +01:00
Evgeniy Khramtsov
1f16e4783c
Take care of xml:lang attribute in unauthenticated stanzas as well
2010-11-06 13:58:52 +09:00
Badlop
7f3a5066c6
New ip_access option restricts which IPs can register (thanks to Alexey Shchepin)(EJAB-915)
2010-11-05 19:33:52 +01:00
Badlop
6f3713a67d
Disable mod_register_web in default config because by default captcha is disabled
2010-11-05 19:33:50 +01:00
Badlop
f672fd0824
Added mod_register_web: web page for account registration (EJAB-471)
2010-11-05 18:19:52 +01:00
Evgeniy Khramtsov
60b36beda8
Disable LRU caching algorithm for LDAP shared rosters
2010-11-05 17:01:18 +09:00
Evgeniy Khramtsov
c4289095e0
Do not store long language tag to avoid possible DoS/flood attacks
2010-11-05 05:10:18 +09:00
Evgeniy Khramtsov
31757116fc
LDAP shared roster support (thanks to Realloc and Marcin Owsiany)
2010-11-05 02:34:45 +09:00
Jonas Ådahl
2f68733708
Fixes a leak of ejabberd_receiver processes.
...
When a (non-frontend) socket module without any custom receiver fails to
start, the newly created ejabberd_receiver process needs to be properly
closed.
2010-11-03 17:10:52 +01:00
Badlop
184ec38510
Implement the mod_irc option default_encoding, it was already documented
...
Related:
http://www.ejabberd.im/node/4270#comment-56609
http://www.ejabberd.im/node/4270#comment-56780
2010-11-02 22:40:08 +01:00
Badlop
2d59efb515
Fix crash in ejabberd_c2s when blacklist hook returned true (thanks to Jonas Ådahl)
...
Cause of the crash jlib:ip_to_list/1 only supports IP tuples using the
form {N1,N2,N3,N4} which is not the case when IPv6 is enabled.
2010-11-02 13:51:36 +01:00
Evgeniy Khramtsov
195d22d906
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
2010-11-01 22:23:01 +09:00
Evgeniy Khramtsov
ab80513755
Do not run set_last request inside a transaction
2010-11-01 22:22:41 +09:00
Badlop
8a116411bb
Fix errors in EDoc comments
2010-10-28 18:48:27 +02:00
Badlop
bd3889b6ec
Include a Required xml element in the captcha field
2010-10-27 00:50:17 +02:00
Andreas Köhler
400fb69f15
Ignore Length argument to tls:recv/[23] (EJAB-1327)
...
The Length argument cannot be used for gen_tcp:recv/3, because the
compressed size does not equal the desired uncompressed one.
2010-10-26 19:32:15 +02:00
Andreas Köhler
9da45d40c7
Re-use the TLSSock argument in tls:send/2 (EJAB-1327)
2010-10-26 19:30:32 +02:00
Evgeniy Khramtsov
23db206ea1
* Add top-level instructions for x:data incompatible clients
...
* Remove trailing dot
2010-10-26 03:47:14 +10:00
Badlop
964b7b6b67
Changes in registration form to workaround client problems (EJAB-1262)
...
Changes included:
* Remove var in fixed field because Gajim and Tkabber display it to user
* Add workaround for Psi's overlap fields
* Add var=url attribute, required by Psi to display the field
* Provide the image URL as a copy-able form field
2010-10-25 19:00:52 +02:00
Badlop
9c5f34794a
Workaround for Psi's wrong Type in form submission
2010-10-25 18:58:31 +02:00
Badlop
a15d583d4d
Add CAPTCHA example configurations to cfg (EJAB-1262)(EJAB-1326)
2010-10-25 18:57:39 +02:00
Evgeniy Khramtsov
e03c453c78
Provide image url in registration form when captcha is enabled
2010-10-25 23:36:31 +10:00
Evgeniy Khramtsov
641dc7d695
Add password entropy check (EJAB-1326)
2010-10-24 17:17:30 +10:00
Evgeniy Khramtsov
0a1b0498a6
* Rename option captcha to captcha_protected for consistency.
...
* Document captcha_protected option
2010-10-24 15:45:42 +10:00
Evgeniy Khramtsov
a6858a6ce4
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
2010-10-24 15:30:37 +10:00
Evgeniy Khramtsov
f4beeb1706
CAPTCHA IBR support (EJAB-1262)
2010-10-24 15:30:16 +10:00
Christophe Romain
011464e6ac
improve documentation (thanks to Karim Gemayel)
2010-10-21 11:14:24 +02:00
Peter Lemenkov
c53e8012b2
Change directory before any operation to one readable by INSTALLUSER (EJAB-1322)
...
This is required in order to suppress error messages like
"File operation error: eacces" when ejabberd was started from directory,
which is not readable by INSTALLUSER (/root, for example). See rhbz #564686 :
https://bugzilla.redhat.com/564686
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-10-19 01:05:31 +02:00
Badlop
fe04d57284
Fix bug in mod_pubsub in_subscription return value
2010-10-19 00:26:36 +02:00
Christophe Romain
0f3bd782c4
documentation update (thanks to Karim Gemayel)
2010-10-18 16:53:21 +02:00
Badlop
91cf9194d8
When privacy list denies local user's outgoing stanza, try to return error (EJAB-1320)
...
See:
http://xmpp.org/extensions/xep-0016.html#example-51
Example 51. Error: contact is blocked
2010-10-16 22:53:12 +02:00
Badlop
e2dbad6242
Check privacy of outgoing IQ stanzas (EJAB-1320)
2010-10-16 22:53:10 +02:00
Badlop
84d4a1619b
Check privacy of incoming IQ stanzas (EJAB-1320)
2010-10-16 22:53:08 +02:00
Badlop
16fae4d117
Add support to ejabberd_ctl to handle anonymous command arguments
2010-10-15 21:53:03 +02:00
Badlop
76f7548935
Rename aclocal.m4 to acinclude.m4 (thanks to Andreas Köhler)
...
Also fixed minor typos, added the compiled aclocal.m4 to gitignore.
As the 2.1.x branch includes the 'configure' script, it isn't needed
to document here how to build it, only in the master branch.
Related documentation:
http://www.gnu.org/software/hello/manual/automake/Local-Macros.html#Local-Macros
http://www.gnu.org/software/hello/manual/automake/Invoking-aclocal.html#Invoking-aclocal
2010-10-15 16:29:47 +02:00
Badlop
2d08dcf11a
Fix errors detected by Dialyzer
2010-10-15 13:17:32 +02:00
Badlop
7af47b9dbe
Document ejabberd_loglevel using EDoc (EJAB-225)
2010-10-15 13:17:19 +02:00
Andreas Köhler
437da38342
Fix unused variable warning in ejabberd_loglevel
2010-10-15 13:15:52 +02:00
Andreas Köhler
801ee586b7
Add set_custom/2, clear_custom/0 and clear_custom/1 to ejabberd_loglevel
2010-10-15 13:15:50 +02:00
Andreas Köhler
cfca2b502a
Add support for changing the loglevels for given modules (EJAB-225)
...
ejabberd_loglevel:set/1 now understands more input formats:
set(Param) -> {module, ejabberd_logger}
Param = Level | {Level, CustomLevels}
CustomLevels = [CustomLevel]
CustomLevel = {Module, Level}
Module = atom()
Level = integer() | atom()
set(Level) is equivalent to set({Level, []}), so it clears all module
level customizations. log_src/2 adds additional function heads for those
_msg function and module combinations that need non-default behavior,
i.e. add or filter logging.
ejabberd_loglevel:get/0 only returns the default log level. To retrieve
the complete setting use ejabberd_logger:get/0 instead.
2010-10-15 13:15:48 +02:00
Andreas Köhler
e1a4ae8264
Use warning_msg event type for warning log level.
2010-10-15 13:15:46 +02:00
Andreas Köhler
19826858a4
Add warning message and report handlers to ejabberd_logger_h.erl.
2010-10-15 13:15:45 +02:00
Andreas Köhler
0c2677bc50
Improve ejabberd_logger code generation
...
Split the monolithic function ejabberd_loglevel:ejabberd_logger_src/1
into separate functions returning deep lists.
log_src/2 now returns the code for any of *_msg/4. Its parameters are
the current loglevel (integer()) and a loglevel specification
(#loglevel{}), with added information in #loglevel:
- function: The api function enabled by this level, may be no_log
- event_type: The type of the event sent to the error_logger
- msg_prefix: One character used in the message (one of "DIWEC")
If the current loglevel is too low for logging, the api function is
optimized at compile time.
2010-10-15 13:15:44 +02:00
Andreas Köhler
d1c1902687
Use records for encoding static loglevel information.
2010-10-15 13:15:42 +02:00
Badlop
a5230c46c2
Speed up ejabberd_s2s:is_service/2, allow_host/2 (thanks to Andreas Köhler)(EJAB-1319)
...
Iterating through the list of possible parent domains of a given domain
and comparing with the list of hosts or routes is almost always faster
than doing it the other way around. It naturally returns the shortest or
longest parent domain satisfying a predicate, whereas the possibly long
list compared with would need to be sorted by length first.
2010-10-14 21:15:40 +02:00
Christophe Romain
a93f4f7750
make http-bind restartable (thanks to Andreas Köhler)(EJAB-1318)
2010-10-13 10:54:12 +02:00
Evgeniy Khramtsov
ac87749d55
add find_s2s_bridge hook
2010-10-11 18:40:57 +10:00
Evgeniy Khramtsov
50b747041f
use one_queue IQ discipline by default
2010-10-05 21:28:45 +10:00
Evgeniy Khramtsov
36df8c9035
implement lifetime for broken hashes
2010-10-05 21:27:28 +10:00
Evgeniy Khramtsov
58a5ed9cdc
change caps hook name
2010-10-03 16:04:29 +10:00
Evgeniy Khramtsov
5ea909885e
call caps hook when caps is changed
2010-10-03 16:02:50 +10:00
Evgeniy Khramtsov
1f2c9b7971
fixes typo in stop_connection/1
2010-09-28 14:20:02 +10:00
Evgeniy Khramtsov
c13940e1de
new CAPS processing
2010-09-28 14:18:57 +10:00
Evgeniy Khramtsov
8e5297f4c3
fixes default value for cache_life_time
2010-09-21 04:31:18 +10:00
Andreas Köhler
3278f019cb
Add missing needdb check in mod_privacy, to enable blocking by group and subscription again.
2010-09-17 18:48:45 +02:00
Andreas Köhler
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
Badlop
8a0ccfc401
Support timezone West of UTC (thanks to Edwin Fine)(EJAB-1301)
2010-09-13 12:06:13 +02:00
Evgeniy Khramtsov
c29b2fda99
cache lifetime should be converted in microseconds
2010-09-08 02:33:49 +10:00
Evgeniy Khramtsov
c75b7b2b12
Implemented dirty (non-atomic) functions; added copyright notice
2010-08-31 18:06:02 +10:00
Badlop
c754c91ad1
Add IPv6 support to mod_irc (thanks to Matthias Schiffer)(EJAB-1298)
2010-08-30 23:25:02 +02:00
Evgeniy Khramtsov
6952324509
implemented backend-independed key-value cacheing table; applied to mod_caps.erl first
2010-08-30 14:02:47 +10:00
Badlop
d87fff1a4c
Bugfix http-poll for correctly parsing binary (thanks to Peter Lemenkov)
2010-08-19 17:38:38 +02:00
Evgeniy Khramtsov
3024bb0cbf
fixes ampersand escaping (EJAB-1258)
2010-08-19 16:28:31 +10:00
Evgeniy Khramtsov
f8dd973373
fixes typo for table copy
2010-08-10 19:42:22 +10:00
Badlop
972440c2ca
When user joins non-anonymous room, warn also in presence stanza (EJAB-310)
2010-08-07 20:48:36 +02:00
Badlop
b14899d41a
Update the 'configure' script
2010-08-07 19:42:56 +02:00
Evgeniy Khramtsov
d2d8a09b4a
Make MD2 autodetected (EJAB-1285)
2010-08-07 22:04:57 +10:00
Evgeniy Khramtsov
1ea09b09a2
Make xml.c correctly compiles on R14A (EJAB-1288)
2010-08-07 21:06:50 +10:00
Badlop
071c0a1afe
Go back to the 2.1.x branch name
2010-08-05 20:39:55 +02:00
Badlop
4ed00c3d1f
Fix detection of Erlang R11 and older (thanks to Mathias Ertl)(EJAB-1287)
2010-08-05 20:27:12 +02:00
Evgeniy Khramtsov
c9ff370278
Loading ASN.1 driver explicitly to avoid races in LDAP (EJAB-1284)
2010-08-04 19:23:52 +10:00
Badlop
8ab8da82c4
Update ejabberd version number to 2.1.5
2010-08-02 17:38:36 +02:00
Christophe Romain
8a251ccafe
enforce disco features results (thanks to Karim)(EJAB-1033, EJAB-1228, EJAB-1238)
2010-08-02 17:07:23 +02:00
Badlop
550363cd52
Support parallel extauth script (thanks to Jesse Thompson)(EJAB-1280)
2010-07-30 20:33:03 +02:00
Badlop
367353100b
Don't say v1.2, because that number is never increased and is confusing
2010-07-28 19:59:39 +02:00
Badlop
5113d28bb4
Return Registered element when account exists (thanks to PioneerMike)
2010-07-28 19:32:42 +02:00
Badlop
c8df607173
Fix typo (thanks to Evgeniy Khramtsov)
2010-07-23 00:38:15 +02:00
Badlop
c8033833f9
When logging s2s out connection attempt or success, log if TLS is used
2010-07-23 00:25:43 +02:00
Badlop
cf4f0dbe6d
The command Update now returns meaningful message and exit-status (EJAB-1237)
2010-07-22 16:32:55 +02:00
Evgeniy Khramtsov
8c4884d665
Use driver allocators in iconv_erl.c for reflecting memory in erlang:memory(system)
2010-07-20 15:28:22 +10:00
Evgeniy Khramtsov
26f6eebaa9
Use driver allocators in ejabberd_zlib_drv.c for reflecting memory in erlang:memory(system)
2010-07-20 14:57:23 +10:00
Evgeniy Khramtsov
5030f35558
correct handling of SQL boolean types (EJAB-1275)
2010-07-14 21:23:21 +10:00
Evgeniy Khramtsov
d7930d7f82
Use driver allocators in expat for reflecting memory in erlang:memory(system)
2010-07-14 14:19:16 +10:00
Badlop
42ddc297fe
Fix my flock change from last friday
2010-07-12 18:53:16 +02:00
Badlop
e82db8cc7f
Remove ejabberd_debug because p1_prof provides similar and better features
2010-07-12 16:02:52 +02:00
Badlop
10d43c7cc6
Only compile and install p1_prof when: make debugtools=true
2010-07-12 16:02:41 +02:00
Badlop
d539fd28c1
Recompile the 'configure' script
2010-07-12 15:18:15 +02:00
Badlop
12e00c57f9
When using OTP R14, use public_key library instead of old ssl (EJAB-953)
2010-07-12 13:57:07 +02:00
Badlop
d106f741d9
Some systems delete the lock dir; in such case don't use flock at all
2010-07-09 22:39:13 +02:00
Evgeniy Khramtsov
6c96157d1b
Added functions to collect statistics about queues, memory, reductions etc. Several cleanups
2010-07-10 01:36:12 +10:00
Evgeniy Khramtsov
a42a012f94
Added new ejabberd profiler
2010-07-05 13:43:44 +10:00
Badlop
7e90d6cf92
Fix print of command result that contains ~ (thanks to Tsukasa Hamano)
2010-07-03 00:42:54 +02:00
Badlop
e19ac27803
Show some more room options in the log file
2010-07-02 15:19:54 +02:00
Evgeniy Khramtsov
4c2e7e38a1
Use ets insead of asking supervisor in ejabberd_odbc_sup:get_pids/1 (Thanks to Alexey Shchepin)
2010-07-02 20:31:42 +10:00
Badlop
fa22b23435
Recompile the Guide and Configure
2010-07-01 17:03:36 +02:00
Badlop
ae6545989e
Fix typo in --enable-transient_supervisors
2010-07-01 16:59:26 +02:00
Badlop
0ac5684bf0
Clarify that to use the optional --enable-nif, R13B04 is needed.
2010-07-01 16:51:26 +02:00
Evgeniy Khramtsov
715cc5ea3b
New configure option: --enable-nif
2010-07-01 20:54:01 +10:00
Badlop
d9e2931ed9
Fix privacy check when serving local Last (thanks to Brian Acton)(EJAB-1271)
2010-06-29 11:58:05 +02:00
Badlop
1531541331
Fix problem when FIREWALL_WINDOW options for erl kernel were used
...
http://www.ejabberd.im/node/4120
2010-06-28 13:17:55 +02:00
Badlop
b7e02cc42e
Inform client that SSL session caching is disabled (thanks to Pawel Chmielowski)
2010-06-25 18:33:49 +02:00
Badlop
3ab90c9d3a
Don't ask for client certificate when using tls (EJAB-1267)
2010-06-25 18:33:46 +02:00
Badlop
fe23dbd76e
When account is deleted, delete also member of stored shared rosters.
2010-06-24 00:02:16 +02:00
Evgeniy Khramtsov
21d2f4efab
now admins are able to see private rooms in disco (EJAB-1269)
2010-06-23 17:44:35 +10:00
Evgeniy Khramtsov
f66f049ef3
Added support for all hash functions required by XEP-0115
2010-06-22 03:10:41 +10:00
Evgeniy Khramtsov
49dd83e731
Added md2/1 support
2010-06-22 02:56:34 +10:00
Evgeniy Khramtsov
9cd2d5e0cf
New OpenSSL functions wrapper: sha224/1, sha256/1, sha384/1, sha512/1
2010-06-22 02:30:16 +10:00
Badlop
fab705dc13
Rebuilt the configure script with: autoconf
2010-06-16 16:05:45 +02:00
Peter Lemenkov
a84f8bc9ef
Pass correct version to autoreconf
...
It seems that AC_INIT macro is wrongly initialized. See this link
for explanation of a particular AC_INIT variables:
http://www.gnu.org/software/autoconf/manual/html_node/Initializing-configure.html
Briefly, AC_INIT macro should be populated with the following data:
AC_INIT (package, version, [bug-report], [tarname], [url])
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-06-16 16:05:07 +02:00
Peter Lemenkov
2477b735bf
Install COPYING file along with other docs
...
It's a generally good idea to provide file with licensing terms.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-06-16 16:05:07 +02:00
Peter Lemenkov
8db328af60
Install dev.html, and guide.pdf if it exists
...
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-06-16 16:05:07 +02:00
Badlop
a28aaa1fdd
Log error when HTTP request has ambiguous Host header (EJAB-1261)
2010-06-16 11:33:17 +02:00
Badlop
afa0f4d403
Fix for Erlang R12, that doesn't support: true andalso ok
2010-06-15 22:59:53 +02:00
Jerome Sautret
0e5b930b22
Discard queued requests that are too old (the caller has already got a timeout).
2010-06-11 16:35:45 +02:00
Badlop
a7924adee9
Fix typo in update_list command (EJAB-1237)
2010-06-07 15:58:16 +02:00
Badlop
d4ec7a2f01
New optional BOSH connection attribute process-delay (EJAB-1257)
2010-06-07 13:44:55 +02:00
Badlop
e0fab19345
Revert version number from 2.1.4 tag to 2.1.x branch
2010-06-04 11:26:42 +02:00
Evgeniy Khramtsov
4646a5dbb8
fixes wrong SQL escaping when --enable-full-xml is set
2010-06-04 13:31:34 +10:00
Badlop
1567592ac7
Update ejabberd version number to 2.1.4
2010-06-02 18:48:55 +02:00
Christophe Romain
c544384c83
sync last changes in pubsub_odbc patch
2010-06-02 16:46:02 +02:00
Christophe Romain
d56522c8a0
final fix on created node notification (EJAB-1225)
2010-06-02 14:37:18 +02:00
Badlop
b83e77ca21
Update the Norwegian translation (thanks to Stian B. Barmen)
2010-06-01 19:44:27 +02:00
Badlop
ba9247c530
Update the Slovak translation (thanks to Marek Bečka)
2010-05-31 00:27:58 +02:00
Badlop
91d22109c8
Update the Czech translation (thanks to Lukáš Polívka)
2010-05-28 18:46:08 +02:00
Badlop
cb702a770d
Update the Russian translation (thanks to Evgeniy Khramtsov)
2010-05-28 18:46:06 +02:00
Christophe Romain
db059bdfaf
fix error code when unsubscribing from a non-existent ODBC node (EJAB-1227)
2010-05-28 13:42:35 +02:00
Christophe Romain
2291a6afea
fix error code when unsubscribing from a non-existent node (thanks to Karim Gemayel)(EJAB-1227)
2010-05-28 13:37:20 +02:00
Christophe Romain
af7fe0c21e
send created node notifications (EJAB-1225)
2010-05-28 13:34:05 +02:00
Christophe Romain
7ce3291603
fix jlib calls from previous patch
2010-05-28 12:33:11 +02:00
Christophe Romain
07e870271e
make last_item_cache feature cluster aware (EJAB-1234)
2010-05-28 11:56:09 +02:00
Badlop
a5f8aeb6da
Handle error response from auth modules (thanks to Eric Liang)
2010-05-28 01:36:19 +02:00
Badlop
1777ecd15a
Makefile with optional ejabberd_debug.erl compilation (EJAB-1242)
...
Only compile and install ejabberd_debug.erl when running:
make ejabberd_debug=true
2010-05-28 00:51:25 +02:00
Christopher tofu Zorn
d4d45f3a50
remove the silly loop that isnt needed, this speeds up all requests by 100 milliseconds. Clean up prepare response function and add two new functions to handle out going payloads based of whether its a new session or not.
2010-05-27 21:21:17 +02:00
Badlop
9900be3d68
Update the Portuguese Brazil translation (thanks to Otávio Fernandes)
2010-05-26 19:53:32 +02:00
Badlop
b88372c313
Update the Ukrainian translation (thanks to Konstantin Khomoutov)
2010-05-26 19:53:29 +02:00
Badlop
e4aab7f749
Add created_at column also to PostgreSQL schema (thanks to Mathias Ertl)(EJAB-1240)
2010-05-26 16:13:45 +02:00
Badlop
42cbd0c1c4
Update the Catalan translation (thanks to Jan Kusanagi)
2010-05-25 20:11:16 +02:00
Badlop
9318678e08
Mix the commands update_all/0 and update_module/1 into update/1 (EJAB-1237)
2010-05-25 20:01:04 +02:00
Badlop
bd992bcb87
Update the Italian translation (thanks to Luca Brivio)
2010-05-25 12:18:16 +02:00
Badlop
01d2bcfd92
Update the Greek translation (thanks to James Iakovos Mandelis)
2010-05-24 20:44:23 +02:00
Badlop
0bfda4e628
New ejabberd commands to update modified modules (EJAB-1237)
2010-05-24 13:58:11 +02:00
Badlop
a2f659a2c6
Only log when script errors are found
2010-05-24 13:58:10 +02:00
Badlop
9a04a60c7d
Update the Polish translation (thanks to Zbyszek Żółkiewski)
2010-05-24 13:34:54 +02:00
Badlop
7238ab6f05
Update the Dutch translation (thanks to Andreas van Cranenburgh)
2010-05-24 11:10:41 +02:00
Badlop
dd954ef1c2
Update the Esperanto translation (thanks to Andreas van Cranenburgh)
2010-05-24 11:10:30 +02:00
Badlop
f1b8853339
Update the German translation (thanks to Nikolaus Polak)
2010-05-23 16:21:44 +02:00
Badlop
479a2adaae
Recompile Japanese translation
2010-05-23 02:30:30 +02:00
Tsukasa Hamano
dd3c939025
update ja.po
2010-05-23 02:30:21 +02:00
Badlop
767e7d65ef
Update the French translation (thanks to Nicolas Vérité)
2010-05-23 02:29:44 +02:00
Badlop
5feb20afd0
Update the Chinese translation (thanks to Shelley Shyan)
2010-05-23 02:28:57 +02:00
Badlop
9038bbd3e7
Update the Spanish translation
2010-05-23 02:28:26 +02:00
Badlop
506fbbe7f7
Update translations
2010-05-20 21:12:36 +02:00
Christopher tofu Zorn
08f1f55e0c
typo on exported function
2010-05-20 20:45:37 +02:00
Christopher tofu Zorn
5ea9a0ddb7
expose more functions so developers can implement prebinding methods
2010-05-20 20:32:07 +02:00
Christophe Romain
d4e0fab06b
fix EJAB-1233 on pubsub_odbc patch
2010-05-19 11:05:02 +02:00
Christophe Romain
217aaf78f9
prevent orphaned pubsub node (EJAB-1233)
2010-05-19 10:47:47 +02:00
Badlop
2ee788e0bf
Fix English typos
2010-05-17 11:54:22 +02:00
Christophe Romain
f0f4b2719c
sync pubsub_odbc with latest code
2010-05-12 13:54:44 +02:00
Christophe Romain
406a31c8be
Enforce pubsub#show_values subscription option (EJAB-1096)(thanks to Karim Gemayel)
2010-05-12 13:45:56 +02:00
Badlop
c32332898b
Show HTTP auth username and IP address in logs, not the password (EJAB-1231)
2010-05-12 10:27:47 +02:00
Badlop
4bbf6684b4
Don't show HTTP request in logs, because reveals password (EJAB-1231)
2010-05-10 23:23:31 +02:00
Badlop
9476d8a2c3
Optionally cache extauth users in mnesia (EJAB-641)
2010-05-10 16:42:54 +02:00
Badlop
6ac46c6171
Fix EDoc comment
2010-05-10 16:12:48 +02:00
Badlop
6ae8b9c4d6
Use a standard method to get a random seed (EJAB-1229)
2010-05-10 15:38:38 +02:00
Badlop
39119192a1
New option pam_userinfotype to provide username or JID (EJAB-652)
2010-05-10 15:14:49 +02:00
Evgeniy Khramtsov
f58d03c12e
new option ldap_tls_verify is added (EJAB-1229)
2010-05-10 19:37:37 +10:00
Evgeniy Khramtsov
58590cf08d
full support for XEP-0115 v1.5 (EJAB-1223) (EJAB-1189)
2010-05-08 02:32:57 +10:00
Christopher tofu Zorn
cce57310b0
Change max inactivity from 30 to 120 seconds
2010-05-06 20:52:40 +02:00
Christopher tofu Zorn
516d369174
Use dirty_delete when removing the session.
...
There is no need for a transaction and has less overhead
2010-05-06 20:52:36 +02:00
Christophe Romain
7fc1207661
enforce pubsub#presence_based_delivery (EJAB-1221) (thanks to Karim Gemayel)
2010-05-05 15:42:49 +02:00
Badlop
951808658d
Indicate explicitly what nodes are handled by mod_configure
2010-05-04 11:37:44 +02:00
Badlop
cd9e1621f9
Add xml default content type (thanks to Aaron Winborn)(EJAB-1214)
2010-04-28 20:06:27 +02:00
Badlop
2a99af8cce
Rename some JEP references to XEP
2010-04-28 20:06:27 +02:00
Badlop
3ba0061ada
Reduce verbosity of log when captcha_cmd is checked but not configured.
2010-04-28 20:06:27 +02:00
Badlop
705c5b4c1c
New Access rule webadmin_view for read-only (thanks to Oleg Palij)(EJAB-213)
2010-04-27 23:27:44 +02:00
Badlop
6ae1f62469
Don't store blocked messages in offline queue (thanks to Brian Acton)(EJAB-1224)
2010-04-27 13:30:00 +02:00
Badlop
1c00a9713d
Automatic vcard avatar addition in presence (thanks to Igor Goryachev)(EJAB-208)
2010-04-27 12:33:56 +02:00
Badlop
5e7d8868c0
No need to handle IQ requests other than Get and Set
2010-04-22 20:19:42 +02:00
Emilio Bustos
55dbdf5dba
Fixed Bugs handling Service Discovery to contacts.
...
Resolves [#EJAB-1207]
2010-04-22 10:29:20 -03:00
Badlop
2ff291899d
Don't send error stanza as reply to error stanza (EJAB-930)
2010-04-20 20:31:42 +02:00
Evgeniy Khramtsov
c2362db03d
allow inband password change (EJAB-199)
2010-04-19 20:57:24 +10:00
Evgeniy Khramtsov
1405e9d375
LDAP extensible match support (EJAB-722)
2010-04-19 14:08:00 +10:00
Pablo Polvorin
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
Pablo Polvorin
41aa693896
Allow customizing the StateData in p1_fsm before error reporting.
...
A new callback is introduced on the p1_fsm behaviour:
print_error/1
If the module implements this function, it will be invoked
in case of process crash with the current state data *before*
printing the error in the log. The function must return the
desired State to print.
It is used in ejabberd_c2s to prune the presence sets that
can be large. Instead, the state is changed to include only
the # of elements on each set.
Change inspired in comming changes to gen_server on OTP, and
b01d15abc3 (diff-0)
2010-03-30 16:39:34 -03:00
Badlop
44b282474a
Fix indentation (EJAB-1038)
2010-03-29 20:51:24 +02:00
Badlop
70cfcb1008
Fix crash in number of occupants; other minor changes (EJAB-1038)
2010-03-29 20:51:04 +02:00
Badlop
fa28c8baf6
Refactor code to reduce calls to get_affiliation and get_role (thanks to Steam)(EJAB-1038)
2010-03-29 20:49:52 +02:00
Evgeniy Khramtsov
584fa98564
- pass jid into feature_check_packet hook;
...
- bounce messages when closing c2s session;
- implemented treap:to_list/1 and treap:from_list/1
2010-03-17 23:40:48 +09:00
Mickael Remond
214c62bf9c
Move HTTP session timeout log from warning level to info. Timeout can be generated when user close the browser for example.
2010-03-15 11:42:11 +01:00
Badlop
962b66b099
Update ejabberd version number to 2.1.3
2010-03-12 10:21:32 +01:00
Christophe Romain
b3da1c7d86
improve remove_user (EJAB-1172)
2010-03-11 16:00:42 +01:00
Evgeniy Khramtsov
839b406903
don't route PEP error messsages to a client
2010-03-09 14:03:27 +09:00
Peter Lemenkov
95e085beb7
More compliance with LSB
...
The init-script shall return 4 in case then user doesn't have sufficient privileges for action.
See http://refspecs.freestandards.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-03-08 21:16:18 +01:00
Christophe Romain
df63fcd353
typo fix on previous pubsub patch
2010-03-08 15:40:08 +01:00
Christophe Romain
77e549e504
allow sending PEP to bare jid on s2s
2010-03-08 15:16:58 +01:00
Badlop
63ccbe90d3
Implement XEP-0279: Server IP Check (thanks to Karim Gemayel)(EJAB-1205)
2010-03-08 13:58:06 +01:00
Badlop
1f02b5db0f
Fix warnings about unused variable.
2010-03-08 12:43:38 +01:00
Badlop
6bde01cd45
Replace concat_binary supported until R14 with list_to_binary supported since R9
2010-03-08 12:41:11 +01:00
Badlop
f36ac2b809
Catch errors when exporting to PIEFXIS file (EJAB-1178)
2010-03-08 11:13:56 +01:00
Evgeniy Khramtsov
606860e1cc
ldap_dn_filter option is documented; now fetching only needed attributes in LDAP search requests (EJAB-1204)
2010-03-08 16:44:14 +09:00
Evgeniy Khramtsov
22d490486a
now using "%u" pattern as default for ldap_uids (EJAB-1203)
2010-03-08 14:04:56 +09:00
Christophe Romain
d2d06403ac
fix mistake in previous broadcast_stanza change
2010-03-05 18:20:22 +01:00
Christophe Romain
6ee8ec49a5
add extended stanza addressing 'replyto' on PEP (EJAB-1198) (thanks karim)
2010-03-05 17:52:41 +01:00
Denis Kurochkin
6e878d17e6
MSSQL support was broken (EJAB-1201)
2010-03-05 14:40:33 +01:00
Christophe Romain
4984320f17
fix compilations issues
2010-03-05 11:53:26 +01:00
Christophe Romain
09250c0b65
minor intentation fix, and sync _odbc code
2010-03-05 11:35:20 +01:00
Christophe Romain
6e8f5a9cd3
add pubsub#purge_offline (EJAB-1186) (thanks karim)
2010-03-05 11:11:44 +01:00
Christophe Romain
c3edcd0575
fix pubsub#title option (EJAB-1190) (thanks karim)
2010-03-05 10:40:34 +01:00
Christophe Romain
6fb99fbb48
mod_caps optimizations (thanks evgeniy)
2010-03-05 10:34:15 +01:00
Evgeniy Khramtsov
31c3a78453
improved s2s connections clean up (EJAB-1202)
2010-03-04 12:36:57 +09:00
Pablo Polvorin
a3f2588df6
Remove print debug (thanks evgeniy)
2010-03-02 12:45:59 -03:00
Badlop
8045fec882
Fix German translation (thanks to Florian Zumbiehl)(EJAB-1195)
2010-02-24 23:06:09 +01:00
Badlop
414004eae4
Fix resending authorization problem
2010-02-24 13:14:45 +01:00
Badlop
8e8a1a3bf5
Run user_receive_packet also when sending offline messages to client (thanks to Brian Acton)(EJAB-1193)
2010-02-22 22:57:08 +01:00
Badlop
fbd8547d94
Fix typos in example config comments (thanks to Florian Zumbiehl)(EJAB-1192)
2010-02-22 13:40:42 +01:00
Badlop
6df9a6ab33
Use alternative of file:read_line/1 to not require R13B02
2010-02-20 19:31:36 +01:00
Evgeniy Khramtsov
2907446e87
fixes typo in Russian translation
2010-02-20 20:41:39 +09:00
Evgeniy Khramtsov
f60804b060
get rid of queue:filter/2 to keep compatibility with older Erlang versions
2010-02-20 20:05:48 +09:00
Evgeniy Khramtsov
e569087d83
now using mnesia:async_dirty when cleaning table from failed node
2010-02-19 16:38:18 +09:00
Badlop
4a7a33168a
Reduce verbosity of HTTP Binding log messages (thanks to Alexey Shchepin)
2010-02-19 00:01:26 +01:00
ekhramtsov
e6c23e0413
improved explanation of "max_fsm_queue" option; included this option in ejabberd.cfg.example (EJAB-1185)
2010-02-18 15:48:11 +09:00
ekhramtsov
1a96944929
new option "hostname" is added (thanks to Stefan Hepp) (EJAB-838)
2010-02-17 23:17:33 +09:00
Badlop
bc69b96e4c
Close also legacy sessions that were half connected (thanks to Evgeniy Khramtsov)(EJAB-1165)
2010-02-16 12:46:20 +01:00
Badlop
35c9c95e4b
Remove references to the old SVN repository.
2010-02-16 11:55:01 +01:00
Badlop
47ee65d101
Rewrite mnesia counter functions to use dirty_update_counter (EJAB-1177)
...
(thanks to Juan Pablo Carlino and Alexey Shchepin)
2010-02-15 23:38:17 +01:00
Badlop
8a856df2f0
New command to set master Mnesia node
2010-02-15 23:24:48 +01:00
Badlop
6795675108
Shared roster gets contact nickname from vcard, when available (EJAB-114)
2010-02-15 22:47:28 +01:00
Badlop
6867ca43e4
Cross-domain HTTP-Bind support (thanks to Jack Moffitt)(EJAB-1168)
2010-02-15 22:42:59 +01:00
Badlop
ab0905ce56
Fix cluster race condition in route read (thanks to Alexey Shchepin)
2010-02-15 18:29:17 +01:00
Badlop
a71b47ea27
Improve TTY code to work on more operating systems (thanks to Jan Koum)
2010-02-12 22:11:15 +01:00
Badlop
2cca00acc0
Added support for Jot in ctl and TTY in debug (thanks to Jan Koum)
2010-02-12 20:50:56 +01:00
Badlop
7c36e304f0
Minor fixes in the new ejabberdctl flock code
2010-02-12 20:25:31 +01:00
Martin Langhoff
10c16b1cdf
ejabberdctl: support concurrent connections with bound conn names
...
If flock is available, ejabberdctl will use it to grab one
of a bound number of connection names. This allows concurrent
connections while using a bound number of atoms.
Using PID, timestamps or random strings for transient connection IDs
(which would avoid the need for flock) uses an unbound number of atoms.
This can effectively DoS servers, as these connection names are
not garbage collected.
2010-02-12 20:23:33 +01:00
Badlop
b17c7848fd
Fix bashism in 'ejabberdctl started'
2010-02-11 11:02:57 +01:00
Badlop
071aa123e8
Allow a request_handler to serve a file in root of HTTP
2010-02-10 20:17:09 +01:00
Pablo Polvorin
bc70e90853
Add new debuging hook to the http receiving process.
...
The new hook is called http_request_debug, and receive the LocalPath and Request as parameter.
SVN Revision: 2961
2010-02-05 13:30:27 +01:00
Pablo Polvorin
787e078f6a
Hibernate http-bind process after handling a request.
...
When using BOSH, this reduces memory consuption of the http-bind process, with negligible CPU impact.
SVN Revision: 2960
2010-02-05 13:30:27 +01:00
Pablo Polvorin
17607ecaa4
Bug Fix: The value of max # of erlang process specified in ejabberdctl.cfg was not used.
...
It was called PROCESSES in the .cfg file, and ERL_PROCESSES in the script. The latter is the correct, to be coherent with ERL_MAX_PORTS and ERL_MAX_ETS_TABLES.
SVN Revision: 2959
2010-02-05 13:30:26 +01:00
Evgeniy Khramtsov
9d84caebdb
avoid resending <stream:error> stanzas on terminate (EJAB-1180)
...
SVN Revision: 2955
2010-02-03 11:25:03 +00:00
Evgeniy Khramtsov
35bcadde7a
avoid 'invalid' value in #iq{} record
...
SVN Revision: 2954
2010-02-02 13:41:34 +00:00
Evgeniy Khramtsov
d9e345a4d8
iq_query_info/1 now returns 'invalid' if XMLNS is invalid
...
SVN Revision: 2953
2010-02-02 12:20:19 +00:00
Evgeniy Khramtsov
46c667c567
changed Reason to shutdown when stopping destroyed MUC room
...
SVN Revision: 2952
2010-02-02 11:49:49 +00:00
Badlop
db3f8487fc
Fix bug handling Reason in gen_fsm:terminate
...
SVN Revision: 2950
2010-02-02 11:14:48 +00:00
Evgeniy Khramtsov
34234b4a46
Added new acl for mod_register: access_from. This acl is applied if existing account tries to register a new account (either via s2s or c2s). The default value is to deny such operations.
...
SVN Revision: 2949
2010-01-31 13:55:10 +00:00
Evgeniy Khramtsov
03454c7f1d
improved SQL reconnect behaviour
...
SVN Revision: 2947
2010-01-31 11:41:28 +00:00
Evgeniy Khramtsov
0a3cfeeed9
new ejabberd_c2s option support: max_fsm_queue
...
SVN Revision: 2939
2010-01-28 13:44:49 +00:00
Evgeniy Khramtsov
933d4a69b8
fixes regression with configure script
...
SVN Revision: 2938
2010-01-28 13:34:17 +00:00
Evgeniy Khramtsov
352afa7902
now using p1_fsm behaviour in c2s FSM (EJAB-1173)
...
SVN Revision: 2936
2010-01-28 13:00:04 +00:00
Badlop
4fe8d76b83
Fix documentation installation, no need for executable permission (thanks to Peter)(EJAB-1170)
...
SVN Revision: 2926
2010-01-25 18:40:17 +00:00
Badlop
d804698541
Fix typo in EJABBERD_BIN_PATH (thanks to Martin Langhoff)(EJAB-891)
...
SVN Revision: 2925
2010-01-25 18:37:58 +00:00
Badlop
1b1a0d7ed3
Support in ejabberdctl help command names with old - characters.
...
SVN Revision: 2924
2010-01-25 18:32:45 +00:00
Badlop
a0de5bc317
Revert version number from 2.1.2 tag to 2.1.x branch
...
SVN Revision: 2916
2010-01-18 14:37:36 +00:00
Badlop
a77b6946cf
Update version number to 2.1.2
...
SVN Revision: 2914
2010-01-18 12:11:16 +00:00
Badlop
16bd626fc9
Close sessions that were half connected (thanks to Alexey Shchepin)(EJAB-1165)
...
SVN Revision: 2911
2010-01-17 19:28:35 +00:00
Badlop
86794b1d23
Fix OTP version detection to work with old supported R10 and R11
...
SVN Revision: 2906
2010-01-16 12:24:11 +00:00
Badlop
3e4858f348
Improve functions calls when closing client connection.
...
SVN Revision: 2904
2010-01-15 12:01:12 +00:00
Christophe Romain
7aff5defac
improve delete_subscriptions code
...
SVN Revision: 2902
2010-01-14 12:51:22 +00:00
Christophe Romain
6ad93eb609
add send_loop robustness
...
SVN Revision: 2899
2010-01-13 10:22:55 +00:00
Badlop
9f5246cacc
If big offline message queue, show only subset on WebAdmin (EJAB-1095)
...
SVN Revision: 2896
2010-01-12 23:58:22 +00:00
Badlop
4d85297c85
Check for Effective GID EGID in ejabberdctl (thanks to Rustam Aliyev)(EJAB-1160)
...
SVN Revision: 2893
2010-01-12 17:50:21 +00:00
Badlop
7b76fdcde7
Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159)
...
SVN Revision: 2891
2010-01-12 16:11:32 +00:00
Christophe Romain
0cc58d7a71
remove useless comment
...
SVN Revision: 2888
2010-01-12 15:25:59 +00:00
Christophe Romain
e5373de2b9
avoid calling gen_server on internal events (EJAB-1156)
...
SVN Revision: 2886
2010-01-12 15:14:47 +00:00
Christophe Romain
6ddff15b39
allow unsubscribe with 'all' SubId, as mod_pubsub already does
...
SVN Revision: 2884
2010-01-12 14:39:52 +00:00
Christophe Romain
392ea78acf
fix NodeName issue from r2880 (thanks to Karim Gemayel)
...
SVN Revision: 2882
2010-01-12 13:27:04 +00:00
Christophe Romain
024b688c1d
fix r2876 compilation warning
...
SVN Revision: 2880
2010-01-12 12:31:08 +00:00
Christophe Romain
276f890c50
apply r2876 on pubsub_odbc
...
SVN Revision: 2879
2010-01-12 12:12:28 +00:00
Badlop
ee77257d41
Support in user list page of WebAdmin when mod_offline is disabled (EJAB-377)
...
SVN Revision: 2877
2010-01-12 12:02:50 +00:00
Christophe Romain
e7a8bf6154
fix headers (EJAB-1091), (EJAB-1092), (EJAB-1093) (thanks to Karim Gemayel)
...
SVN Revision: 2876
2010-01-12 10:33:39 +00:00
Badlop
4f643ce9b8
Show and throw error when captcha_cmd is required but not configured.
...
SVN Revision: 2874
2010-01-11 22:21:23 +00:00
Badlop
8447dfa4b1
Minor case code simplification.
...
SVN Revision: 2873
2010-01-09 18:39:17 +00:00
Mickaël Rémond
7b05ba0e1e
Match Erlang typing documentation, to remove dialyzer warning. Code was working fine however.
...
SVN Revision: 2870
2010-01-09 16:31:45 +00:00
Mickaël Rémond
c8fd680d92
Attempt to fix dialyzer warning: adhoc.erl:51: Guard test XData::'false' | #xmlel{ns::'jabber ❌ data',declared_ns::[{_,_}],attrs::[{_,_,_,_}],children::'undefined' | [{_,_} | {_,_,_,_,_,_}]} =:= 'true' can never succeed
...
SVN Revision: 2869
2010-01-09 16:18:59 +00:00
Mickaël Rémond
24aefc429c
Small refactoring
...
SVN Revision: 2867
2010-01-09 15:15:46 +00:00
Badlop
0bf9832187
An AccessCommand with Access 'all', don't require auth to execute it.
...
SVN Revision: 2865
2010-01-09 00:39:33 +00:00
Badlop
761ed1b192
Fix so script runs correctly when invoked by root (EJAB-1152)
...
SVN Revision: 2862
2010-01-05 19:43:03 +00:00
Badlop
05ee83bddc
Improve parsing of ejabberd_sm:get_user_info result.
...
SVN Revision: 2857
2010-01-04 18:59:01 +00:00
Christophe Romain
f30783a2d2
add explicit comment on last published items configuration (EJAB-1130)
...
SVN Revision: 2855
2010-01-04 11:49:00 +00:00
Badlop
ee41e1eb70
Show the last activity time in the user page.
...
SVN Revision: 2854
2010-01-03 00:40:37 +00:00
Badlop
8d218dd2b9
Command to stop ejabberd informing users, with grace period, and kindly (EJAB-1112)
...
SVN Revision: 2853
2010-01-03 00:38:00 +00:00
Badlop
7cbda8badb
When ejabberd stops, send stream close to clients (thanks to Alexey Shchepin)(EJAB-1112)
...
SVN Revision: 2852
2010-01-03 00:35:51 +00:00
Badlop
15a27c0566
Improve log message when showing lines of config file.
...
SVN Revision: 2850
2009-12-30 01:36:07 +00:00
Badlop
d9a1eecdca
Kick occupants with reason when room is stopped due to MUC shutdown (EJAB-1149)
...
SVN Revision: 2848
2009-12-30 01:25:35 +00:00
Badlop
5d749de74d
Fix warning about unused variable
...
SVN Revision: 2846
2009-12-29 23:12:52 +00:00
Badlop
dbad3df333
If problem in config file starting ejabberd: display config lines and stop node (EJAB-1148)
...
SVN Revision: 2844
2009-12-29 22:48:25 +00:00
Badlop
50137aa98d
Add +export_all to EFLAGS if: make debug=true (thanks to Marcin Owsiany)(EJAB-1134)
...
SVN Revision: 2842
2009-12-29 19:10:52 +00:00
Badlop
f0863e1dfe
Support also SASL PLAIN auth messages described in RFC4616 (EJAB-1132)
...
SVN Revision: 2839
2009-12-29 18:44:17 +00:00
Badlop
1713bf635d
Disable code of recent commit because some clients can't handle it (EJAB-1058)
...
SVN Revision: 2838
2009-12-29 18:44:02 +00:00
Badlop
9bee86178f
Write in room log when a room is created, destroyed, started, stopped (EJAB-1144)
...
SVN Revision: 2836
2009-12-29 14:43:24 +00:00
Badlop
455d85a278
Send features after negotiating binding and session (EJAB-1058)
...
SVN Revision: 2834
2009-12-28 20:09:46 +00:00
Badlop
d812975565
Provide more detailed log message when s2s stream start fails.
...
SVN Revision: 2831
2009-12-28 15:29:42 +00:00
Badlop
34d5d08501
Support for arguments in ejabberdctl that are empty strings.
...
SVN Revision: 2827
2009-12-28 11:45:46 +00:00
Badlop
c7f4f39c03
Fix error message when register is forbidden by ACL (EJAB-803)
...
SVN Revision: 2823
2009-12-23 16:08:20 +00:00
Badlop
b2d6a25240
Improved Polish translation (thanks to Janusz B. Wiśniewski and Zbigniew Żółkiewski)(EJAB-1138)
...
SVN Revision: 2822
2009-12-23 14:23:45 +00:00
Badlop
4a57f5db74
Recompile all translation files
...
SVN Revision: 2821
2009-12-23 14:23:30 +00:00
Badlop
675c24f5eb
pep_mapping not working due to Node type mismatch (EJAB-1135)
...
SVN Revision: 2815
2009-12-21 15:13:44 +00:00
Badlop
15abddb7a8
Fix EDoc comment
...
SVN Revision: 2814
2009-12-21 14:35:09 +00:00
Badlop
3df45683ff
Fix get_group_opt to return Default value in case of Mnesia error.
...
SVN Revision: 2811
2009-12-19 00:16:32 +00:00
Badlop
ef49822a47
Update branch version name back to 2.1.x
...
SVN Revision: 2810
2009-12-17 18:08:07 +00:00
Badlop
402a8c0d35
Prepare 2.1.1 release
...
SVN Revision: 2808
2009-12-14 14:15:45 +00:00
Badlop
d24449488c
Print command's reply and newline only when there's something to print.
...
SVN Revision: 2806
2009-12-11 20:04:36 +00:00
Badlop
b9e57a341d
Added to ejabberdctl an experimental variable EJABBERD_BYPASS_WARNINGS
...
SVN Revision: 2804
2009-12-11 19:42:59 +00:00
Badlop
79be929d96
Add support for serving a Unique Room Name (thanks to Pablo Polvorin)(EJAB-1121)
...
SVN Revision: 2802
2009-12-11 12:30:41 +00:00
Badlop
65aed47873
Show Last Activity menu item in Webadmin only if vhost has mod_last (EJAB-1031)
...
SVN Revision: 2799
2009-12-09 17:47:02 +00:00
Badlop
8ac16a0ec1
Call in WebAdmin the proper mod_last backend module (EJAB-1031)
...
SVN Revision: 2798
2009-12-09 17:46:51 +00:00
Badlop
3250c24ff1
This is ejabberd 2.1.x branch, not 2.1.0 tag.
...
SVN Revision: 2796
2009-12-09 10:09:35 +00:00
Badlop
e3b4c99b00
Apply a forgotten part of the original patch (EJAB-1119)
...
SVN Revision: 2792
2009-12-08 17:32:46 +00:00
Badlop
1f5bf8fbc0
Fix memory and port leak when TLS is enabled in HTTP (thanks to Brian Cully)(EJAB-1119)
...
SVN Revision: 2790
2009-12-07 17:33:02 +00:00
Badlop
f044d6ed28
Fix bug that couldn't connect if starttls_required and zlib were set (EJAB-1118)
...
SVN Revision: 2789
2009-12-07 15:54:25 +00:00
Christophe Romain
3aa242e2c7
prevent sending duplicated last items if several resources online (EJAB-1116)
...
SVN Revision: 2786
2009-12-06 23:18:17 +00:00
Badlop
8983cba129
Typo in mod_pubsub_odbc breaks Service Discovery and more (EJAB-1115)
...
SVN Revision: 2784
2009-12-04 18:35:14 +00:00
Badlop
bd97c40f92
Call ejabberd_router:route/3 instead of sending a message (EJAB-1114)
...
SVN Revision: 2782
2009-12-04 16:31:25 +00:00
Badlop
5a006b977d
Small relax the limitation in the mod_pubsub_odbc host option.
...
SVN Revision: 2781
2009-12-04 16:08:31 +00:00
Badlop
2265f52c34
Fix warning of unused variable
...
SVN Revision: 2776
2009-12-03 22:53:39 +00:00
Badlop
7b244652f1
Use os:getenv to get HOME; if variable is undefined use default values.
...
SVN Revision: 2773
2009-12-03 15:59:01 +00:00
Badlop
325e67f4cb
Use old regexp instead re in 2.x for pre-R12B-4 compatibility.
...
SVN Revision: 2771
2009-12-02 23:26:28 +00:00
Badlop
6ce660b9c2
IQ sent to resource not connected, return service-unavailable instead of recipient-unavailable (EJAB-1045)
...
SVN Revision: 2768
2009-12-01 20:00:33 +00:00
Badlop
575e07a986
Forward IQ vCard queries of room occupants to bare JID, not full (EJAB-1045)
...
SVN Revision: 2767
2009-12-01 20:00:15 +00:00
Badlop
20d1011194
Don't handle internally an IQ vCard if destination is full JID (EJAB-1045)
...
SVN Revision: 2766
2009-12-01 19:59:59 +00:00
Badlop
3df5277728
Move get_group_name outside the loop (thanks to mikekaganski)
...
SVN Revision: 2762
2009-11-26 14:46:24 +00:00
Badlop
51594b6011
Generate main XML file also when exporting only a vhost (EJAB-1098)
...
SVN Revision: 2753
2009-11-23 18:34:36 +00:00
Badlop
58425ba45d
Show informative webpage when browsing the HTTP-Poll page (EJAB-1106)
...
SVN Revision: 2751
2009-11-23 15:21:05 +00:00
Badlop
1716b090f9
Option to define custom HTTP headers in mod_http_fileserver (EJAB-612)
...
SVN Revision: 2747
2009-11-23 12:00:46 +00:00
Badlop
6cf3ae8050
Include IP address, time and module in IBR admin message (thanks to Tsukasa Hamano)
...
SVN Revision: 2744
2009-11-17 11:14:31 +00:00
Evgeniy Khramtsov
311bf4dbb1
fixes allow_host/2 on subdomains. added hook s2s_allow_host: the hook should return deny or allow
...
SVN Revision: 2738
2009-11-13 16:19:46 +00:00
Badlop
1511a5dc82
Fix EDoc errors
...
SVN Revision: 2735
2009-11-06 18:26:06 +00:00
Badlop
041d947e83
Fix bug that forgot listener options when using R12 or older.
...
SVN Revision: 2734
2009-11-06 18:24:54 +00:00
Christophe Romain
2007b3d496
typo fix that breaks pep
...
SVN Revision: 2731
2009-11-06 11:01:40 +00:00
Christophe Romain
09e847b97d
fix root node deletion match
...
SVN Revision: 2729
2009-11-05 17:36:15 +00:00
Badlop
b9f911554c
Fix ProcessOne name in comments.
...
SVN Revision: 2724
2009-11-04 20:14:22 +00:00
Badlop
1a5eb4f73d
Fix disco on root node, add commands to disco (thanks to Brian Cully)(EJAB-1094)
...
SVN Revision: 2722
2009-11-04 19:54:15 +00:00
Badlop
3930715712
Send authorization messages outside of get-pending transaction (thanks to Brian Cully)(EJAB-1090)
...
SVN Revision: 2721
2009-11-04 19:52:33 +00:00
Badlop
64bc97d471
Send authorization messages outside of get-pending transaction (thanks to Brian Cully)(EJAB-1090)
...
SVN Revision: 2719
2009-11-04 17:38:51 +00:00
Badlop
9192c75e1a
Fix stringprep Bidi checking (thanks to Alexey Shchepin)(EJAB-1087)
...
SVN Revision: 2717
2009-11-01 12:15:34 +00:00
Christophe Romain
512d701ef8
minor bugfix, thanks to brian Cully (EJAB-1089)
...
SVN Revision: 2713
2009-10-27 14:26:22 +00:00
Christophe Romain
ef3dd090c7
backport previous patch to pubsub odbc
...
SVN Revision: 2711
2009-10-27 14:13:18 +00:00
Christophe Romain
3d5fe6a337
fix disco bugs, thanks to Brian Cully (EJAB-1088)
...
SVN Revision: 2710
2009-10-27 14:07:35 +00:00
Badlop
798853abb6
Fix mistake that disallowed s2s_out connections when using Erlang R12 or older.
...
SVN Revision: 2694
2009-10-21 21:11:09 +00:00
Christophe Romain
8ce1e790ac
does not use slash as default separator in nodename (EJAB-667)
...
SVN Revision: 2687
2009-10-20 15:03:07 +00:00
Badlop
a232d16ff4
Body tag not properly closed in HTTP-Bind (thanks to Janusz Dziemidowicz)(EJAB-1075)
...
SVN Revision: 2685
2009-10-20 09:56:12 +00:00
Badlop
f2a37597cf
In default config, only local accounts can create rooms and pubsub nodes.
...
SVN Revision: 2683
2009-10-19 17:02:37 +00:00
Badlop
257e4c34a8
Provide send_timeout_close option in TCP only in R13B or higher (EJAB-926)
...
SVN Revision: 2680
2009-10-19 14:47:05 +00:00
Badlop
66cd86e726
Support ejabberd_listener option 'backlog' to increase TCP backlog (thanks to Janusz Dziemidowicz)(EJAB-1063)
...
SVN Revision: 2678
2009-10-19 13:23:46 +00:00
Badlop
84a1cc943d
Consistency, wording and spacing corrections for Polish messages (thanks to Marcin Owsiany)(EJAB-1072)
...
SVN Revision: 2677
2009-10-19 11:36:05 +00:00
Badlop
da50ec6215
Start mnesia as a permanent application (thanks to Brian Cully)(EJAB-1068)
...
SVN Revision: 2673
2009-10-19 10:41:44 +00:00
Badlop
69c4d5d89b
Fix unnecessary call to xml:crypt/1 (thanks to Janusz Dziemidowicz)(EJAB-1064)
...
SVN Revision: 2672
2009-10-19 10:30:41 +00:00
Mickaël Rémond
006515020a
Support gen_tcp send timeout: Close the connection if the other end has disconnected ungracefully or cannot keep up with the rate at which we are sending data (EJAB-926)
...
SVN Revision: 2671
2009-10-19 09:36:23 +00:00
Badlop
f86318a179
Fixed more gcc signedness warnings
...
SVN Revision: 2668
2009-10-13 22:30:08 +00:00
Christophe Romain
b667148982
prevent remove_user from blocking gen_server, and allow plugin to change broadcasted payload on publish
...
SVN Revision: 2666
2009-10-13 16:43:02 +00:00
Christophe Romain
cbf6abc263
typo fix (EJAB-1060)
...
SVN Revision: 2664
2009-10-13 07:47:17 +00:00
Badlop
355648dc7e
If s2s fails due to namespace mismatch, show differences to help debugging the problem.
...
SVN Revision: 2662
2009-10-12 22:51:19 +00:00
Christophe Romain
3128c26766
fix get_item issue on authorize access model (thanks to brian cully) (EJAB-1060)
...
SVN Revision: 2660
2009-10-12 15:22:14 +00:00
Christophe Romain
c311ea1505
autodetect compilation parameters for Mac OS X Snow Leopard (EJAB-1056)
...
SVN Revision: 2658
2009-10-12 12:01:54 +00:00
Christophe Romain
2c48515e7c
return invalid-options on badly formed subscription options
...
SVN Revision: 2656
2009-10-12 09:59:36 +00:00
Christophe Romain
25523371fc
Default pubsub messages to headline if nothing is configured (thanks to Brian Cully) (EJAB-1061)
...
SVN Revision: 2654
2009-10-12 09:05:26 +00:00
Badlop
3e9e967429
Fix regression for authorize node subscription (thanks to Brian Cully)(EJAB-1060)
...
SVN Revision: 2651
2009-10-09 12:00:20 +00:00
Mickaël Rémond
c79489fb65
Add debug message on command execution
...
SVN Revision: 2650
2009-10-08 17:22:48 +00:00
Evgeniy Khramtsov
14232df14c
new option added: max_fsm_queue. removed hardcoded FSMLIMITS
...
SVN Revision: 2645
2009-10-07 14:24:09 +00:00
Evgeniy Khramtsov
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
Christophe Romain
0a77892391
allow max_items_node use on pep
...
SVN Revision: 2642
2009-10-06 15:18:58 +00:00
Badlop
c10984f61b
Improve stream error stanza when receives invalid handshake from component.
...
SVN Revision: 2640
2009-10-06 10:04:26 +00:00
Badlop
ce1364b414
Pack presences stored in C2S processes (thanks to Geoff Cant)(EJAB-1057)
...
SVN Revision: 2638
2009-09-28 17:23:37 +00:00
Christophe Romain
4667cefb62
do not create hometree base when hometree not configured as plugin
...
SVN Revision: 2634
2009-09-25 13:12:29 +00:00
Evgeniy Khramtsov
6fa0f68239
fixes race condition in wait_caps/note_caps (EJAB-1054)
...
SVN Revision: 2632
2009-09-25 11:47:21 +00:00
Badlop
4606f33081
Update Catalan translation (thanks to Jan Kusanagi)
...
SVN Revision: 2630
2009-09-24 21:27:23 +00:00
Christophe Romain
726545ae86
improve waiting caps clean (EJAB-1054)
...
SVN Revision: 2627
2009-09-24 19:29:21 +00:00
Christophe Romain
1c585e74bc
fix EJAB-1044 and EJAB-1055
...
SVN Revision: 2626
2009-09-24 19:28:43 +00:00
Badlop
dc474cf9d5
Recompile guide and translation files.
...
SVN Revision: 2625
2009-09-24 13:37:32 +00:00
Christophe Romain
e2ba1f4f1d
rename pep_sendlast_offline option to ignore_pep_from_offline in default configuration
...
SVN Revision: 2622
2009-09-23 21:56:41 +00:00
Christophe Romain
330d6f7b6e
rename pep_sendlast_offline option to ignore_pep_from_offline (EJAB-1047)
...
SVN Revision: 2621
2009-09-23 21:54:58 +00:00
Christophe Romain
68fd22af87
fix Makefile.win32 for including stun (thanks to neustradamus)
...
SVN Revision: 2619
2009-09-23 21:11:21 +00:00
Badlop
f25b2266bd
Fix wrong XEP number to XEP-0227. Recompile translation files.
...
SVN Revision: 2617
2009-09-23 17:25:04 +00:00
Christophe Romain
8107b2b7dc
fix EJAB-819 thanks to badlop
...
SVN Revision: 2615
2009-09-23 15:56:06 +00:00
Mickaël Rémond
4936c2dc58
Replaced Jabber references in config file with XMPP, official name of the protocol
...
SVN Revision: 2612
2009-09-23 12:37:58 +00:00
Christophe Romain
fc1dd42e5a
fix EJAB-1048, add timestamp to last published items
...
SVN Revision: 2611
2009-09-23 09:27:12 +00:00
Mickaël Rémond
325660a547
Removed unneeded use of length function + Remove trailing spaces
...
SVN Revision: 2610
2009-09-21 15:10:50 +00:00
Badlop
8d47a20d63
Added new translation to Greek language (thanks to James Iakovos Mandelis)
...
SVN Revision: 2607
2009-09-21 07:39:23 +00:00
Christophe Romain
9aee12d83b
fix missing member affiliation on odbc plugin
...
SVN Revision: 2603
2009-09-18 13:43:49 +00:00
Christophe Romain
970973cb9a
fix compilation warning
...
SVN Revision: 2601
2009-09-18 13:29:08 +00:00
Christophe Romain
719aff1088
Return terminal binding condition on max stanza size limit (thanks to Aleksey)
...
SVN Revision: 2600
2009-09-18 13:17:07 +00:00
Evgeniy Khramtsov
ff1622c658
removed pretty printer from debug
...
SVN Revision: 2599
2009-09-15 11:11:49 +00:00
Badlop
717837172c
Remove ChangeLog on distclean
...
SVN Revision: 2598
2009-09-11 08:59:53 +00:00
Christophe Romain
ae70faef94
change version do 2.1.0
...
SVN Revision: 2597
2009-09-11 08:16:25 +00:00
Badlop
c86a73f894
Replace TYPE/1 with is_TYPE/1 (EJAB-922)
...
SVN Revision: 2596
2009-09-10 22:38:37 +00:00
Jérôme Sautret
49894fe065
Add a "created_at" column to some tables in the MySQL schema to store
...
a timestamp (thanks to Pedro Melo, EJAB-376).
SVN Revision: 2593
2009-09-10 16:52:20 +00:00
Jérôme Sautret
58d690376c
Fix pubsub tables constraints in MySQL schema creation script.
...
SVN Revision: 2592
2009-09-10 16:45:50 +00:00
Christophe Romain
c841505a07
remove useless include
...
SVN Revision: 2590
2009-09-09 21:41:25 +00:00
Christophe Romain
31c6d6194f
fix delete item to allow owner being able to remove all publisher items, and also fix EJAB-1036
...
SVN Revision: 2589
2009-09-09 21:40:21 +00:00
Badlop
d678a21f21
Change some error messages.
...
SVN Revision: 2587
2009-09-07 14:28:08 +00:00
Christophe Romain
860957d20c
fix minor timestamp shift between item creation and modification
...
SVN Revision: 2585
2009-09-04 23:32:13 +00:00
Pablo Polvorin
9d8de17b4d
Use the local (target) domain for firing the s2s_receive_packet hook.
...
It was using the external server domain (LFrom) instead of the local domain (LTo).
This might have impact on mod_caps in s2s scenarios, needs further attention.
SVN Revision: 2583
2009-09-04 21:31:03 +00:00
Badlop
0d108d5b1e
Update Swedish translation (thanks to Gustaf Alströmer)
...
SVN Revision: 2580
2009-09-02 13:39:57 +00:00
Christophe Romain
07f457f49f
improve previous patch
...
SVN Revision: 2578
2009-09-01 13:16:10 +00:00
Badlop
55fef3c3e7
Fix missing tag when configuring subscription option (thanks to Clochix)
...
SVN Revision: 2576
2009-09-01 08:18:30 +00:00
Badlop
a033b06150
BOSH module optimization and clean-up (thanks to Aleksey Shchepin and Mickaël Rémond)(EJAB-936)
...
SVN Revision: 2574
2009-08-31 18:37:52 +00:00
Badlop
fd57ec5872
Support zlib compression after STARTTLS (thanks to Aleksey Shchepin)(EJAB-499)
...
SVN Revision: 2571
2009-08-31 16:29:25 +00:00
Badlop
f6c6a7ee31
Fix Edoc errors
...
SVN Revision: 2569
2009-08-31 11:11:13 +00:00
Badlop
19dead97a3
Rename erlang log file sasl.log to erlang.log (EJAB-783)
...
SVN Revision: 2567
2009-08-31 08:41:56 +00:00
Badlop
2568c616f7
Update translation files
...
SVN Revision: 2566
2009-08-29 19:23:02 +00:00
Badlop
dab4adaaee
Update Esperanto translation (thanks to Andreas van Cranenburgh)
...
SVN Revision: 2565
2009-08-29 19:22:38 +00:00
Christophe Romain
fdc6149c08
apply last patch to pubsub_odbc as well
...
SVN Revision: 2563
2009-08-28 16:24:42 +00:00
Christophe Romain
e29c992cbf
secure calls to ets:lookup
...
SVN Revision: 2562
2009-08-28 16:22:37 +00:00
Christophe Romain
156c496a27
fix send last item issue
...
SVN Revision: 2560
2009-08-28 00:06:28 +00:00
Christophe Romain
5e99d3416d
delete node fix
...
SVN Revision: 2558
2009-08-27 22:36:46 +00:00
Christophe Romain
b6f50972b6
remove INFO_MSG call inside sql_query_internal
...
SVN Revision: 2556
2009-08-27 22:27:55 +00:00
Christophe Romain
ff1fc2b4f0
reapply previous RSM filtering fix drop by mistake
...
SVN Revision: 2555
2009-08-27 22:23:39 +00:00
Christophe Romain
57aefa240f
get odbc subscriptions bugfix
...
SVN Revision: 2554
2009-08-27 22:14:48 +00:00
Christophe Romain
2fdabe8b5b
several improvements, and fix odbc subscriptions issues
...
SVN Revision: 2553
2009-08-27 21:38:23 +00:00
Badlop
217d3131c8
Fix EDoc comment
...
SVN Revision: 2552
2009-08-27 18:15:12 +00:00
Christophe Romain
51e2896914
fix pep not fetching subscriptions
...
SVN Revision: 2551
2009-08-27 10:20:05 +00:00
Christophe Romain
054ad379ce
typo fix
...
SVN Revision: 2549
2009-08-27 09:44:03 +00:00
Christophe Romain
2425c51ae4
fix issue with RSM filtering
...
SVN Revision: 2548
2009-08-27 09:32:40 +00:00
Christophe Romain
c137715902
fix old api in node_flat_odbc
...
SVN Revision: 2547
2009-08-27 08:57:45 +00:00
Christophe Romain
670d7c7ebd
port commit from r2527 to odbc plugin
...
SVN Revision: 2543
2009-08-27 08:17:44 +00:00
Evgeniy Khramtsov
2c735c91d6
check if a room is not persistent before starting a new one with the same name (EJAB-1026)
...
SVN Revision: 2539
2009-08-26 04:14:54 +00:00
Christophe Romain
eca4d9c963
resolve EJAB-1025, send notification when owner changed entity subscription
...
SVN Revision: 2532
2009-08-25 16:35:43 +00:00
Badlop
64976e18b3
Add command to update PubSub table of ejabberd trunk SVN.
...
If you use ejabberd trunk SVN, run this command:
ejabberdctl rename_default_nodeplugin
SVN Revision: 2531
2009-08-25 15:23:23 +00:00
Christophe Romain
f303a40973
apply badlop's patch from http://www.ejabberd.im/node/3629
...
SVN Revision: 2530
2009-08-25 15:09:12 +00:00
Christophe Romain
3909f95ac1
added function to rename old default nodes to hometree
...
SVN Revision: 2529
2009-08-25 14:13:26 +00:00
Christophe Romain
ca403c25e7
fix manage subscriptions owner's usecase
...
SVN Revision: 2528
2009-08-24 22:40:40 +00:00
Badlop
1b81a2e3d6
Write PID file, path is configurable in ejabberdctl.cfg (EJAB-1023)
...
SVN Revision: 2526
2009-08-24 21:21:04 +00:00
Badlop
73282e0760
Prepare ejabberd.init when installing ejabberd.
...
SVN Revision: 2521
2009-08-24 19:44:07 +00:00
Badlop
11be369987
Added preliminary template file for ejabberd.init (thanks to Christophe Romain)
...
SVN Revision: 2520
2009-08-24 19:43:52 +00:00
Badlop
ad7a8fffd5
Update Japanese translation (thanks to Tsukasa Hamano)
...
SVN Revision: 2519
2009-08-23 15:32:46 +00:00
Christophe Romain
e6b05199a8
update pubsub_odbc.patch
...
SVN Revision: 2518
2009-08-21 11:54:22 +00:00
Badlop
dabea295aa
Comment -spec lines to compile with ancient Erlang/OTP versions.
...
SVN Revision: 2517
2009-08-21 10:24:21 +00:00
Badlop
c8e7a4f4ac
Modify exmpp header lines to compile with ancient Erlang/OTP versions.
...
SVN Revision: 2516
2009-08-21 09:27:34 +00:00
Evgeniy Khramtsov
2a505d1d86
do not include MAPPED-ADDRESS in new style responses since it is not required by the RFC
...
SVN Revision: 2514
2009-08-21 06:07:04 +00:00
Badlop
f9119a3ec6
Update Czech translation (thanks to Lukáš Polívka)
...
SVN Revision: 2510
2009-08-20 17:29:56 +00:00
Christophe Romain
49fe1399af
add missing index while migrating old pubsub database
...
SVN Revision: 2509
2009-08-20 15:50:24 +00:00
Christophe Romain
56e52f0571
fixing pubsub_subscription issue when changed transaction to sync_dirty
...
SVN Revision: 2508
2009-08-20 13:07:58 +00:00
Badlop
7c76c65c8c
Updated translation files.
...
SVN Revision: 2507
2009-08-19 21:48:53 +00:00
Badlop
1efdf914f3
Update Polish translation (thanks to Zbyszek Żółkiewski)
...
SVN Revision: 2506
2009-08-19 21:48:07 +00:00
Badlop
6952aae506
Update Norwegian translation (thanks to Stian B. Barmen)
...
SVN Revision: 2502
2009-08-19 09:40:40 +00:00
Badlop
0a159a0850
Update Italian translation (thanks to Gabriele Stilli)
...
SVN Revision: 2501
2009-08-19 09:21:19 +00:00
Badlop
0a89bbaaa1
Update Dutch translation (thanks to Andreas van Cranenburgh)
...
SVN Revision: 2500
2009-08-18 17:10:28 +00:00
Christophe Romain
b70b742a9e
allow hometree pubsub plugin usage in default config, flat being default plugin anyway
...
SVN Revision: 2497
2009-08-17 20:27:28 +00:00
Christophe Romain
f2bd9e01b0
fix create_node and subscribe_node glitches from last merge
...
SVN Revision: 2496
2009-08-17 20:25:31 +00:00
Badlop
45b12ec886
Fix EDoc errors.
...
SVN Revision: 2494
2009-08-17 17:16:43 +00:00
Badlop
0192913405
Update German translation (thanks to Nikolaus Polak)
...
SVN Revision: 2493
2009-08-17 16:52:50 +00:00
Badlop
cf6d39487a
Display room service messages in distintive blue colour.
...
SVN Revision: 2491
2009-08-15 22:02:49 +00:00
Badlop
3571ef9767
Update Ingoing s2s connections inner state to hold domain name (thanks to Juan Pablo Carlino)(EJAB-972)
...
SVN Revision: 2489
2009-08-15 21:38:48 +00:00
Badlop
3e45bdcc2d
Don't allow room config to enable password protection with empty password (EJAB-1011)
...
SVN Revision: 2485
2009-08-15 20:09:05 +00:00
Badlop
5ddfccd45e
If room config violates service policy, return not-acceptable instead of bad-request.
...
SVN Revision: 2484
2009-08-15 20:08:51 +00:00
Badlop
14e95f91d1
Update Ukraininan translation (thanks to Ruslan Rakhmanin)
...
SVN Revision: 2483
2009-08-15 17:48:53 +00:00
Evgeniy Khramtsov
2999a11f4b
fixes disco#info
...
SVN Revision: 2482
2009-08-15 03:14:17 +00:00
Badlop
7fb6a4696a
Update Galician translation (thanks to Carlos E. Lopez)
...
SVN Revision: 2481
2009-08-14 23:18:56 +00:00
Badlop
2e68058508
Update Slovak translation (thanks to Marek Bečka)
...
SVN Revision: 2480
2009-08-14 23:13:05 +00:00
Badlop
3f8a4a5756
Updated Portuguese-Brazil translation (thanks to Otávio Fernandes)
...
SVN Revision: 2479
2009-08-13 16:44:56 +00:00
Badlop
f6258b2f46
Update Chinese translation (thanks to Shelley Shyan and Zhan Caibao)
...
SVN Revision: 2478
2009-08-13 13:48:35 +00:00
Evgeniy Khramtsov
cbc78674e5
removed unnecessary gen_server call
...
SVN Revision: 2476
2009-08-13 09:59:31 +00:00
Badlop
1e148d4260
Updated Turkish translation (thanks to Doruk Fisek)
...
SVN Revision: 2475
2009-08-12 20:19:36 +00:00
Evgeniy Khramtsov
46ae4e7340
fixes fuzzy strings in Russian translation
...
SVN Revision: 2474
2009-08-12 15:09:31 +00:00
Badlop
268fe029fd
Update French translation (thanks to Nicolas Vérité)
...
SVN Revision: 2471
2009-08-12 14:15:07 +00:00
Badlop
3dc88feec9
Fix port in IRC register form.
...
SVN Revision: 2470
2009-08-12 11:37:05 +00:00
Evgeniy Khramtsov
5098964df0
updated Russian translation
...
SVN Revision: 2469
2009-08-12 11:31:51 +00:00
Badlop
d3f9819c0f
Update Spanish translation
...
SVN Revision: 2468
2009-08-12 10:42:42 +00:00
Badlop
06cee5a654
Update translation files again.
...
SVN Revision: 2467
2009-08-12 10:42:28 +00:00
Badlop
5438504fbf
Fix english strings
...
SVN Revision: 2466
2009-08-12 10:42:08 +00:00
Badlop
56f525c475
Update translation files
...
SVN Revision: 2465
2009-08-12 10:12:16 +00:00
Badlop
44ac69f8de
Add support in WebAdmin for the new listener network protocol
...
SVN Revision: 2462
2009-08-11 18:22:58 +00:00
Badlop
60932b67b1
Add stun directory to compilation process
...
SVN Revision: 2461
2009-08-11 18:22:43 +00:00
Badlop
3eaf796cca
More documentation for STUN server.
...
* Add stun listener to example config file, disabled.
* Improve enumeration of listeners options
* Mention STUN in release notes
* Mention new STUN listener in release notes
* Mention new network protocol syntax in release notes
SVN Revision: 2454
2009-08-11 11:22:57 +00:00
Evgeniy Khramtsov
01a9f981f4
it is now possible to start TCP/UDP on the same port
...
SVN Revision: 2452
2009-08-11 07:15:36 +00:00
Evgeniy Khramtsov
d967054a9f
do not forget to close TLS socket
...
SVN Revision: 2451
2009-08-10 02:20:05 +00:00
Evgeniy Khramtsov
73fabfe3a6
RFC5389 (STUN) support: stand-alone server, binding usage only
...
SVN Revision: 2450
2009-08-09 10:44:16 +00:00
Badlop
5490d7efe8
Add ejabberd command to get the current loglevel (EJAB-1004)
...
SVN Revision: 2447
2009-08-07 14:51:55 +00:00
Badlop
0e8dd70ed5
Added port and password connection parameters (thanks to Anton Podavalov)(EJAB-339)
...
SVN Revision: 2446
2009-08-07 14:43:44 +00:00
Christophe Romain
29cb0ae7ba
do not create hometree node by default
...
SVN Revision: 2444
2009-08-07 14:10:08 +00:00
Christophe Romain
14b22a4f98
add new pubsub modules in win32 Makefile
...
SVN Revision: 2443
2009-08-07 13:37:29 +00:00
Badlop
c1d2a9305a
mod_pubsub_odbc.erl is autogenerated by applying a patch to mod_pubsub.erl
...
SVN Revision: 2442
2009-08-07 13:17:34 +00:00
Badlop
f9a8b9ff31
Add support for XEP-227 import/export, requires exmpp to use it (EJAB-993)
...
SVN Revision: 2439
2009-08-07 09:52:45 +00:00
Christophe Romain
0b03106946
typo fix on subscriptions
...
SVN Revision: 2438
2009-08-07 08:29:24 +00:00
Christophe Romain
5598d34478
initial merge of pubsub odbc, compilation pass ok
...
SVN Revision: 2437
2009-08-07 08:26:47 +00:00
Badlop
d6f3182731
Move functions from roster_versioning to mod_roster (EJAB-964)
...
SVN Revision: 2429
2009-08-06 21:06:16 +00:00
Pablo Polvorin
53626d16e3
Support for roster versioning (EJAB-964)
...
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 15:45:13 +00:00
Jérôme Sautret
59c88fcfe7
* src/odbc/ejabberd_odbc_sup.erl: make requests return a timeout if
...
connections to the database cannot be established (EJABS-990).
* src/odbc/ejabberd_odbc.erl: cosmetic changes.
SVN Revision: 2427
2009-08-06 15:06:08 +00:00
Jérôme Sautret
0cc9d8f8a0
* src/ejabberd_loglevel.erl: add get/0 API function that returns current log level (EJAB-1004).
...
SVN Revision: 2426
2009-08-06 10:56:55 +00:00
Jérôme Sautret
95239baf85
* src/odbc/ejabberd_odbc.erl: fix keepalive query, broken by r2092.
...
SVN Revision: 2425
2009-08-06 10:23:32 +00:00
Badlop
720fd7605d
Document the new option s2s_dns_options, expressed in seconds (EJAB-994)
...
SVN Revision: 2417
2009-08-03 15:03:50 +00:00
Christophe Romain
9fbef39193
fix is_last_item_cache_enabled issue with PEP, and fix indentation
...
SVN Revision: 2416
2009-07-31 14:55:05 +00:00
Evgeniy Khramtsov
fc0209fec9
fixes incorrect substitution of an LDAP pattern
...
SVN Revision: 2414
2009-07-31 06:32:24 +00:00
Christophe Romain
6bd9bac716
deny node creation if node owner is not owner of parent node as well
...
SVN Revision: 2413
2009-07-30 22:00:41 +00:00
Christophe Romain
26ace9829a
typo fix
...
SVN Revision: 2412
2009-07-30 21:37:19 +00:00
Christophe Romain
31d6fe3c7d
do not store item when persist_item false but send_last_published_item and last_item_cache enabled
...
SVN Revision: 2411
2009-07-30 21:00:44 +00:00
Christophe Romain
b08c061683
fix configuration result (EJAB-995)
...
SVN Revision: 2408
2009-07-30 13:13:22 +00:00
Evgeniy Khramtsov
cd68e0021e
do not crash on unmatched request
...
SVN Revision: 2406
2009-07-30 13:08:26 +00:00
Geoff Cant
f4330e9ed3
EJAB-994: Implements DNS timeouts and retries.
...
SVN Revision: 2404
2009-07-30 12:34:59 +00:00
Badlop
ea96fe3fd1
Document mod_ping in the ejabberd Guide (EJAB-974)(EJAB-173)
...
SVN Revision: 2403
2009-07-30 11:45:54 +00:00
Evgeniy Khramtsov
548be039b3
implemented timeout_action: none | kill. default is none
...
SVN Revision: 2402
2009-07-30 10:25:54 +00:00
Evgeniy Khramtsov
458b28eeff
XMPP Ping support (thanks to Brian Cully)
...
SVN Revision: 2401
2009-07-30 08:58:21 +00:00
Evgeniy Khramtsov
a528c62bba
update existing key instead of dropping an error
...
SVN Revision: 2398
2009-07-29 03:40:56 +00:00
Geoff Cant
bf10d1e956
EJAB-940: Implements reliable ODBC transaction nesting.
...
SVN Revision: 2397
2009-07-28 13:46:28 +00:00
Badlop
1262b0e353
Fix error when nick registration stanza doesn't contain Value.
...
SVN Revision: 2394
2009-07-27 09:36:49 +00:00
Christophe Romain
9d9fca5e19
fix subscribers publish_model
...
SVN Revision: 2393
2009-07-25 10:58:49 +00:00
Christophe Romain
ff1f4f5a35
fix get node configuration bug (Thanks to Brian Cully)
...
SVN Revision: 2392
2009-07-24 20:09:25 +00:00
Badlop
164e1520d4
New command to dump a table to text file.
...
SVN Revision: 2389
2009-07-23 15:23:08 +00:00
Badlop
140d938bc3
Add support to delete content and delete table.
...
SVN Revision: 2388
2009-07-23 15:23:02 +00:00
Badlop
b3eb800be1
Log an error if HTTP request does not include Host header (EJAB-966)
...
SVN Revision: 2386
2009-07-23 14:50:58 +00:00
Evgeniy Khramtsov
94a638da85
delete/2 now does not crash when there is nothing to delete. fold/1 added
...
SVN Revision: 2383
2009-07-22 06:46:07 +00:00
Christophe Romain
fef762243c
caps storage indexed on case insensitive jid
...
SVN Revision: 2382
2009-07-21 20:51:14 +00:00
Mickaël Rémond
46735f7c62
Fix typo from EJAB-988
...
SVN Revision: 2380
2009-07-21 19:17:32 +00:00
Badlop
7dfdd5d654
HTML room logs: fix formatting of spaces; log config when disabling logging; display occupants (EJAB-986)
...
SVN Revision: 2378
2009-07-21 18:33:56 +00:00
Badlop
5346a7df02
Allow content types to be configured in ejabberd.cfg (EJAB-975)(thanks to Brian Cully)
...
SVN Revision: 2376
2009-07-21 17:31:09 +00:00
Christophe Romain
46304da5d7
fix get_entity_subscriptions result match
...
SVN Revision: 2375
2009-07-20 15:19:51 +00:00
Badlop
367365f816
moved some log reports from error to debug level (thanks to Evgeniy Khramtsov)
...
SVN Revision: 2373
2009-07-20 09:21:30 +00:00
Christophe Romain
360b4916b1
Implement pubsub#get-pending Ad Hoc Command (EJAB-955) (thanks to Brian Cully)
...
SVN Revision: 2372
2009-07-20 08:53:56 +00:00
Badlop
480c98e991
Revert workaround of EJAB-611 because it seems no longer required (EJAB-709)
...
SVN Revision: 2370
2009-07-17 21:46:26 +00:00
Badlop
9df5639974
Support XEP-0157: Contact Addresses for XMPP Services (EJAB-235)
...
SVN Revision: 2368
2009-07-17 20:45:44 +00:00
Christophe Romain
2729285977
Fix updating pending subscriptions (EJAB-980)
...
SVN Revision: 2367
2009-07-17 19:58:42 +00:00
Badlop
08a72c1693
Store account number in internal auth of (EJAB-981)(thanks to Juan Pablo Carlino)
...
SVN Revision: 2365
2009-07-17 19:05:55 +00:00
Christophe Romain
c54fb0c9f2
Fix set-subscriptions to work with multi-subscribe (EJAB-977)
...
SVN Revision: 2364
2009-07-17 09:29:11 +00:00
Badlop
d49fe6e60d
If a command is already defined: log as Debug, not as Warning.
...
SVN Revision: 2362
2009-07-16 20:18:19 +00:00
Badlop
5413c72ed5
Update Galician translation (thanks to Carlos E. Lopez)
...
SVN Revision: 2361
2009-07-13 16:31:40 +00:00
Christophe Romain
b31ca0cd36
prevent creating badxml when pubsub_state is not accessible
...
SVN Revision: 2360
2009-07-08 14:28:22 +00:00
Badlop
0287d50ff4
If directory /sbin is created, set permissions 755, not 750.
...
SVN Revision: 2358
2009-07-07 08:27:15 +00:00
Badlop
5475f35f9f
Temporary debug and ctl nodes must get nodename similar to destination.
...
SVN Revision: 2355
2009-07-06 14:09:03 +00:00
Badlop
a7eb5a77eb
Add -hidden flag when calling Debug or Ctl
...
SVN Revision: 2354
2009-07-06 14:08:57 +00:00
Christophe Romain
fc55db403e
XEP-0248 bugfix (EJAB-963) (Thanks to Brian Cully)
...
SVN Revision: 2353
2009-07-06 08:05:33 +00:00
Christophe Romain
67052929d5
make virtual nodes having default options
...
SVN Revision: 2352
2009-07-02 10:11:59 +00:00
Badlop
4f0cd053c4
Support XEP-0085 Chat State Notifications (EJAB-961)
...
SVN Revision: 2350
2009-06-30 19:32:22 +00:00
Badlop
29ea2738cc
Include original timestamp on delayed presences (thanks to Mickael Remond)(EJAB-234)
...
SVN Revision: 2348
2009-06-30 17:50:47 +00:00
Badlop
49688feaf2
Add XEP82 Date Time, update XEP202 Entity Time and XEP203 Delayed Delivery (EJAB-234)
...
SVN Revision: 2345
2009-06-30 16:51:25 +00:00
Badlop
f145a32b79
Add announcement of offline feature to service discovery (EJAB-234)
...
SVN Revision: 2344
2009-06-30 16:51:15 +00:00
Christophe Romain
35dc60c534
minor bugfixes on dag nodes
...
SVN Revision: 2343
2009-06-29 21:46:13 +00:00
Badlop
523239d5a7
Don't use lists:keyfind/3 bcause it was introduced only in recent R13A.
...
SVN Revision: 2341
2009-06-25 18:05:12 +00:00
Badlop
29a11c89b1
Improvements in the WebAdmin browsing menus.
...
SVN Revision: 2334
2009-06-23 21:00:43 +00:00
Badlop
46ff889bd3
Add Vim folding
...
SVN Revision: 2333
2009-06-23 20:45:39 +00:00
Badlop
6140047edf
Change some translatable strings.
...
SVN Revision: 2332
2009-06-23 00:05:08 +00:00
Badlop
34a490361f
Detect auth errors and report in log file. Support auth when domain not provided.
...
SVN Revision: 2330
2009-06-22 22:58:52 +00:00
Badlop
2594c7d687
Add permanent section about HTTP Bind module to the Guide. Example config.
...
SVN Revision: 2260
2009-06-16 17:48:38 +00:00
Badlop
19fbe884d7
Add forgotten copyright and license notices.
...
SVN Revision: 2258
2009-06-16 17:48:27 +00:00
Badlop
95aa4653cb
Easier debugging (EJAB-936)(thanks to Michael Remond)
...
SVN Revision: 2257
2009-06-16 17:48:22 +00:00
Badlop
d950fb96b6
Code clean-up (EJAB-936)(thanks to Michael Remond)
...
SVN Revision: 2256
2009-06-16 17:48:18 +00:00
Badlop
ada531bd8d
Started code clean-up (EJAB-936)(thanks to Michael Remond)
...
SVN Revision: 2255
2009-06-16 17:48:13 +00:00
Badlop
caf9c4f65e
Replaced sha1 to hexadecimal transformation with sha:sha/1 call (thanks to Alexey Shchepin)
...
SVN Revision: 2254
2009-06-16 17:48:08 +00:00
Badlop
606e1982a9
Replace TYPE/1 with is_TYPE/1 (EJAB-922)
...
SVN Revision: 2253
2009-06-16 17:48:04 +00:00
Badlop
660bbaee3d
Simplified code.(thanks to Michael Remond)
...
SVN Revision: 2252
2009-06-16 17:48:00 +00:00
Badlop
65bc1122b2
Properly warn user and admin when mod_http_bind is not started.(thanks to Michael Remond)
...
SVN Revision: 2251
2009-06-16 17:47:56 +00:00
Badlop
7f8c01b150
Do not clear input when dispatching a get when we have nothing to output. (thanks to Geoff Cant)
...
SVN Revision: 2250
2009-06-16 17:47:51 +00:00
Badlop
20060d9cf6
Changed the place where database is created(thanks to Michael Remond)
...
SVN Revision: 2249
2009-06-16 17:47:47 +00:00
Badlop
67570668b6
Fix remote-stream-error stanzas
...
SVN Revision: 2248
2009-06-16 17:47:41 +00:00
Badlop
5fc16bc830
New option max_inactivity to configure maximum inactivity period (EJAB-512)
...
SVN Revision: 2247
2009-06-16 17:47:23 +00:00
Badlop
feded4b0b7
Fix warning of unused Host variable
...
SVN Revision: 2246
2009-06-16 17:47:17 +00:00
Badlop
15a6e660b9
Include condition in http-bind terminate body when service stops (EJAB-792)
...
SVN Revision: 2245
2009-06-16 17:47:12 +00:00
Badlop
1ce4eb06a7
Fix unknown rid error (thanks to Jerome Sautret)
...
SVN Revision: 2244
2009-06-16 17:47:07 +00:00
Badlop
3e9b5d4ed4
Implement packets reordering to avoid race conditions (EJAB-724).(thanks to Michael Remond)
...
SVN Revision: 2243
2009-06-16 17:47:03 +00:00
Badlop
b8478c50b9
Updated IP retrieving (thanks to Alexey Shchepin)
...
SVN Revision: 2242
2009-06-16 17:46:59 +00:00
Badlop
e9ee9959a1
Improve ip fetching patch (thanks to Christohpe Romain)
...
SVN Revision: 2241
2009-06-16 17:46:55 +00:00
Badlop
2d9f715d65
Retrieve correct IP from http connection (thanks to Christohpe Romain)
...
SVN Revision: 2240
2009-06-16 17:46:51 +00:00
Badlop
44c2259a43
Fix syntax error. (thanks to Jerome Sautret)
...
SVN Revision: 2239
2009-06-16 17:46:46 +00:00
Badlop
17de26d800
Removed HTTP bind session count. Removed the 'sponsored bind session' text. (thanks to Michael Remond)
...
Details:
Removed the HTTP bind session count because it leaks information on the size of the platform.
Removed the text 'sponsored by Mabber' because it is confusing, as people could think a third-party service using HTTP bind is sponsored by Mabber.
SVN Revision: 2238
2009-06-16 17:46:42 +00:00
Badlop
154a0d1c96
Do not display error message when starting several hosts (EJAB-571) (thanks to Christohpe Romain)
...
SVN Revision: 2237
2009-06-16 17:46:37 +00:00
Badlop
1626ede210
Provide explanation in error message when module is already started for another vhost
...
SVN Revision: 2236
2009-06-16 17:46:33 +00:00
Badlop
e14c3f4699
Removed small warning
...
SVN Revision: 2235
2009-06-16 17:46:29 +00:00
Badlop
9e309d2a38
Bugfixes (thanks to Alexey Shchepin)
...
SVN Revision: 2234
2009-06-16 17:46:25 +00:00
Badlop
a00b7fd89b
Removed receive_loop (thanks to Alexey Shchepin)
...
SVN Revision: 2233
2009-06-16 17:46:21 +00:00
Badlop
d036802891
Remove Erlang module attribute 'vsn' because it does not provide any worth feature, and it difficults hot code update (EJAB-440)
...
SVN Revision: 2232
2009-06-16 17:46:16 +00:00
Badlop
0047e4192b
Bugfix when table does not exist (thanks to Justin Kirby)
...
SVN Revision: 2231
2009-06-16 17:46:12 +00:00
Badlop
261b7dc0d9
Migration code for people using previous version of the HTTP binding module (EJAB-390)
...
SVN Revision: 2230
2009-06-16 17:46:08 +00:00
Badlop
b42dd00a53
Do not overwrite the stanza namespace (thanks to Anastasia Gornostaeva)
...
SVN Revision: 2229
2009-06-16 17:46:03 +00:00
Badlop
4a83538cf6
Support for c2s ACL access, max_stanza and shaper on http_poll connections (EJAB-243, EJAB-415, EJAB-416)(thanks to Michael Remond)
...
SVN Revision: 2228
2009-06-16 17:45:59 +00:00
Badlop
a314cdf26f
The Erlang/OTP function httpd_util:to_lower/1 is deprecated, and it is recommended to use string:to_lower/1 instead.
...
SVN Revision: 2227
2009-06-16 17:45:55 +00:00
Badlop
51a55723cf
Use DEBUG instead of INFO_MSG to keep log files small. Fix parse errors for grepping 'stream:error' (thanks to Stefan Strigler)
...
SVN Revision: 2226
2009-06-16 17:45:50 +00:00
Badlop
4dac8f437f
Forgot keyword 'catch' when doing list_to_float on bosh version attribute for initial request (thanks to Stefan Strigler)
...
SVN Revision: 2225
2009-06-16 17:45:46 +00:00
Badlop
7bfd87bec6
Fixes for pausing sessions; did not parse 'pause' attribute to int (thanks to Stefan Strigler)
...
SVN Revision: 2224
2009-06-16 17:45:42 +00:00
Badlop
bb26498faf
Support pausing sessions (thanks to Stefan Strigler) (thanks to Stefan Strigler)
...
SVN Revision: 2223
2009-06-16 17:45:38 +00:00
Badlop
222cabb745
Comment-header: talk about xmpp over bosh rather than http binding (thanks to Stefan Strigler)
...
SVN Revision: 2222
2009-06-16 17:45:34 +00:00
Badlop
c55ee29a24
Removed debugging stuff. Removed error condition (thanks to Stefan Strigler)
...
SVN Revision: 2221
2009-06-16 17:45:26 +00:00
Badlop
4cce314c11
Code cleanup. Code reorganization. Store version of bosh session. Use bosh version for error conditions (thanks to Stefan Strigler)
...
SVN Revision: 2220
2009-06-16 17:45:22 +00:00
Badlop
8a89b1737f
Store version as float (thanks to Stefan Strigler)
...
SVN Revision: 2219
2009-06-16 17:45:16 +00:00
Badlop
e7417c2f8b
Save bosh version with session (thanks to Stefan Strigler)
...
SVN Revision: 2218
2009-06-16 17:45:12 +00:00
Badlop
4ebeb4d6d0
Code rearranged (thanks to Stefan Strigler)
...
SVN Revision: 2217
2009-06-16 17:45:09 +00:00
Badlop
eea6a1a544
Make use of macros for namespaces. Some code cleanup. (thanks to Stefan Strigler)
...
SVN Revision: 2216
2009-06-16 17:44:59 +00:00
Badlop
fbf4a7aa35
Fix for 'terminate' in request, send empty body instead of error (thanks to Stefan Strigler)
...
SVN Revision: 2215
2009-06-16 17:44:55 +00:00
Badlop
9b8d897b5f
Disabled debugging (thanks to Stefan Strigler)
...
SVN Revision: 2214
2009-06-16 17:44:51 +00:00
Badlop
f248cfd18d
Some code cleanup (thanks to Stefan Strigler)
...
SVN Revision: 2213
2009-06-16 17:44:47 +00:00
Badlop
100befc771
Bosh compliance: honor xmpp:version (thanks to Stefan Strigler)
...
SVN Revision: 2212
2009-06-16 17:44:42 +00:00
Badlop
4ed01b98de
Restore ejabberd directory structure (src/web) for integration as patch (thanks to Christohpe Romain)
...
SVN Revision: 2211
2009-06-16 17:44:38 +00:00
Badlop
68ae80ed2f
We do not send a 'version' attribute at the stream header for now (thanks to Stefan Strigler)
...
SVN Revision: 2210
2009-06-16 17:44:34 +00:00
Badlop
0da3b27dfe
Prepare_response: fixed a dbg message. Changed http header (thanks to Stefan Strigler)
...
SVN Revision: 2209
2009-06-16 17:44:29 +00:00
Badlop
3dbfd827bb
Implements sockname and peername for compatibility (thanks to Christohpe Romain)
...
SVN Revision: 2208
2009-06-16 17:44:25 +00:00
Badlop
70fd795a1b
Reverted to r76 as 97 is completely broken and should not have been checked in at all (thanks to Stefan Strigler)
...
SVN Revision: 2207
2009-06-16 17:44:13 +00:00
Badlop
2e402c27f4
Minor changes (thanks to Stefan Strigler)
...
SVN Revision: 2206
2009-06-16 17:44:08 +00:00
Badlop
673a7aad55
Disabled debug (thanks to Stefan Strigler)
...
SVN Revision: 2205
2009-06-16 17:44:04 +00:00
Badlop
88d32b1064
Deal with return values from starting/terminating supervisor (thanks to Stefan Strigler)
...
SVN Revision: 2204
2009-06-16 17:44:00 +00:00
Badlop
5b09c35dea
Disabled debug (thanks to Stefan Strigler)
...
SVN Revision: 2203
2009-06-16 17:43:55 +00:00
Badlop
18f183e4e3
Removed my own supervisor (thanks to Stefan Strigler)
...
SVN Revision: 2202
2009-06-16 17:43:51 +00:00
Badlop
15b0841282
Renamed some vars for (thanks to Stefan Strigler)
...
SVN Revision: 2201
2009-06-16 17:43:47 +00:00
Badlop
da6c4f9941
Start supervisor here (thanks to Stefan Strigler)
...
SVN Revision: 2200
2009-06-16 17:43:43 +00:00
Badlop
7ed7ca6e1e
Make use of new api for plugable http based services (thanks to Stefan Strigler)
...
SVN Revision: 2199
2009-06-16 17:43:39 +00:00
Badlop
bbe82647e8
Initial commit of HTTP-Bind source code (thanks to Stefan Striegler)
...
SVN Revision: 2198
2009-06-16 17:43:35 +00:00
Badlop
c34999cc96
Add permanent section about mod_http_fileserver to the Guide. Example config.
...
SVN Revision: 2182
2009-06-16 13:46:03 +00:00
Badlop
e43271216f
Add forgotten copyright and license notices.
...
SVN Revision: 2181
2009-06-16 13:45:57 +00:00
Badlop
c4e80abeac
New option directory_indices, and improve logging (thanks to Brian Cully)(EJAB-932)
...
SVN Revision: 2180
2009-06-16 13:45:51 +00:00
Badlop
1bcc001615
Fix capitalization of HTTP headers (thanks to Brian Cully)(EJAB-892)
...
SVN Revision: 2179
2009-06-16 13:45:46 +00:00
Badlop
83e96f155a
Converted to gen_server behaviour (EJAB-561). Use the general reopen_log_hook instead of ejabberdctl command.
...
SVN Revision: 2178
2009-06-16 13:45:33 +00:00
Badlop
3681835668
Fix ip source to comply with new ip storage into ejabberd_http (thanks to Christophe Romain)
...
SVN Revision: 2177
2009-06-16 13:45:22 +00:00
Badlop
d2684bc3e8
Use httpd_util:to_lower when not compiling with Erlang R12 (EJAB-628)
...
SVN Revision: 2176
2009-06-16 13:45:17 +00:00
Badlop
c4ca19d313
Added JavaScript content type
...
SVN Revision: 2175
2009-06-16 13:45:12 +00:00
Badlop
a9ab002f48
Include Last-Modified HTTP header in responses to allow caching (EJAB-546) in mod_http_fileserver and mod_muc_log_http.
...
SVN Revision: 2174
2009-06-16 13:45:03 +00:00
Badlop
b416ed03c9
Fix error creating ETS table if enabled in several vhosts (EJAB-551). Unregister the command when stopping the module.
...
SVN Revision: 2173
2009-06-16 13:44:58 +00:00
Badlop
2190055a06
Remove Erlang module attribute 'vsn' because it doesn't provide any worth feature, and it difficults hot code update (EJAB-440)
...
SVN Revision: 2172
2009-06-16 13:44:53 +00:00
Badlop
7e426b9623
The Erlang/OTP function httpd_util:to_lower/1 is deprecated, and it's recommended to use string:to_lower/1 instead.
...
SVN Revision: 2171
2009-06-16 13:44:48 +00:00
Badlop
bd106bd45f
Small change in accesslog file format; fix bug when accesslog conf parameter wasn't present in the conf file (thanks to Jerome Sautret)
...
SVN Revision: 2170
2009-06-16 13:44:38 +00:00
Badlop
99fe76f8bc
Added accesslog parameter to record requests log in a file similar to Apache (thanks to Jerome Sautret)
...
SVN Revision: 2169
2009-06-16 13:44:32 +00:00
Badlop
eedef994a9
Initial commit of mod_http_fileserver (thanks to Massimiliano Mirra)
...
SVN Revision: 2168
2009-06-16 13:44:26 +00:00
Mickaël Rémond
732ad47559
Fix syntax error in config file.
...
SVN Revision: 2165
2009-06-16 00:47:43 +00:00
Badlop
83ffe1989a
Ad-hoc commands to join IRC channel, set nickname and encoding (thanks to Magnus Henoch)(EJAB-302)
...
SVN Revision: 2164
2009-06-15 18:56:52 +00:00
Badlop
e0370d89b4
Add option to restrict max offline messages by Access and ACL (EJAB-951)
...
New option for mod_offline: access_max_user_messages.
The old option user_max_messages is no longer supported.
SVN Revision: 2162
2009-06-15 17:43:18 +00:00
Badlop
de15168cdb
Replace TYPE/1 with is_TYPE/1 (EJAB-922)
...
SVN Revision: 2159
2009-06-15 17:26:48 +00:00
Christophe Romain
ddd3e58f35
add greetings to Brian Cully for pubsub contribs
...
SVN Revision: 2158
2009-06-15 13:58:40 +00:00
Christophe Romain
50b73664e2
experimental patch including XEP-248 (thanks to Brian Cully)
...
SVN Revision: 2157
2009-06-15 13:45:40 +00:00
Badlop
6f080f7fed
Prevent process crash if the IP and port of a connection is unknown.
...
SVN Revision: 2155
2009-06-11 18:01:36 +00:00
Badlop
ce7e9129d9
When client is closed, include the Reason in the stream trailer stanza.
...
SVN Revision: 2153
2009-06-09 12:09:48 +00:00
Badlop
f767def249
Add forgotten copyright and license notices. Fix blackspaces.
...
SVN Revision: 2151
2009-06-09 10:56:14 +00:00
Evgeniy Khramtsov
5583a3f7dc
fixes typo in Russian translation
...
SVN Revision: 2149
2009-06-09 07:03:27 +00:00
Evgeniy Khramtsov
b7fd730409
Malformed CAPTCHA response may crash a room. This is now fixed.
...
SVN Revision: 2148
2009-06-09 03:53:36 +00:00
Badlop
1266bf48e6
Update Spanish translation
...
SVN Revision: 2147
2009-06-05 15:22:29 +00:00
Badlop
459074fd97
Update French translation (thanks to Nicolas Vérité)
...
SVN Revision: 2146
2009-06-05 15:07:15 +00:00
Badlop
3b5a74b34e
Update Russian translation (thanks to Evgeniy Khramtsov)
...
The translator improves ru.po Russian translation.
Later ru.msg is automatically obtained by calling: make translations
SVN Revision: 2145
2009-06-03 16:41:44 +00:00
Badlop
049b7c5d11
Update ejabberd.pot and *.po, compile *.msg. All this by calling: make translations
...
SVN Revision: 2144
2009-06-03 16:41:34 +00:00
Evgeniy Khramtsov
97e2b39b69
updated russian translation
...
SVN Revision: 2143
2009-06-03 15:39:30 +00:00
Badlop
48392832ef
When max_stanza_size is exceeded, return meaningful error message (EJAB-752)
...
SVN Revision: 2142
2009-06-02 21:24:33 +00:00
Badlop
72b842d8d1
Remove support of deprecated Disco Publish XEP-0030 (EJAB-904)
...
SVN Revision: 2140
2009-06-02 18:07:59 +00:00
Badlop
05187325ee
Fix Access check: the rule can be defined in a vhost or global.
...
SVN Revision: 2136
2009-06-01 18:04:18 +00:00
Christophe Romain
fa5b06f542
apply patch from EJAB-845
...
SVN Revision: 2118
2009-05-29 02:14:07 +00:00
Christophe Romain
bf57f712da
fix nodetree virtual to allow node subscription
...
SVN Revision: 2117
2009-05-29 00:44:07 +00:00
Christophe Romain
c27d6fddf4
make flat the default node plugin
...
SVN Revision: 2116
2009-05-29 00:27:26 +00:00
Christophe Romain
6bd70aaf09
fix ets table name change
...
SVN Revision: 2115
2009-05-29 00:13:21 +00:00
Christophe Romain
cdd3ab17ae
remove useless debug
...
SVN Revision: 2113
2009-05-28 23:02:02 +00:00
Christophe Romain
039d5b8367
pubsub: added configuration option in guide.tex, added last item cache, use default node type if given type is not configured, make node_flat the default node plugin. caps: improve cache handling
...
SVN Revision: 2112
2009-05-28 22:30:43 +00:00
Badlop
af32a18b4b
Update CSS of WebAdmin menu
...
SVN Revision: 2108
2009-05-27 17:29:01 +00:00
Badlop
4094482a9f
Support to select what modules to update. Split large function in smaller ones.
...
SVN Revision: 2107
2009-05-27 17:28:55 +00:00
Christophe Romain
7f5cce8196
make get_items able to sort items in publish order (EJAB-824)
...
SVN Revision: 2105
2009-05-26 22:50:11 +00:00
Christophe Romain
ffe2d532bf
improve get_entity_* to work regardless of nodetree (EJAB-937)
...
SVN Revision: 2104
2009-05-26 21:50:13 +00:00
Badlop
29607291ae
Added support for captcha feature disability (EJAB-895)
...
If the option captcha_cmd is set but captcha can't be created:
* show critical error at server start
* hide captcha option in room configuration form
* don't require occupants to fill captcha
SVN Revision: 2101
2009-05-26 11:53:58 +00:00
Badlop
5c00365550
Add label in captcha form. Improve translatable strings in captcha and muc room.
...
SVN Revision: 2100
2009-05-26 11:03:45 +00:00
Badlop
31aa201ee8
Support LDAPS with TLS (EJAB-109)(thanks to Thomas Baden, Andy Harb, Sergei Golovan, Anton Podavalov)
...
SVN Revision: 2098
2009-05-25 17:15:48 +00:00
Badlop
3ec3e78baa
Decrease proxy65 buffer sizes to 8192 bytes.
...
The original size of 65535 confused clients with tight
shapers (thanks to Evgeniy Khramtsov)
SVN Revision: 2096
2009-05-25 11:17:11 +00:00
Mickaël Rémond
11c4dba442
* trunk/src/odbc/ejabberd_odbc.erl: Fix typo (EJABS-859) (EJAB-940) (CR-EJAB-10)
...
* branches/road-to-exmpp/src/odbc/ejabberd_odbc.erl: Likewise.
SVN Revision: 2095
2009-05-21 16:43:33 +00:00
Mickaël Rémond
270662c07b
* trunk/src/odbc/ejabberd_odbc.erl: Move trace to debug loglevel (EJAB-940) (EJABS-859) (CR-EJAB-10)
...
SVN Revision: 2093
2009-05-21 16:23:27 +00:00
Mickaël Rémond
b8f094b080
* trunk/src/odbc/ejabberd_odbc.erl: Support for nested transaction (EJABS-859) (EJAB-940) (CR-EJAB-10)
...
SVN Revision: 2092
2009-05-21 16:19:33 +00:00
Christophe Romain
dffe808895
PubSub: improve get_entity_* API
...
SVN Revision: 2090
2009-05-19 21:59:15 +00:00
Badlop
b5964c2a5f
Added API function to get current S2S connections with information
...
get_info_s2s_connections(Type) returns a list of incoming (or outgoing)
S2S connections with information for each one including IP address,
port number, TLS options... (thanks to Juan Pablo Carlino)
SVN Revision: 2088
2009-05-19 09:38:17 +00:00
Evgeniy Khramtsov
5f67072e06
* src/eldap/eldap.erl: log warnings on unsuccessful LDAP bind attempts. Increase timeout before the next LDAP bind attempt up to five seconds if the last bind attempt was rejected by the LDAP server ("soft" error). Thanks to Konstantin Khomoutov.
...
SVN Revision: 2086
2009-05-16 13:18:15 +00:00
Badlop
5a68b44be1
New command to convert mnesia nodename, copied from OTP and Debian
...
SVN Revision: 2080
2009-05-15 22:38:46 +00:00
Badlop
dfc97beaef
Allow to define additional Erlang options in ejabberdctl.cfg (thanks to Sergei Golovan)
...
SVN Revision: 2079
2009-05-15 22:10:53 +00:00
Badlop
4c1eefb791
The --node argument overwrites the value of ejabberdctl.cfg
...
SVN Revision: 2078
2009-05-15 22:08:00 +00:00
Badlop
e3eac4f00d
No longer edit ChangeLog, will be auto generated for ejabberd releases.
...
Added new call 'make changelog' which generates a ChangeLog file by
prepending to the old file obtained from SVN the new lines obtained
from SVN Log and formatted with svn2cl.
ChangeLog will be generated and included in ejabberd releases.
SVN Revision: 2076
2009-05-14 21:12:12 +00:00
Christophe Romain
257efddd1b
Fix bad transaction returncode in unsubscribe presence handler
...
SVN Revision: 2073
2009-05-12 20:57:38 +00:00
Christophe Romain
20088d8a92
Prevent race condition when calling get_caps while note_caps has not been handled yet (EJAB-934)
...
SVN Revision: 2071
2009-05-11 17:16:25 +00:00
Mickaël Rémond
077b9cd4db
* src/ejabberd_debug.erl: Handled fprof based profiling (EJABS-872).
...
* src/ejabberd_app.erl: Likewise.
SVN Revision: 2070
2009-05-11 16:48:56 +00:00
Christophe Romain
7e370d0201
handle Example 90 of XEP-0060 (EJAB-909), and make use of nodeAttr
...
SVN Revision: 2068
2009-05-08 01:18:02 +00:00
Christophe Romain
90263cf0e7
Allow to get subscriptions on a given node (EJAB-712), and presence based fixes
...
SVN Revision: 2066
2009-05-07 23:35:59 +00:00
Badlop
18af5f8675
Merge misplaced 2055 2058 and 2062 from ejabberd-2.0.4.
...
* src/ejabberd_app.erl: Better support for profiling.
* src/ejabberd.erl: Likewise
* src/ejabberd_ctl.erl: Likewise
* src/ejabberd_debug.erl: Likewise
SVN Revision: 2063
2009-05-07 22:46:51 +00:00
Christophe Romain
3d766c1cb5
several pubsub fixes and improvements. also fixes EJAB-913 and EJAB-871
...
SVN Revision: 2059
2009-05-07 00:09:02 +00:00
Badlop
fec3742aaa
Replace TYPE/1 with is_TYPE/1 (EJAB-922)
...
SVN Revision: 2057
2009-05-06 16:54:43 +00:00
Badlop
90abb578e6
* src/Makefile.in: Prevent Erlang R13B compilation warning:
...
behaviour X undefined (EJAB-920)
SVN Revision: 2056
2009-05-06 15:15:09 +00:00
Badlop
dff6e28b2d
* src/ejabberd_loglevel.erl: Use dynamic_compile instead of
...
ram_file_io_server. Support definition of loglevels with integer
or atom. (thanks to Geoff Cant)(EJAB-919)
* src/dynamic_compile.erl: Added erlang module that converts
string to binary loadable code by Mats Cronqvist, Chris Newcombe,
and Jacob Vorreuter.
* src/ram_file_io_server.erl: Remove file not longer useful.
* src/ejabberd.app: Likewise
SVN Revision: 2054
2009-05-06 14:51:51 +00:00
Badlop
9b370787c2
* src/mod_muc/mod_muc_room.erl: Fix badarg return (EJAB-899)
...
SVN Revision: 2053
2009-05-03 11:26:18 +00:00
Christophe Romain
a4b715516e
typo fix
...
SVN Revision: 2051
2009-04-30 21:36:33 +00:00
Christophe Romain
0ed0c45aba
mod_caps: reduce memory and remove mnesia lock
...
SVN Revision: 2050
2009-04-30 21:09:45 +00:00
Christophe Romain
f8780bc6ee
PubSub/PEP API change for major optimization
...
SVN Revision: 2048
2009-04-30 05:18:06 +00:00
Badlop
b2659e4a6f
* src/ejabberd_hooks.erl: Support distributed hooks (EJAB-829)
...
SVN Revision: 2047
2009-04-28 14:57:16 +00:00
Badlop
e45e486fd2
* src/xml.erl: More verbose error reporting for
...
element_to_string (thanks to Magnus Henoch)(EJAB-301)
SVN Revision: 2045
2009-04-27 21:36:41 +00:00
Badlop
7c4e7dea4b
* src/translate.erl: Support additional files (EJAB-925)
...
* contrib/extract_translations/extract_translations.erl: Likewise
* contrib/extract_translations/prepare-translation.sh: Likewise
SVN Revision: 2044
2009-04-27 20:55:35 +00:00
Badlop
709a536fb7
* src/win32_dns.erl: Fix problem parsing some win32 dns (EJAB-927)
...
SVN Revision: 2043
2009-04-27 20:36:19 +00:00
Badlop
cabf128bbb
* src/cyrsasl_digest.erl: Fix auth verification (EJAB-863)
...
SVN Revision: 2042
2009-04-27 20:24:21 +00:00
Badlop
e1fd7c444e
* src/jlib.erl: Fix recursive call to speedup base64
...
decoding (thanks to Jeffrey Rogiers)(EJAB-333)
SVN Revision: 2041
2009-04-27 19:17:17 +00:00
Christophe Romain
fc9ba11afe
minor cosmetic fix
...
SVN Revision: 2040
2009-04-24 21:34:59 +00:00
Christophe Romain
bda111b145
fix minor pubsub init glitch, and allow ejabberd_odbc to execute bloc of queries without transaction
...
SVN Revision: 2038
2009-04-24 10:27:31 +00:00
Christophe Romain
eab7a509f9
improve send last published items spawning
...
SVN Revision: 2036
2009-04-22 22:19:41 +00:00
Badlop
6acf7fb5ec
* src/ejabberd.cfg.example: Fix English typos. Fix line length:
...
max 80 characters per line. Remove trailing blankspaces. Added
markers for Vim fold, you may want to add to $HOME/.vimrc this
line: set modeline
* src/ejabberdctl.cfg.example: Likewise
SVN Revision: 2035
2009-04-22 13:45:57 +00:00
Badlop
b59ecb83e8
* src/mod_muc/mod_muc.erl: Limit number of characters in Room ID,
...
Name and Description (EJAB-899)
* src/mod_muc/mod_muc_room.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 2034
2009-04-22 12:05:10 +00:00
Badlop
aedb847a81
* src/cyrsasl.erl: Change API of check_password: pass a function
...
to generate the digest (thanks to Graham Whitted)(EJAB-863)
* src/cyrsasl_anonymous.erl: Likewise
* src/cyrsasl_digest.erl: Likewise
* src/cyrsasl_plain.erl: Likewise
* src/ejabberd_auth.erl: Likewise
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 2033
2009-04-22 11:44:03 +00:00
Badlop
ca8eeaac57
* src/ejabberd_c2s.erl: Fix for SASL Anonymous connections not
...
stored or purged (thanks to Andy Skelton)(EJAB-912)
SVN Revision: 2032
2009-04-22 11:02:03 +00:00
Badlop
d7223ea6ef
* src/mod_shared_roster.erl: Support in API to add 'all' as member
...
of a group (thanks to Martin Langhoff)(EJAB-916)
SVN Revision: 2031
2009-04-22 10:40:11 +00:00
Badlop
8654991333
* src/ejabberd_captcha.erl: If a problem appears while obtaining
...
the image, show error message (EJAB-895)
SVN Revision: 2030
2009-04-22 10:26:19 +00:00
Badlop
a26a7463a0
* src/Makefile.in: Install example script captcha.sh (EJAB-895)
...
SVN Revision: 2029
2009-04-22 10:23:22 +00:00
Badlop
34df1f502c
* src/ejabberd.cfg.example: Add CAPTCHA options (EJAB-895)
...
SVN Revision: 2028
2009-04-22 10:21:55 +00:00
Badlop
d22c483781
* src/ejabberd_ctl.erl: New option to require auth in ejabberdctl
...
and restrict what commands and arguments can execute (EJAB-910)
* src/ejabberd_config.erl: Likewise
SVN Revision: 2024
2009-04-17 13:48:59 +00:00
Badlop
5db572171b
* src/ejabberd_commands.erl: API to restrict who can execute what
...
commands and arguments (EJAB-910)
SVN Revision: 2023
2009-04-17 13:43:15 +00:00
Badlop
1dad64a1cc
* src/mod_muc/mod_muc_log.erl: Linkify also xmpp:..., as it was
...
done previously (thanks to Konstantin Khomoutov)(EJAB-850)
SVN Revision: 2020
2009-04-14 18:25:58 +00:00
Christophe Romain
0770e0eee4
after check, last commit was useless
...
SVN Revision: 2019
2009-04-14 12:46:55 +00:00
Christophe Romain
e740cfcc47
minor change, back to original patch
...
SVN Revision: 2017
2009-04-14 09:48:34 +00:00
Christophe Romain
412f65a0cb
minor typo fix
...
SVN Revision: 2016
2009-04-10 21:11:35 +00:00
Christophe Romain
cd6587d9df
minor improvement for best readability
...
SVN Revision: 2014
2009-04-10 08:40:10 +00:00
Christophe Romain
549fa6e836
make sure caps table are clean on startup
...
SVN Revision: 2013
2009-04-10 08:01:08 +00:00
Christophe Romain
409ab48068
better hadling of presence in mod_caps
...
SVN Revision: 2012
2009-04-10 07:36:17 +00:00
Badlop
7d0de522dd
* src/msgs/pl.po: Fix some translations (thanks to Andrzej Smyk)
...
SVN Revision: 2011
2009-04-09 11:18:06 +00:00
Badlop
b326b7eb74
* src/mod_pubsub/mod_pubsub.erl: Announce PubSub features in the
...
server JID only if PEP is enabled (EJAB-905)
SVN Revision: 2010
2009-04-08 19:30:24 +00:00
Badlop
f4c88768da
* src/mod_muc/mod_muc.erl: English fixes (thanks to Glenn Sieb)
...
* src/mod_muc/mod_muc_log.erl: Likewise
* src/mod_muc/mod_muc_room.erl: Likewise
* src/mod_register.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 2009
2009-04-08 19:04:13 +00:00
Badlop
4dd21545a0
* src/ejabberd_frontend_socket.erl: Fix compilation warnings and
...
add TODO comments.
SVN Revision: 2007
2009-04-08 18:56:11 +00:00
Badlop
7c415f3fdf
* src/mod_irc/mod_irc_connection.erl: Fix compilation warnings.
...
SVN Revision: 2006
2009-04-08 18:52:52 +00:00
Christophe Romain
5a6f837800
pubsub: prevent blocking when sending lots of items, send last items to connected resource only, and cosmetic changes
...
SVN Revision: 2005
2009-04-08 15:53:46 +00:00
Evgeniy Khramtsov
f80c848692
* src/ejabberd_captcha.erl: fixed compilation warnings.
...
SVN Revision: 2004
2009-04-08 12:05:03 +00:00
Badlop
46efb20947
* src/ejabberd_captcha.erl: Small code reorganization; export new
...
functions build_captcha_html/2 and check_captcha/2
SVN Revision: 2001
2009-03-30 11:55:31 +00:00
Badlop
a93a3370ef
* src/ejabberd_sm.erl: Partially retract SVN r1976
...
EJAB-300 (EJAB-890). Check default privacy list when account, not
a specific session, receives a presence subscription
stanza (EJAB-300).
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 1998
2009-03-24 16:22:33 +00:00
Christophe Romain
bc39341633
implement roster acces model (EJAB-780)
...
SVN Revision: 1997
2009-03-20 00:08:38 +00:00
Christophe Romain
1ac385f499
Allow more environment variable overrides in ejabberdctl (EJAB-891)
...
SVN Revision: 1995
2009-03-19 21:28:34 +00:00
Evgeniy Khramtsov
b789ee630d
* src/ejabberd_captcha.erl: moved all functions from ejabberd_captcha process. Use mnesia:transaction/1 where it is needed.
...
SVN Revision: 1994
2009-03-14 06:27:05 +00:00
Evgeniy Khramtsov
3834bcc07e
* src/ejabberd_captcha.erl: fixes previous commit
...
SVN Revision: 1992
2009-03-13 16:02:59 +00:00
Evgeniy Khramtsov
7e924341e4
* src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms).
...
* src/ejabberd_config.erl: likewise.
* src/ejabberd_sup.erl: likewise.
* src/jlib.hrl: likewise.
* src/web/ejabberd_http.erl: likewise.
* src/mod_muc/mod_muc_room.erl: CAPTCHA support.
* src/mod_muc/mod_muc_room.hrl: likewise.
SVN Revision: 1991
2009-03-13 16:01:46 +00:00
Badlop
f214b8c528
Fix mistake when calling win32_dns.
...
SVN Revision: 1990
2009-03-11 18:36:27 +00:00
Badlop
d4b5e94635
* src/tls/tls_drv.c: Fix encryption problem for ejabberd_http
...
after timeout (thanks to Alexey Shchepin)(EJAB-880)
SVN Revision: 1986
2009-03-10 15:21:36 +00:00
Christophe Romain
064d1af5de
typo fix on roster access_model
...
SVN Revision: 1984
2009-03-10 12:08:41 +00:00
Christophe Romain
51faa601fa
Fix PEP with other domains and s2s (EJAB-825)
...
SVN Revision: 1980
2009-03-10 10:35:57 +00:00
Badlop
d28efabb79
* src/tls/tls_drv.c: Fix to support OpenSSL older than
...
0.9.8f (EJAB-877)(thanks to Jonathan Schleifer)
* doc/guide.tex: It is again supported OpenSSL older than 0.9.8f
* doc/guide.html: Likewise
SVN Revision: 1979
2009-03-09 19:17:53 +00:00
Badlop
ad7bca0e78
* src/Makefile.in: In SunOS, use different C flags (thanks to
...
Thomas)(EJAB-438)
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
SVN Revision: 1977
2009-03-07 09:52:26 +00:00
Badlop
787d225f1e
* src/ejabberd_c2s.erl: Enforce privacy rules also for
...
subscription requests (EJAB-300)
* src/ejabberd_sm.erl: Likewise
SVN Revision: 1976
2009-03-07 08:59:26 +00:00
Evgeniy Khramtsov
06eb54fef8
* src/ejabberd_hooks.erl: fixed typo
...
SVN Revision: 1970
2009-03-06 10:03:29 +00:00
Evgeniy Khramtsov
0e8f56f0b3
* src/ejabberd_hooks.erl: anonymous functions support.
...
SVN Revision: 1969
2009-03-06 09:34:13 +00:00
Badlop
f826dc2f9f
* src/ejabberd_app.erl: In a Windows machine, explicitly add the
...
nameservers, as it seems Erlang does not do itself (EJAB-860)
* src/win32_dns.erl: Get name servers from Windows registy (thanks
to Geoff Cant)
SVN Revision: 1968
2009-03-05 20:03:18 +00:00
Badlop
ea715129e9
* src/ejabberd_auth.erl: If anonymous auth is enabled, when
...
checking if the account already exists in other auth methods, take
into account if the auth method failed (EJAB-882)
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
SVN Revision: 1966
2009-03-04 18:34:02 +00:00
Christophe Romain
b3c39d120f
Allow node creation without configure item
...
SVN Revision: 1963
2009-03-04 01:12:10 +00:00
Christophe Romain
965585eb56
update pubsub version
...
SVN Revision: 1960
2009-03-04 01:04:28 +00:00
Christophe Romain
020d6a46c5
Add roster subscriptions handling and make PEP events sent to all resources
...
SVN Revision: 1956
2009-03-03 22:42:37 +00:00
Badlop
117b67a31c
Fix small compilation error introduced in revision 1923
...
SVN Revision: 1931
2009-02-28 00:01:27 +00:00
Badlop
64f2945892
* src/mod_pubsub/node_default.erl: Fix that non-subscriber could
...
fetch items from Authorize node (thanks to Brian Cully)(EJAB-873)
SVN Revision: 1930
2009-02-27 23:56:46 +00:00
Badlop
3a5fb440cc
* src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
...
and recent Openfire (thanks to Philipp Hancke)(EJAB-877)
SVN Revision: 1926
2009-02-27 15:42:27 +00:00
Evgeniy Khramtsov
b766109f66
* src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not defined, the module takes an IP address of a local hostname.
...
SVN Revision: 1925
2009-02-27 03:22:40 +00:00
Christophe Romain
67e24366ee
cosmetic changes
...
SVN Revision: 1923
2009-02-27 03:09:00 +00:00
Badlop
fd26056d01
* src/mod_pubsub/mod_pubsub.erl: Fix incorrect implementation of
...
Pubsub payload requirements (thanks to Andy Skelton)(EJAB-823)
SVN Revision: 1921
2009-02-25 21:17:14 +00:00
Badlop
1650a946f2
* src/ejabberd_listener.erl: Fix report message of 'undef' error
...
SVN Revision: 1916
2009-02-24 17:25:40 +00:00
Christophe Romain
04fde3620d
Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854)
...
SVN Revision: 1912
2009-02-23 15:56:19 +00:00
Alexey Shchepin
b6208955f3
* src/web/ejabberd_http.erl: Added a workaround for inet:peername
...
returning 'ebadf'
SVN Revision: 1910
2009-02-23 05:25:10 +00:00
Badlop
e6324f8a02
Fix a minor compilation warning and add EDoc comment
...
SVN Revision: 1907
2009-02-21 11:24:08 +00:00
Badlop
ce03742e1b
* src/ejabberd_listener.erl: When stopping a listener, don't stop
...
the listener supervisor (EJAB-874)
SVN Revision: 1891
2009-02-20 14:51:13 +00:00
Christophe Romain
6e055f60de
fix nodetree plugin resolver
...
SVN Revision: 1889
2009-02-19 11:25:56 +00:00
Badlop
74763be4dd
* src/ejabberd_listener.erl: More error detections
...
SVN Revision: 1884
2009-02-17 15:42:22 +00:00
Badlop
e4a3cdb486
* src/ejabberd_listener.erl: More error detections
...
SVN Revision: 1883
2009-02-17 09:53:29 +00:00
Badlop
4659ae7683
* src/ejabberd_config.erl: Check certfiles are readable on server
...
start and listener start (EJAB-753)
* src/ejabberd_listener.erl: Likewise
SVN Revision: 1882
2009-02-16 17:57:30 +00:00
Badlop
b0cc0cdcf9
* src/mod_privacy.erl: Privacy List: deny presence-out all + send
...
presence to: presence is sent (EJAB-255)
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 1881
2009-02-16 16:24:08 +00:00
Badlop
22d87353be
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
...
must provide the password, like other participants (EJAB-867)
SVN Revision: 1880
2009-02-16 15:57:02 +00:00
Badlop
f6ddd8bc5b
* src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
...
linkifying only a few known protocols (EJAB-850)
SVN Revision: 1879
2009-02-16 15:32:54 +00:00
Badlop
2bd54854ec
* src/mod_muc/mod_muc.erl: Export function to create MUC
...
room (thanks to Eric Cestari) (EJAB-729)
SVN Revision: 1878
2009-02-16 15:24:40 +00:00
Badlop
b0e749eca5
* src/mod_roster.erl: When account is deleted, cancel presence
...
subscription for all roster items (EJAB-790)
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 1877
2009-02-16 14:49:20 +00:00
Badlop
d0f1300a84
* src/web/ejabberd_http_poll.erl: Allow configuration of session
...
timeout, using new global option http_poll_timeout (EJAB-135)
* doc/guide.tex: Document new option
* doc/guide.html: Likewise
SVN Revision: 1876
2009-02-14 09:03:26 +00:00
Badlop
70e431787e
* src/ejabberd_listener.erl: Report error at startup if a listener
...
module isn't available or is not an ejabberd listener (EJAB-868)
SVN Revision: 1875
2009-02-13 23:52:24 +00:00
Badlop
d0fc8fe056
* src/mod_shared_roster.erl: Fix bug: a pending subscription
...
request, and later the requester added to the roster due to a
shared roster group, that request could neither be accepted or
rejected (thanks to Brian Cully)(EJAB-869)
SVN Revision: 1874
2009-02-13 23:01:41 +00:00
Badlop
a06bffa413
* src/web/ejabberd_web_admin.erl: Show big integers with comma
...
separators for easy reading
SVN Revision: 1873
2009-02-13 22:13:34 +00:00
Badlop
3524172856
* src/ejabberd_system_monitor.erl: Allow parametrizable watchdog
...
threshold: option watchdog_large_heap or chatting with the
watchdog bot (EJAB-545)
* src/ejabberd_config.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1872
2009-02-13 19:27:56 +00:00
Christophe Romain
d1001a99c2
prevent from calling get_vh_registered_users/2 when not available
...
SVN Revision: 1869
2009-02-13 13:28:10 +00:00
Christophe Romain
bb13c9e8ab
fix delete-items issue and manage-affiliations typo
...
SVN Revision: 1868
2009-02-09 13:37:58 +00:00
Badlop
ec31aef6cb
* src/mod_pubsub/mod_pubsub.erl: The table pubsub_node in ejabberd
...
older than 2.0.2 had indexes for parentid and type. This is not
required since ejabberd 2.0.2, so those indexes can be
deleted. (EJAB-669)
SVN Revision: 1864
2009-02-05 21:23:16 +00:00
Badlop
e321a241b7
* src/Makefile.in: Fix arguments to Install program
...
SVN Revision: 1860
2009-02-03 10:25:06 +00:00
Badlop
aab07df37b
* src/web/ejabberd_web_admin.erl: Calls to the hook
...
webadmin_menu_node provide the node as first argument, and calls
to webadmin_menu_hostnode provide both the host and the node. Fix
call to make_menu_items, because webadmin_menu_node was called in
cases where webadmin_menu_hostnode should be called. Align to
right some table elements.
SVN Revision: 1859
2009-02-02 10:12:44 +00:00
Evgeniy Khramtsov
e790ceea60
* src/eldap/eldap.erl: moves waiting for response queries to
...
pending queue on an LDAP connection failure.
SVN Revision: 1856
2009-01-30 15:22:18 +00:00
Evgeniy Khramtsov
8530e628b4
* src/eldap/eldap.erl: implemented queue for pending queries.
...
SVN Revision: 1855
2009-01-27 13:24:18 +00:00
Evgeniy Khramtsov
e2fa195e20
* src/eldap/eldap.erl: Close a connection on tcp_error.
...
SVN Revision: 1851
2009-01-23 07:28:49 +00:00
Badlop
ee1140483c
* src/odbc/mysql.sql: Fix complain about comment syntax
...
* src/odbc/pg.sql: Likewise
SVN Revision: 1850
2009-01-23 00:10:00 +00:00
Badlop
d0273f4630
* doc/api/process-one.css: Add some style to HTML elements
...
* src/ejabberd_listener.erl: Fix EDoc errors
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 1843
2009-01-21 19:49:26 +00:00
Badlop
b9caf7e610
* src/ejabberd_hooks.erl: Explanation in EDoc of some functions
...
SVN Revision: 1842
2009-01-21 17:36:28 +00:00
Badlop
3e2048ace9
* src/Makefile.in: The path to the installed copy of ejabberd
...
Guide is set in the environment variable
EJABBERD_DOC_PATH (EJAB-837).
* src/web/ejabberd_web_admin.erl: Likewise
* src/ejabberdctl.template: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1835
2009-01-20 19:42:08 +00:00
Badlop
2e511c78af
* src/mod_privacy.erl: Only run roster_get_jid_info if privacy
...
list has subscription or group (thanks to George Hazan)(EJAB-851).
Sort items in privacy list by order before storing (EJAB-848)
* src/mod_privacy.hrl: Likewise
* src/mod_privacy_odbc.erl: Likewise
SVN Revision: 1834
2009-01-20 17:34:58 +00:00
Mickaël Rémond
579e1972d5
* src/ejabberd_c2s.erl: Added comments.
...
SVN Revision: 1823
2009-01-17 16:33:35 +00:00
Badlop
43e12a3702
* src/mod_privacy.erl: Privacy list items must be processed in the
...
specified order (EJAB-848)
* src/mod_privacy_odbc.erl: Likewise
SVN Revision: 1822
2009-01-16 16:06:21 +00:00
Mickaël Rémond
d041c1127d
* src/tls/Makefile.win32: Windows compilation support.
...
* src/tls/tls_drv.c: Likewise.
* src/tls/stdint.h: Likewise.
SVN Revision: 1816
2009-01-13 16:33:17 +00:00
Badlop
52930b77d8
* src/msgs/pl.po: Fix typo (thanks to Apag0r)(EJAB-844)
...
SVN Revision: 1814
2009-01-12 23:47:07 +00:00
Badlop
43a98ab69b
* src/web/ejabberd_web_admin.erl: Use textareas for large input
...
like ejabberd module options and listening port options. Show
result of POST more clearly. Ensure access rules are shown with
some minimum separation. Improve menu headers. (EJAB-562)
* src/web/ejabberd_web_admin.hrl: Likewise
* src/mod_offline.erl: Likewise
* src/mod_offline_odbc.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
* src/mod_shared_roster.erl: Likewise
SVN Revision: 1813
2009-01-12 21:48:34 +00:00
Badlop
ba2eb35590
* src/ejabberd_listener.erl: New way to configure IP address and
...
IP version of listener. Support for definition of IP address in
string format, and implicit definition of IP
version (EJAB-388). Support for defining several listeners: all
with same port number but different IP addresses (EJAB-389)(thanks
to Fabrice Colliot and Sergei Golovan). Better report in WebAdmin
of problem when starting a listener. The old configuration method
of ip tuple and inet6 is fully supported for backwards
compatibility, but is not documented in the Guide anymore.
* src/ejabberd_config.erl: Likewise
* src/mod_proxy65/mod_proxy65_stream.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise
* doc/guide.tex: Document the new way to configure IP address and
IP version of listener, undocument options ip and inet6
* doc/guide.html: Likewise
SVN Revision: 1812
2009-01-12 20:03:02 +00:00
Badlop
55db20d4b7
* src/web/ejabberd_web_admin.erl: New appearance of WebAdmin logo,
...
fixed logo-fill.
SVN Revision: 1811
2009-01-12 19:24:25 +00:00
Badlop
b3328c08a6
* doc/guide.tex: Fix some English strings: JID -> Jabber ID;
...
jabberd 1.4 -> jabberd14; commited -> committed
* src/*/*.erl: Likewise
* src/msgs/*.msg: Likewise
* src/msgs/*.po: Likewise
SVN Revision: 1810
2009-01-12 18:41:46 +00:00
Alexey Shchepin
562e6c8d39
* src/odbc/ejabberd_odbc.erl: Fixed processing of UPDATE results
...
with pgsql
SVN Revision: 1808
2009-01-12 18:15:49 +00:00
Badlop
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
Christophe Romain
1ac9246a49
prevent unauthorized entity to gain none-affiliation for given entity
...
SVN Revision: 1802
2009-01-11 04:08:10 +00:00
Christophe Romain
8090011126
fix previous partial patch (EJAB-840)
...
SVN Revision: 1799
2009-01-11 01:45:24 +00:00
Christophe Romain
c170783a49
fix owners cache and fix unsubscribe permissions (EJAB-840)
...
SVN Revision: 1797
2009-01-11 01:41:06 +00:00
Christophe Romain
38dcae1fc8
fix unsubscription of full jid subscribed node (EJAB-839)
...
SVN Revision: 1794
2009-01-10 13:38:10 +00:00
Badlop
eaa1644ebd
* src/mod_configure.erl: Fix access check for vhost configuration
...
SVN Revision: 1787
2009-01-09 00:39:57 +00:00
Mickaël Rémond
f0af10e600
* src/ejabberd_listener.erl: Define send timeout option to avoid blocking on socket send (EJAB-746).
...
* src/ejabberd_s2s_out.erl: Likewise.
SVN Revision: 1784
2009-01-08 20:49:16 +00:00
Christophe Romain
a1f0ad3300
apply delete-any feature
...
SVN Revision: 1783
2009-01-08 18:45:59 +00:00
Christophe Romain
967bbe7f03
fix EJAB-701 and EJAB-836
...
SVN Revision: 1779
2009-01-08 14:06:35 +00:00
Badlop
14bc7cf77f
* src/mod_roster.erl: Show hyperlinks to local contacts when
...
browsing roster of account in Web Admin (EJAB-480)
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 1778
2009-01-07 01:38:45 +00:00
Badlop
9f80ec4fb6
* src/web/ejabberd_web_admin.erl: WebAdmin serves Guide and links
...
to related sections; the path to guide.html can be configured with
option doc_path (EJAB-837)
* src/web/ejabberd_web_admin.hrl: Likewise
* src/mod_shared_roster.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1777
2009-01-07 00:55:02 +00:00
Badlop
a0d48c63a3
* src/msgs/ru.po: Fix typo (thanks to Dominges)
...
* src/msgs/ru.msg: Likewise
SVN Revision: 1776
2009-01-06 15:09:53 +00:00
Alexey Shchepin
b1252f837f
* src/tls/tls_drv.c: Added a flag to avoid certificate validation
...
* src/tls/tls.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 1774
2009-01-05 17:21:10 +00:00
Badlop
91a7110941
* src/*.erl: Fix EDoc comments
...
SVN Revision: 1771
2009-01-03 21:29:54 +00:00
Christophe Romain
01d761a901
PubSub: Added access-whitelist and member-affiliation features (EJAB-780)
...
SVN Revision: 1768
2009-01-03 00:55:05 +00:00
Christophe Romain
e710a24860
PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix
...
SVN Revision: 1766
2009-01-03 00:25:40 +00:00
Mickaël Rémond
1f57a380c8
* src/ejabberd_c2s.erl: Remove useless comment and port Alexey fix to 2.0.x branch.
...
SVN Revision: 1764
2008-12-29 12:06:34 +00:00
Alexey Shchepin
df478a8e90
* src/ejabberd_c2s.erl: Bugfix in "from" attribute checking
...
SVN Revision: 1763
2008-12-29 11:11:37 +00:00
Evgeniy Khramtsov
5a5ab955cb
* src/odbc/odbc_queries.erl: replaced string:join/2 function.
...
Removed ugly "catch" statement from update_t/4.
WARNING: this change requires last version of mysql driver.
You can update it from ejabberd-modules repository.
SVN Revision: 1762
2008-12-29 09:26:20 +00:00
Evgeniy Khramtsov
85fdf7cb25
* src/odbc/ejabberd_odbc.erl: Print meaningful error message when
...
an SQL transaction exceeds number of restarts. Also rollbacks
this transaction to prevent deadlocks.
SVN Revision: 1761
2008-12-29 04:21:27 +00:00
Mickaël Rémond
707aa4fb8c
* src/ejabberd_c2s.erl: We should allow use of bare resource in from by the client (partially revert r1727) (EJAB-812)
...
SVN Revision: 1759
2008-12-28 12:15:51 +00:00
Badlop
1944aa097f
Use inet:gethostbyname instead of inet_res:getbyname
...
SVN Revision: 1758
2008-12-26 18:36:53 +00:00
Badlop
394245620e
* src/web/ejabberd_web_admin.erl: Show in ejabberd Web Admin the
...
connection method and connected node of Jabber clients (thanks to
Oleg Palij)(EJAB-319)
SVN Revision: 1757
2008-12-26 12:44:54 +00:00
Badlop
682909e0fc
* src/ejabberd_config.erl: Option outgoing_s2s_options to define
...
s2s outgoing behaviour: IPv4, IPv6 and timeout (thanks to Stephan
Maka)(EJAB-665)
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_socket.erl: Likewise
* src/ejabberd.cfg.example: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1756
2008-12-26 11:45:08 +00:00
Evgeniy Khramtsov
11825e7a33
* src/odbc/ejabberd_odbc.erl: get rid of SERIALIZABLE isolation level on MySQL connections.
...
* src/odbc/odbc_queries.erl: replaces all delete->insert chains with update->insert.
* src/mod_privacy_odbc.erl: moved sql queries to odbc_queries.erl.
* src/mod_roster_odbc.erl: changed interface for odbc_queries.erl.
SVN Revision: 1755
2008-12-26 09:38:54 +00:00
Badlop
594bc36ce5
* src/aclocal.m4: Fixes in configure script: fix
...
disable-disable_zlib and disable-pam; in case of problems, PAM
verification aborts with error instead of warning. (EJAB-787)
* src/configure.ac: Likewise
* src/configure: Likewise
SVN Revision: 1754
2008-12-24 12:03:13 +00:00
Badlop
7808dc11af
* src/acl.erl: New ACL: shared_group (thanks to Maxim Ryazanov)
...
* doc/guide.tex: Likewise
* src/mod_shared_roster.erl: Push new group members when
registered or manually added to group: EJAB-730 EJAB-731 EJAB-732
EJAB-767 EJAB-794. When user is added to group, push it to other
members, and other members to it. When user is removed from group,
push deletion to other members, and other members to it. When user
is registered, push him to members of group @all@. When user is
deleted, push deletion to members of group @all@. Document several
functions in mod_shared_roster.
* src/ejabberd_auth.erl: Rename hook user_registered to
register_user, for name consistency with the widely used hook
remove_user. Run hook register_user in ejabberd_auth, so it's run
when account is created with any method. Run hook remove_user in
ejabberd_auth, so it's run when account is deleted with any
method.
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
* src/mod_register.erl: Likewise
SVN Revision: 1752
2008-12-23 19:15:33 +00:00
Badlop
35b1e2885e
* src/jlib.erl: Implementation of XEP-0059 Result Set
...
Management (thanks to Eric Cestari)(EJAB-807)
* src/jlib.hrl: Likewise
* src/mod_muc/mod_muc.erl: Likewise
SVN Revision: 1750
2008-12-23 13:04:42 +00:00
Christophe Romain
17cbd1614a
typo fix
...
SVN Revision: 1748
2008-12-23 10:53:06 +00:00
Christophe Romain
4d20367a0c
make caps store only required user_caps_default
...
SVN Revision: 1747
2008-12-23 10:51:44 +00:00
Christophe Romain
5adfcfad7a
Improve handling of PEP sent to external contacts (EJAB-825)
...
SVN Revision: 1745
2008-12-23 10:20:34 +00:00
Badlop
42036d8f68
* src/mod_last.erl: Implement workaround for uptime statistic in
...
32 bit machines, so it can show uptime greater than 50
days (EJAB-610)
* src/mod_last_odbc.erl: Likewise
* src/ejabberd_config.erl: Store start time in local_config table
SVN Revision: 1744
2008-12-23 01:34:52 +00:00
Badlop
af2fa5b5f5
* src/cyrsasl_digest.erl: Check digest-uri in SASL digest
...
authentication (thanks to Paul Guyot)(EJAB-569)
SVN Revision: 1743
2008-12-23 01:02:44 +00:00
Badlop
74f15f790a
* src/odbc/odbc_queries.erl: Fix removal of private_storage of an
...
account when the account is removed
* src/mod_privacy.erl: Remove privacy lists of an account when the
account is removed (EJAB-720)
* src/mod_privacy_odbc.erl: Likewise
SVN Revision: 1742
2008-12-23 00:48:09 +00:00
Christophe Romain
4469880c2e
Fix send_last_published_item issue when running on clustered table (EJAB-793)
...
SVN Revision: 1740
2008-12-20 00:00:24 +00:00
Christophe Romain
c0fb556a01
Check option of the nodetree instead of checking configuration
...
SVN Revision: 1737
2008-12-18 13:45:46 +00:00
Badlop
8f43867091
* src/mod_pubsub/mod_pubsub.erl: Fix update pubsub tables from
...
ejabberd 1.x to 2.x (EJAB-817)
SVN Revision: 1734
2008-12-16 17:44:48 +00:00
Badlop
867ce5be32
* doc/guide.tex: Fix capitalization of some section titles
...
* doc/guide.tex: Mention as optional Requirements: mysql, pgsql
and pam
* src/ejabberd_admin.erl: Command reopen-log must also rotate
sasl.log (thanks to Alexander Tsvyashchenko)(EJAB-711)
* src/ejabberd_logger_h.erl: Export the function rotate_log/1
* doc/guide.tex: Improve explanation of log files rotation
* doc/guide.tex: Improve explanation of watchdog admins
option: only useful for developers (EJAB-816)
* src/ejabberd.cfg.example: Likewise
* doc/guide.tex: Say 'higher' instead of 'newer' in requirements
* README: Likewise
* doc/guide.tex: Simplify example mod_muc configuration
SVN Revision: 1732
2008-12-16 17:36:34 +00:00
Christophe Romain
a800ac5a4e
fix get_item_name deadlock on transaction
...
SVN Revision: 1728
2008-12-15 19:55:35 +00:00
Alexey Shchepin
620cbc765c
* src/ejabberd_c2s.erl: Bugfix in "from" attribute checking
...
SVN Revision: 1727
2008-12-12 13:08:00 +00:00
Christophe Romain
6e5a32308a
fix typo bug injected in r1712
...
SVN Revision: 1724
2008-12-09 22:42:01 +00:00
Christophe Romain
e8635b99c8
prevent publish items with invalid XML schema (EJAB-699)
...
SVN Revision: 1722
2008-12-09 22:02:47 +00:00
Christophe Romain
07e9ad307e
cosmetic change (intentation and spaces)
...
SVN Revision: 1719
2008-12-08 23:28:50 +00:00
Christophe Romain
23ce0b312d
remove pubsub_state record when unsubscribing node without affiliation (EJAB-776)
...
SVN Revision: 1717
2008-12-08 21:47:50 +00:00
Christophe Romain
dceb817853
reply to suscriptions options queries with unsupported feature error (EJAB-713)
...
SVN Revision: 1716
2008-12-08 21:17:46 +00:00
Christophe Romain
c443ee4f4a
several pubsub improvements
...
SVN Revision: 1715
2008-12-08 19:50:50 +00:00
Christophe Romain
e2d8154a80
Reduce memory consumption due to caps handling
...
SVN Revision: 1712
2008-12-08 14:10:55 +00:00
Mickaël Rémond
4618ec1fef
* src/ejabberd_c2s.erl: Enforce client stanza from attribute (EJAB-812).
...
* src/jlib.erl: Likewise.
SVN Revision: 1706
2008-12-08 09:21:36 +00:00
Badlop
8e32cc11cb
Fix default value of default_room_options (thanks to Aleksey Shchepin)
...
SVN Revision: 1702
2008-12-03 15:06:21 +00:00
Jérôme Sautret
9e679aa621
* src/odbc/ejabberd_odbc.erl: close MySQL connections on terminate (needs mysql r829)
...
SVN Revision: 1700
2008-12-03 10:58:19 +00:00
Badlop
bc9ba75c2b
No need to define default value of history field because it is explicitely set when the record is created
...
SVN Revision: 1699
2008-12-02 19:45:39 +00:00
Badlop
f124bb3d10
* src/mod_muc/mod_muc_room.erl: Move definitions to header file
...
* src/mod_muc/mod_muc_room.hrl: New header file
* src/Makefile.in: Likewise
SVN Revision: 1698
2008-12-02 19:23:12 +00:00
Badlop
7348f4a553
Remove debug line from SVN r1685
...
SVN Revision: 1689
2008-11-28 19:51:30 +00:00
Alexey Shchepin
964cb84864
* src/mod_muc/mod_muc_room.erl: Clean user activity after timeout
...
(EJAB-804)
SVN Revision: 1688
2008-11-28 16:06:39 +00:00
Badlop
78b90e9300
* src/ejabberdctl.template: Fix detection of ejabberdctl.cfg path
...
SVN Revision: 1687
2008-11-26 18:02:41 +00:00
Badlop
340562e452
* src/mod_irc/mod_irc.erl: Announce disco#info (thanks to Spike)
...
* src/mod_muc/mod_muc.erl: Announce disco#info disco#items
* src/mod_proxy65/mod_proxy65_service.erl: No announce disco#items
* src/mod_pubsub/mod_pubsub.erl: Announce disco#info disco#items
* src/mod_vcard.erl: Announce disco#info
SVN Revision: 1686
2008-11-26 16:04:27 +00:00
Badlop
6a785fa536
* src/gen_mod.erl: First store module options in ETS and Mnesia,
...
then start the module. In case of failure, remove options from
ETS. Until now the module was started before the options were
stored in database, and some modules started incorrectly because
they couldn't access the options from database; for instance
mod_muc_room required this for reading max_users option.
* src/mod_muc/mod_muc_room.erl: Include the value of max_users
service option and the current max_users room option in the list
of allowed room limit values.
SVN Revision: 1685
2008-11-26 15:10:38 +00:00
Christophe Romain
e68a731219
pubsub/pep: get_node_affiliations resultset bugfix
...
SVN Revision: 1684
2008-11-25 23:05:26 +00:00
Evgeniy Khramtsov
11e5617efc
* src/eldap/Makefile.in: added +optimize and +driver
...
compilation options
* src/eldap/Makefile.win32: Likewise
SVN Revision: 1682
2008-11-24 13:27:04 +00:00
Mickaël Rémond
cc858469ec
* src/ejabberdctl.template: Added the ability to define the --config-dir option.
...
SVN Revision: 1681
2008-11-23 16:41:50 +00:00
Alexey Shchepin
c2d81c59b6
* src/ejabberd_receiver.erl: Hibernate after timeout
...
* src/ejabberd_frontend_socket.erl: Likewise
SVN Revision: 1680
2008-11-23 09:43:52 +00:00
Badlop
91b328b7d5
URL path should be tokenized by / and then decoded (EJAB-786).
...
SVN Revision: 1679
2008-11-12 10:03:27 +00:00
Badlop
9f110a6352
* src/web/ejabberd_http.erl: Include recognized headers in
...
request_headers as atoms, and others as strings (EJAB-778)
SVN Revision: 1678
2008-11-12 09:58:28 +00:00
Alexey Shchepin
4709ed58aa
* src/tls/tls_drv.c: Don't create a SSL context on every
...
connection and disable SSLv2 on outgoing connections (EJAB-781)
SVN Revision: 1675
2008-11-10 14:32:51 +00:00
Mickaël Rémond
10e3f2cf92
* src/ejabberd_s2s_out.erl: exports the DNS resolution function.
...
SVN Revision: 1674
2008-11-08 17:50:54 +00:00
Badlop
02d68146bd
* src/extauth.erl: When the extauth call fails or timeouts, deny
...
authorization. Use two timeouts: 60s for script initialization and
10s for regular calls. (thanks to Kevin Crosbie from
Ravenpack) (EJAB-627)
SVN Revision: 1673
2008-11-06 15:36:49 +00:00
Alexey Shchepin
8cdebd485a
* src/ejabberd_c2s.erl: Disable zlib when STARTTLS is required
...
SVN Revision: 1672
2008-11-03 13:54:42 +00:00
Badlop
f032cf3380
* src/Makefile.in (clean-local): Delete also ejabberdctl.example
...
SVN Revision: 1671
2008-10-27 12:19:06 +00:00
Badlop
ff6891cdd0
* src/translate.erl: When a translation file can't be loaded, show
...
detailed error message
SVN Revision: 1669
2008-10-24 22:16:17 +00:00
Badlop
9d521c9dd0
* src/ejabberd_ctl.erl: If ejabberd didn't start correctly:
...
'ejabberdctl status' suggests to look in log files; any other
ejabberdctl command shows 'status'.
SVN Revision: 1668
2008-10-24 22:11:42 +00:00
Badlop
9e55a1291a
* src/ejabberd_app.erl: Open ejabberd.log sooner, so errors during
...
ejabberd initialization are logged in that file (EJAB-777). Write
a log message when ejabberd finishes the start or stop.
SVN Revision: 1667
2008-10-24 22:07:38 +00:00
Badlop
426e75a298
* src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
...
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
* src/mod_shared_roster.erl: Likewise
SVN Revision: 1666
2008-10-24 18:01:08 +00:00
Badlop
cdcf2d380b
* src/ejabberd_lstener.erl: Fix listeners
...
* src/ejabberd_sup.erl: Likewise
* src/gen_mod.erl: Likewise
SVN Revision: 1665
2008-10-24 17:26:11 +00:00
Alexey Shchepin
7181957506
* src/ejabberd_frontend_socket.erl: Fixed SSL sockets
...
SVN Revision: 1664
2008-10-23 14:59:49 +00:00
Badlop
5264d9299d
* src/Makefile.in: docdir should be prefixed with DESTDIR (thanks
...
to Jack Moffitt)(EJAB-775)
SVN Revision: 1662
2008-10-17 17:37:50 +00:00
Christophe Romain
f6e2a58772
does not write item when max_items set to 0 (solves EJAB-768)
...
SVN Revision: 1661
2008-10-17 00:43:58 +00:00
Christophe Romain
0083e56c22
fix remove_user not unsubscribing user (EJAB-684)
...
SVN Revision: 1659
2008-10-16 23:09:51 +00:00
Christophe Romain
a910c4baa1
fix badarg issue on get_roster_info when allowed roster groups is not defined
...
SVN Revision: 1656
2008-10-16 22:12:05 +00:00
Christophe Romain
9a71d6b87a
fix pubsub_publish_item hook ServerHost parameter (EJAB-772)
...
SVN Revision: 1655
2008-10-14 12:41:46 +00:00
Jérôme Sautret
7c736a5ea0
* src/odbc/ejabberd_odbc.erl: log MySQL driver messages.
...
SVN Revision: 1652
2008-10-13 15:25:30 +00:00
Badlop
6bd76ebfda
Replace mentions of mod_xmlrpc to ejabberd_xmlrpc
...
SVN Revision: 1645
2008-10-13 09:01:08 +00:00
Badlop
fa18b35df5
* src/web/ejabberd_web_admin.erl: When requesting page of
...
nonexistent user, show 'Not Found' page (EJAB-771)
SVN Revision: 1644
2008-10-13 08:32:04 +00:00
Badlop
2af52abdba
* src/web/ejabberd_web_admin.erl: Run new hook
...
webadmin_user_parse_query when POST in web admin user
page (thanks to Oleg Palij)(EJAB-747)
* src/mod_offline.erl: Add button "Remove All Offline Messages" in
a user page (thanks to Oleg Palij)(EJAB-747)
* src/mod_offline_odbc.erl: Likewise
SVN Revision: 1643
2008-10-12 14:16:05 +00:00
Badlop
42115a8cfb
* src/web/ejabberd_web_admin.erl: Improve Web Admin navigation
...
menu for vhosts and nodes (EJAB-734)
SVN Revision: 1642
2008-10-12 13:58:05 +00:00
Badlop
04981b5e44
* src/mod_configure.erl: Update calls from ctl to
...
commands (EJAB-694)
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 1640
2008-10-12 12:05:31 +00:00
Badlop
3bfe585364
* src/ejabberd_sm.erl: Update from ctl to commands (EJAB-694)
...
* src/ejabberd_s2s.erl: Likewise
SVN Revision: 1639
2008-10-12 12:04:10 +00:00
Badlop
d5c3006136
* src/ejabberd_auth.erl: Update from ctl to commands (EJAB-694)
...
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
SVN Revision: 1638
2008-10-12 12:01:56 +00:00
Badlop
416a939352
* src/ejabberdctl.template: Move help print to a separate
...
function (EJAB-694)
SVN Revision: 1637
2008-10-12 12:00:20 +00:00
Badlop
f2bd87b7cf
* src/ejabberd_ctl.erl: Add frontend support for
...
commands (EJAB-694). Categorization and sorting of commands in
ejabberd_ctl help (EJAB-313). Lines in command line help of length
80, and text formatting (EJAB-473)
SVN Revision: 1636
2008-10-12 11:58:30 +00:00
Badlop
25d1094468
* src/ejabberd_app.erl: Initialize ejabberd_commands and start
...
ejabbed_admin (EJAB-694)
SVN Revision: 1635
2008-10-12 11:56:07 +00:00
Badlop
10ab81f4b4
* src/ejabberd_admin.erl: Implement commands from old
...
ejabberd_ctl (EJAB-694)
SVN Revision: 1634
2008-10-12 11:55:06 +00:00
Badlop
dda582db13
* src/ejabberd_commands.erl: New 'ejabberd commands': separate
...
command definition and calling interface (EJAB-694)
* src/ejabberd_commands.hrl: Likewise
SVN Revision: 1633
2008-10-12 11:53:25 +00:00
Badlop
be2f6e0517
* src/mod_proxy65/mod_proxy65.erl: Update so the listener starts
...
correctly (EJAB-303)
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
SVN Revision: 1632
2008-10-12 11:17:35 +00:00
Badlop
9194c25a4e
* src/ejabberd_app.erl: Start listeners explicitely at server
...
start after everything else (EJAB-303). Implement support in
ejabberd for 'independent listeners', which handle their
connections themselves: gen_tcp:listen, etc.
* src/ejabberd_listener.erl: Likewise
* src/ejabberd_socket.erl: Likewise
* src/ejabberd_sup.erl: Likewise
SVN Revision: 1631
2008-10-12 11:11:29 +00:00
Christophe Romain
b2d21cb71c
fix typo
...
SVN Revision: 1630
2008-10-10 20:27:18 +00:00
Christophe Romain
385a1d3f0f
uncomment pubsub_publish_item hook call (EJAB-765)
...
SVN Revision: 1629
2008-10-10 20:22:18 +00:00
Jérôme Sautret
b65caa82fb
* src/mod_roster_odbc.erl: fix MySQL multiple requests issue.
...
SVN Revision: 1612
2008-10-07 12:32:12 +00:00
Jérôme Sautret
2f8127d343
* src/ejabberd_rdbms.erl: fix SQL database reconnection
...
issues (EJAB-764) and add odbc_start_interval configuration
directive (default to 30 seconds).
* src/odbc/ejabberd_odbc.erl: likewise.
* src/odbc/ejabberd_odbc_sup.erl: likewise.
* doc/guide.tex: likewise.
SVN Revision: 1600
2008-10-06 14:18:46 +00:00
Jérôme Sautret
a2340ea8b8
* src/odbc/odbc_queries.erl: Fix empty query that fail on MySQL.
...
SVN Revision: 1597
2008-10-03 15:42:40 +00:00
Jérôme Sautret
744b827169
* src/mod_vcard_odbc: added vCard support for MS SQL Server 2005 (missing from previous commit)
...
SVN Revision: 1596
2008-10-03 15:30:56 +00:00
Jérôme Sautret
8883e4ad8b
* src/mod_vcard_odbc: added vCard support for MS SQL Server 2005.
...
* src/odbc/odbc_queries.erl: likewise.
* src/odbc/mssql2005.sql: likewise.
SVN Revision: 1595
2008-10-03 15:29:48 +00:00
Mickaël Rémond
3a2fb34a61
* src/mod_shared_roster.erl: Correct roster push when changing a shared roster entry name (EJAB-738).
...
SVN Revision: 1590
2008-10-01 14:52:25 +00:00
Badlop
16a508cdb9
* src/*/Makefile.win32: Provide explicit beam filenames because
...
nmake does not accept wildcards (thanks to Attila
Vangel)(EJAB-543)
SVN Revision: 1588
2008-09-30 16:12:05 +00:00
Christophe Romain
43647c6d50
fix licence header
...
SVN Revision: 1587
2008-09-30 08:58:37 +00:00
Christophe Romain
70dd325aef
EJAB-739 and EJAB-751 improvements
...
SVN Revision: 1576
2008-09-25 17:26:06 +00:00
Mickaël Rémond
eabd25a8bf
* src/mod_configure.erl: Fix adhoc commands reply types for "get-online-users-num" and "get-registered-users-num" (EJAB-756).
...
SVN Revision: 1569
2008-09-22 16:08:37 +00:00
Badlop
81c70c347f
Fix: provide the port as an integer, not string (EJAB-560)
...
SVN Revision: 1562
2008-09-12 14:31:04 +00:00
Badlop
e9d62b39ef
* src/web/ejabberd_http.hrl: Provide Host, Port, Headers and
...
Transfer Protocol in request (thanks to Eric Cestari)(EJAB-560)
* src/web/ejabberd_http.erl: Likewise
SVN Revision: 1561
2008-09-12 11:45:16 +00:00
Mickaël Rémond
b6a706756e
* src/odbc/mssql2000.sql: Script for MSSQL 2000
...
* src/odbc/mssql2005.sql: Script for MSSQL 2005
* src/odbc/mssql.sql: removed
SVN Revision: 1558
2008-09-02 14:14:42 +00:00
Christophe Romain
11788b2953
send last published events now supports PEP events from unavailable users nodes (EJAB-698)
...
SVN Revision: 1550
2008-08-27 09:28:47 +00:00
Christophe Romain
0832ad392d
get_items bugfix (EJAB-716)
...
SVN Revision: 1542
2008-08-25 22:54:48 +00:00
Christophe Romain
11f74201ab
Prevent case_clause error when ejabber_odbc:sql_query returns {error, Reason}
...
SVN Revision: 1540
2008-08-25 13:36:34 +00:00
Christophe Romain
5c9069d677
Prevent case_clause error when ejabber_odbc:sql_query returns {error, Reason}
...
SVN Revision: 1538
2008-08-25 13:12:23 +00:00
Badlop
2d226b39bf
* src/ejabberd_check.erl: Detect correctly MSSQL and ODBC
...
configuration (EJAB-710)
SVN Revision: 1536
2008-08-25 12:08:22 +00:00
Geoff Cant
35ed848fe8
EJAB-624: fixes mod_muc_room:is_visitor/2 to use get_role not get_affiliation
...
SVN Revision: 1534
2008-08-23 23:17:17 +00:00
Badlop
d08b1c62bb
* src/ejabberd_router.erl: Fix call to mnesia match_object
...
SVN Revision: 1533
2008-08-22 11:35:32 +00:00
Badlop
e37723f4a2
* src/mod_muc/mod_muc_log.erl: MUC log files options: plaintext
...
format; filename with only room name (EJAB-596)
* doc/guide.tex: Document both options
* doc/guide.html: Likewise
SVN Revision: 1531
2008-08-18 19:08:30 +00:00
Badlop
4ae1bda33f
* src/mod_register.erl: Change password using mod_register always
...
returns success regardless of real result (EJAB-723)
* src/ejabberd_auth.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
SVN Revision: 1530
2008-08-18 18:21:10 +00:00
Christophe Romain
7b1547b2bd
Fix call to unexported function nodetree_default:get_subnodes/2
...
SVN Revision: 1529
2008-08-18 10:29:04 +00:00
Badlop
61a639d5d9
* contrib/extract_translations/extract_translations.erl: Use
...
Gettext PO for translators, export to ejabberd MSG (EJAB-468)
* contrib/extract_translations/prepare-translation.sh: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
* src/Makefile.in: New option 'make translations'
* src/msgs/ejabberd.pot: Template translation file
* src/msgs/*.po: Generated from old MSG files
* src/msgs/*.msg: Automatic exported from PO files
SVN Revision: 1527
2008-08-17 16:35:58 +00:00
Badlop
bf9377e9a6
* src/msgs/sv.msg: Fixed formatting typos
...
SVN Revision: 1526
2008-08-16 12:06:13 +00:00
Badlop
2660be962a
* src/gen_mod.erl: Export stop_module_keep_config/2 (EJAB-706)
...
SVN Revision: 1525
2008-08-16 12:03:21 +00:00
Badlop
422d34ddaf
* src/msgs/sk.msg: Updated (thanks to Marek Becka)
...
SVN Revision: 1519
2008-08-11 00:48:57 +00:00
Badlop
80e925d71d
* src/msgs/eo.msg: Updated (thanks to Andreas van Cranenburgh)
...
* src/msgs/nl.msg: Updated (thanks to Andreas van Cranenburgh)
* src/msgs/sv.msg: Updated (thanks to Thore Alstromer and Heysan)
SVN Revision: 1518
2008-08-10 11:40:41 +00:00
Badlop
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
Badlop
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
Jérôme Sautret
60308df929
* src/odbc/ejabberd_odbc.erl: Restart the database connection when it's lost or it reaches timeout. Set transaction isolation level to SERIALIZABLE when establishing connection.
...
SVN Revision: 1510
2008-08-04 13:41:16 +00:00
Badlop
3a5fb23427
* src/web/ejabberd_http.erl: Temporary solution for check of
...
packet size when HTTPS (EJAB-611)(EJAB-507)(EJAB-574)
SVN Revision: 1502
2008-08-01 08:50:19 +00:00
Badlop
91339fa8f0
* src/msgs/uk.msg: Fix: each string in a single line
...
* src/msgs/wa.msg: Likewise
* src/msgs/es.msg: Fix typo
* src/msgs/gl.msg: Likewise
* src/msgs/pt-br.msg: Likewise
* src/msgs/zh.msg: Fix some translations (thanks to Zhan Caibao)
* src/msgs/ca.msg: Updated (thanks to Badlop)
* src/msgs/cs.msg: Updated (thanks to Lukas Poliuvk)
* src/msgs/de.msg: Updated (thanks to Nikolaus Polak)
* src/msgs/es.msg: Updated (thanks to Badlop)
* src/msgs/fr.msg: Updated (thanks to Christophe Romain)
* src/msgs/it.msg: Updated (thanks to Luca Brivio)
* src/msgs/ja.msg: Updated (thanks to Tsukasa Hamano)
* src/msgs/no.msg: Updated (thanks to Stian B. Barmen)
* src/msgs/pl.msg: Updated (thanks to Zbyszek Zolkiewski)
* src/msgs/pt-br.msg: Updated (thanks to Otavio Fernandes)
* src/msgs/ru.msg: Updated (thanks to Evgeniy Khramtsov)
* src/msgs/tr.msg: Updated (thanks to Doruk Fisek)
* src/msgs/uk.msg: Updated (thanks to Ruslan Rakhmanin)
* src/msgs/wa.msg: Updated (thanks to Pablo Saratxaga)
* src/msgs/zh.msg: Updated (thanks to Shelley Shyan)
SVN Revision: 1501
2008-07-31 18:07:44 +00:00
Badlop
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
Badlop
756cd06625
* src/mod_muc/mod_muc_room.erl: Support Reasons for all
...
affiliation and role changes (EJAB-306)
SVN Revision: 1498
2008-07-30 18:24:08 +00:00
Badlop
2660bc514f
* src/gen_mod.erl: When ejabberd is kindly stopped, don't forget
...
modules configuration (EJAB-706)
* src/ejabberd_app.erl: Likewise
SVN Revision: 1497
2008-07-30 18:11:14 +00:00
Christophe Romain
c68baa953e
Speedup startup with many pubsub nodes (EJAB-669)
...
SVN Revision: 1491
2008-07-25 09:12:44 +00:00
Badlop
1e11525405
* src/mod_proxy65/mod_proxy65_lib.erl: Send protocol compliant
...
SOCKS5 reply; this breaks support of uncompliant Psi<0.10 (thanks
to Felix Geyer)(EJAB-632)
* src/mod_proxy65/mod_proxy65_stream.erl: Likewise
SVN Revision: 1488
2008-07-24 18:03:28 +00:00
Badlop
ce9902da72
* src/mod_register.erl: When a registration is blocked due to IP
...
limitation, return description in error stanza (EJAB-692)
SVN Revision: 1487
2008-07-24 17:49:37 +00:00
Christophe Romain
55cfcafd92
allow owner to subscribe/get its one node (EJAB-705)
...
SVN Revision: 1486
2008-07-24 14:07:05 +00:00
Geoff Cant
135da533fd
Altering XForms text for allow_visitor_status mod_muc_room option. (EJAB-624)
...
SVN Revision: 1480
2008-07-23 17:45:23 +00:00
Geoff Cant
c7d45af0aa
mod_muc_room allow_visitor_presence option rename (now allow_visitor_status). (EJAB-624)
...
SVN Revision: 1478
2008-07-23 16:55:46 +00:00
Geoff Cant
2c3260d07b
Renaming allow_visitor_presence to allow_visitor_status (EJAB-624).
...
allow_visitor_status when false will strip status message tags from visitor
presence broadcasts in muc rooms.
SVN Revision: 1477
2008-07-23 16:40:17 +00:00
Geoff Cant
e509da74e8
Implementing muc_room visitor presence restrictions. (EJAB-624)
...
SVN Revision: 1475
2008-07-23 12:31:55 +00:00
Christophe Romain
d8dc734d38
subscribing to a node sends only last items (EJAB-700), send_last_items bugfix
...
SVN Revision: 1474
2008-07-23 01:14:02 +00:00
Christophe Romain
7a49880ffc
pubsub improvement, fixes EJAB-684 EJAB-675 EJAB-663
...
SVN Revision: 1472
2008-07-22 23:41:44 +00:00
Badlop
543fb2d7e4
* src/ejabberd_config.erl: If syntax mistake in config file, show
...
specific error message (EJAB-616)
SVN Revision: 1470
2008-07-22 16:08:57 +00:00
Alexey Shchepin
fb43bb0109
* src/odbc/odbc_queries.erl: Fixed a typo
...
SVN Revision: 1467
2008-07-22 04:17:13 +00:00
Jérôme Sautret
999c81e79c
* src/ejabberd_ctl.erl: Call reopen_log_hook for each virtual host.
...
SVN Revision: 1461
2008-07-18 15:55:39 +00:00
Badlop
1b7a36bf64
* src/mod_muc/mod_muc_room.erl: Fix to allow a server admin to add
...
himself as owner of a room (EJAB-687)
SVN Revision: 1460
2008-07-17 17:32:11 +00:00
Christophe Romain
e361835cea
use -DSSL39 if compiling with R12
...
SVN Revision: 1456
2008-07-16 22:24:03 +00:00
Badlop
be140c1a23
* src/ejabberd_c2s.erl: Put auth_module in Info always (EJAB-549)
...
SVN Revision: 1454
2008-07-16 18:05:46 +00:00
Badlop
970e9e0843
* src/*.hrl: Get back all ejabberd header files to their original
...
placement in src/ subdirectories (EJAB-696)
* src/*/*.erl: Likewise
* src/*/Makefile.in: Likewise
* src/Makefile.in: Install header files in system include/ dir,
reproducing the subdirectory structure of src/
SVN Revision: 1453
2008-07-16 16:58:42 +00:00
Christophe Romain
e0e7797e99
Rolled back the previous IP getting patch, and Report connection's IP address in ejabberd_http_poll
...
SVN Revision: 1450
2008-07-16 12:55:29 +00:00
Badlop
ece37b1dad
* src/ejabberdctl.template: Update environment variable names
...
SVN Revision: 1449
2008-07-16 10:55:50 +00:00
Badlop
0b3f830188
* src/ejabberdctl.template: Small fix so arguments of the command
...
are also passed to erl
SVN Revision: 1447
2008-07-15 21:43:22 +00:00
Badlop
596b2dbe12
Removed testing code
...
SVN Revision: 1444
2008-07-14 10:14:41 +00:00
Badlop
3f87768c8c
* doc/guide.tex: Update what permissions does enable-user grant
...
* doc/guide.html: Likewise
* src/configure.ac: Don't explicitely put root privileges when a
user is not explicitely enabled
* src/configure: Likewise
* src/Makefile.in: Likewise
SVN Revision: 1443
2008-07-14 10:06:13 +00:00
Badlop
d76ca7c65b
* src/Makefile.in: Fix docdir so it recognizes prefix. If sbin dir
...
does not exist, create it. Fix cookiefile permission
check. (EJAB-696)
SVN Revision: 1442
2008-07-13 23:32:54 +00:00
Badlop
f25316c1e7
* src/configure.ac: Update installation permissions (EJAB-402)
...
* src/configure: Likewise
* src/Makefile.in: The mnesia, ebin and priv dirs are now
installed in different locations. Install header files and
documentation (EJAB-696)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
* include/*.hrl: Place for all ejabberd header files (EJAB-696)
* src/*/*.erl: Update references to header files
* src/*/Makefile.in: Include the include/ dir
SVN Revision: 1441
2008-07-13 19:10:01 +00:00
Badlop
6134205383
Install ejabberdctl in /sbin as usual because it is a daemon, not a user program.
...
SVN Revision: 1440
2008-07-12 23:08:01 +00:00
Badlop
871d1dfad6
* src/configure.ac: Allow to execute ejabberd with a normal
...
system user (thanks to Viq)(EJAB-402)
* src/configure: Likewise
* src/ejabberdctl.template: Likewise
* src/Makefile.in: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1439
2008-07-12 22:02:16 +00:00
Badlop
983022438e
* src/configure.ac: Improve legibility
...
* src/aclocal.m4: Likewise
* src/configure: Likewise
* src/ejabberdctl.template: Remove garbage variable. Document node
option
* doc/guide.tex: Add references to sections.
* doc/guide.html: Likewise
SVN Revision: 1438
2008-07-12 21:32:45 +00:00
Badlop
e7b42f9499
* src/mod_register.erl: Revert support for io_lib newline, since
...
there is a standard character that representes newline (EJAB-501)
* doc/guide.tex: Update documentation to explain newline character
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise
SVN Revision: 1436
2008-07-11 13:35:08 +00:00
Badlop
429b7bc169
* src/configure.ac: Don't check for erlang header file (EJAB-232)
...
* src/configure: Likewise
SVN Revision: 1430
2008-07-10 18:09:18 +00:00
Badlop
cd5bc22bdb
* src/configure.ac: Check for erlang header files (EJAB-232)
...
* src/configure: Likewise
SVN Revision: 1429
2008-07-09 21:33:34 +00:00
Badlop
f1f0bb0431
* src/mod_pubsub/mod_pubsub.erl: Fix compilation warnings
...
* src/mod_pubsub/node_zoo.erl: Likewise
* src/mod_shared_roster.erl: Likewise
SVN Revision: 1428
2008-07-09 21:26:25 +00:00
Badlop
a2bed6709c
* src/mod_shared_roster.erl: Allow to get subscribed to a contact
...
that is already in the roster by means of a shared roster group:
add it to another roster group and it gets subscribed
automatically (EJAB-407)
* src/mod_roster.erl: Likewise
SVN Revision: 1427
2008-07-09 19:06:44 +00:00
Badlop
fc911a43ff
* src/mod_muc/mod_muc_log.erl: Fix XHTML compliance: ensure some
...
language is set, include ID attribute in each message, add
microseconds to ensure unique value (EJAB-497)
SVN Revision: 1426
2008-07-09 18:39:41 +00:00
Badlop
1f004c56ac
* src/mod_register.erl: Support for io_lib newline character in
...
the body of welcome_message (EJAB-501)
* doc/guide.tex: Document the newline character
* src/ejabberd.cfg.example: Example usage of newline character
SVN Revision: 1425
2008-07-09 17:53:56 +00:00
Badlop
e3ba72f3dd
* src/ejabberd_config.erl (load_file): error message on sasl.log
...
is not flattened (EJAB-616)
SVN Revision: 1424
2008-07-09 16:08:32 +00:00
Christophe Romain
92ce9af092
typo fix
...
SVN Revision: 1418
2008-07-08 10:31:47 +00:00
Christophe Romain
f74fb8ea2d
improve ip fetching patch
...
SVN Revision: 1416
2008-07-08 10:19:57 +00:00
Badlop
9626c41817
* src/Makefile.in: Spool, config and log dirs: writtable by owner,
...
readable by group, nothing by others (EJAB-686)
* doc/guide.tex: New section Securing sensible files
* doc/guide.html: Likewise
SVN Revision: 1413
2008-07-07 14:52:47 +00:00
Jérôme Sautret
d5e2002ffa
* src/mod_privacy_odbc.erl: Support for privacy lists in MySQL (thanks to Igor Goryachev)(EJAB-538)
...
SVN Revision: 1409
2008-07-03 16:09:45 +00:00
Christophe Romain
35d25d3420
PubSub improvements, and solves (EJAB-453) (EJAB-608)
...
SVN Revision: 1408
2008-07-03 09:56:31 +00:00
Badlop
2ccf410a75
* src/ejabberd_ctl.erl: Web Admin and Ad-hoc admin: dump only
...
persistent tables (EJAB-678)
SVN Revision: 1387
2008-06-29 11:59:06 +00:00
Badlop
5e25cbcaa9
* src/mod_pubsub/node_pep.erl: Complain if mod_caps disabled and
...
mod_pubsub has PEP plugin enabled (EJAB-677)
SVN Revision: 1386
2008-06-29 11:34:30 +00:00
Badlop
152efbb112
* src/mod_muc/mod_muc_room.erl: Allow to store room
...
description (thanks to Christopher Dupont)(EJAB-670)
SVN Revision: 1385
2008-06-28 17:47:19 +00:00
Badlop
b6fd0a5ca5
* src/web/ejabberd_http.erl: Support PUT and DELETE methods in
...
ejabberd_http (thanks to Eric Cestari)(EJAB-662)
SVN Revision: 1373
2008-06-21 00:19:57 +00:00
Christophe Romain
cf8be23af1
allow get_default on PEP nodes (EJAB-656)
...
SVN Revision: 1364
2008-06-19 09:08:39 +00:00
Badlop
5fdcb52306
* src/ejabberd.app: The ejabberd version number is defined in the
...
OTP application resource file, in the key 'vsn' (EJAB-657)
* src/ejabberd.hrl: The macro VERSION now consults the ejabberd
application key vsn
* src/configure.erl: Load the ejabberd application description
* doc/Makefile: Read ejabberd version from ejabberd.app vsn
* doc/api/Makefile: Likewise
SVN Revision: 1361
2008-06-18 21:33:48 +00:00
Christophe Romain
fe82bf3e81
temporary roster_groups_allowed (EJAB-655)
...
SVN Revision: 1359
2008-06-18 16:35:03 +00:00
Christophe Romain
638d789ae6
pubsub get_default bugfix (EJAB-656)
...
SVN Revision: 1358
2008-06-18 16:19:18 +00:00
Badlop
cbf63d06a8
* src/mod_muc/mod_muc_room.erl: Allow admins to send messages to
...
rooms even if not joined (EJAB-645)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1356
2008-06-13 18:55:26 +00:00
Badlop
e22913d46f
* src/ejabberd.cfg.example: Add registration_timeout (EJAB-653)
...
SVN Revision: 1355
2008-06-13 17:51:01 +00:00
Badlop
ff94e586eb
* src/ejabberd_c2s.erl: Bugfix: deliver messages when first
...
presence is Invisible (thanks to Dariusz Markowicz)(EJAB-262)
SVN Revision: 1348
2008-06-09 23:43:47 +00:00
Badlop
59201f1def
* src/msgs/pl.msg: Bugfix in arguments of translated string that
...
could crash the room (thanks to Anastasia Gornostaeva)
SVN Revision: 1345
2008-06-04 13:21:36 +00:00
Badlop
1e345eb0fc
* src/web/ejabberd_web.erl (make_xhtml/2): Allow to include
...
elements in the HTTP header
SVN Revision: 1344
2008-05-31 18:21:43 +00:00
Badlop
110a4b4518
* src/odbc/odbc_queries.erl (del_user_return_password): Return
...
password (thanks to Oleg Palij)
SVN Revision: 1343
2008-05-31 17:09:13 +00:00
Mickaël Rémond
5e9576ffa3
* src/ejabberd_s2s.erl: Added s2s_send_packet and s2s_receive_packet hooks (EJAB-635).
...
* src/ejabberd_s2s_in.erl: Likewise.
SVN Revision: 1342
2008-05-22 10:53:49 +00:00
Mickaël Rémond
cf42ea0bcb
* src/ejabberd_c2s.erl: user_send_packet hook now called on all packets including presence packets (EJAB-634)
...
SVN Revision: 1341
2008-05-22 10:19:35 +00:00
Badlop
30f54a6bfc
* src/configure.ac: R12 support: remove compilation
...
warning (EJAB-630)
* src/configure: Likewise
* doc/guide.tex: Likewise
SVN Revision: 1334
2008-05-19 09:20:35 +00:00
Mickaël Rémond
8dae53abda
* src/ejabberd_s2s_out.erl: Fix compilation error.
...
SVN Revision: 1332
2008-05-18 12:34:52 +00:00
Mickaël Rémond
8a8a02431f
* src/ejabberd_s2s_out.erl: Avoid an harmless error (function clause in logs)
...
SVN Revision: 1331
2008-05-18 12:28:58 +00:00
Badlop
4e77bae206
* src/extauth.erl: Log strange responses from extauth script. Use
...
timeout (EJAB-627)
SVN Revision: 1330
2008-05-17 11:44:25 +00:00
Badlop
c892a60da5
* src/mod_muc/mod_muc_room.erl: Allow change_state of a room
...
SVN Revision: 1329
2008-05-16 18:05:03 +00:00
Christophe Romain
5bec1eedc1
Change FSMTIMEOUT to 30s
...
SVN Revision: 1328
2008-05-16 15:29:33 +00:00
Badlop
da56452fba
* src/mod_muc/mod_muc_room.erl: Return Forbidden error message
...
when user sends private message in a room that disallows
it (EJAB-595)
SVN Revision: 1323
2008-05-12 20:35:43 +00:00
Badlop
98e47e8c73
* src/web/ejabberd_http.erl (parse_auth): Allow password that
...
include colon character (EJAB-522)
SVN Revision: 1322
2008-05-12 17:56:27 +00:00
Mickaël Rémond
977a20700a
* src/mod_ip_blacklist.erl: Better error handling (EJAB-625).
...
SVN Revision: 1321
2008-05-09 19:53:06 +00:00
Mickaël Rémond
1a2bb06075
* src/mod_ip_blacklist.erl: ignore when we do not have the IP.
...
SVN Revision: 1320
2008-05-08 14:55:06 +00:00
Mickaël Rémond
e4f098a104
* src/mod_ip_blacklist.erl: Update the list every 6 hours.
...
SVN Revision: 1319
2008-05-05 16:31:48 +00:00
Mickaël Rémond
740ce75599
* src/mod_ip_blacklist.erl: Added C2S blacklist support (EJAB-625).
...
SVN Revision: 1318
2008-05-05 16:25:52 +00:00
Mickaël Rémond
a664579b58
* src/ejabberd_c2s.erl: Added C2S blacklist support (EJAB-625).
...
* src/mod_ip_blacklist.erl: Likewise.
* src/jlib.erl: Added IP format tuple to string function.
* src/ejabberd_socket.erl: Properly handled c2s start failure (happen for blacklisted IP).
SVN Revision: 1317
2008-05-05 16:22:06 +00:00
Alexey Shchepin
8267194d5e
* src/ejabberd_receiver.erl: Don't activate a socket untill its
...
receiver process is controlling it
SVN Revision: 1316
2008-05-04 07:38:24 +00:00
Christophe Romain
2304f8cbc8
XEP-0115 patch (EJAB-618)
...
SVN Revision: 1313
2008-04-30 08:49:39 +00:00
Badlop
ef531fb208
* src/ejabberd_s2s_out.erl: Improve confusing log message in s2s
...
connection: wait_for_validation connect timeout (EJAB-617)
SVN Revision: 1311
2008-04-29 16:59:03 +00:00
Badlop
e5879f4349
* src/ejabberd.cfg.example: Small improvements in explanations
...
* doc/guide.tex: Document MUC room options (EJAB-619)
SVN Revision: 1310
2008-04-29 16:44:12 +00:00
Christophe Romain
edf1ed5c87
remove unused served_hosts option
...
SVN Revision: 1306
2008-04-28 13:02:07 +00:00
Alexey Shchepin
85d3b27d71
* src/mod_muc/mod_muc_room.erl: Fixed room shaper processing
...
SVN Revision: 1305
2008-04-27 19:06:34 +00:00
Badlop
4c937ab94e
* src/mod_shared_roster.erl: Fix for new registered accounts not
...
being immediately shown in an 'all' special shared roster
group (thanks to Alexey Shchepin) (EJAB-71)
* src/mod_register.erl: New vhost event user_registered
SVN Revision: 1303
2008-04-26 17:37:43 +00:00
Badlop
c88a4650ba
* src/ejabberd_c2s.erl: Added forbidden_session_hook
...
* src/acl.erl: New access types: resource, resource_regexp and
resource_glob
* doc/guide.tex: Likewise
SVN Revision: 1301
2008-04-25 09:25:31 +00:00
Alexey Shchepin
b1756e8e34
* src/treap.erl: Bugfix
...
* src/mod_register.erl: Fixed table creation, timeout isn't
activated when registration fails
SVN Revision: 1300
2008-04-23 13:14:08 +00:00
Alexey Shchepin
797544333c
* src/mod_register.erl: Restrict registration frequency per IP or
...
user
* src/ejabberd_c2s.erl: Pass IP to the c2s_unauthenticated_iq hook
* src/ejabberd_config.erl: Added registration_timeout option
* src/treap.erl: Treaps implementation
SVN Revision: 1299
2008-04-22 21:51:32 +00:00
Badlop
96f0c001d9
* src/ejabberd_auth.erl: Improve anonymous authentication to not
...
remove rosters accidentally (EJAB-549). New functions in
ejabberd_auth to get/check password and know which module accepted
the authentication. New element 'auth_module' in ejabberd_c2s
record 'statedata'. Cyrsasl provides a new property in the
response: {auth_module, AuthModule}.
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/cyrsasl_anonymous.erl: Likewise
* src/cyrsasl_digest.erl: Likewise
* src/cyrsasl_plain.erl: Likewise
SVN Revision: 1297
2008-04-22 17:41:30 +00:00
Badlop
ee6aae8211
* src/ejabberd_s2s_out.erl: Fix long timeout when reconnecting s2s
...
after a remote server crash (EJAB-540)
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s.erl: Likewise
* doc/guide.tex: Likewise
SVN Revision: 1296
2008-04-18 12:19:45 +00:00
Christophe Romain
d46b7d5908
Cache negative response (EJAB-474)
...
SVN Revision: 1294
2008-04-14 12:02:18 +00:00
Badlop
7c64509c46
* src/web/ejabberd_web_admin.erl: Include Last-Modified HTTP
...
header in responses to allow caching (EJAB-546)
SVN Revision: 1292
2008-04-12 08:09:05 +00:00
Badlop
cf8c08c980
* src/Makefile.in: Improved indentation of GCC call
...
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
SVN Revision: 1291
2008-04-11 17:32:20 +00:00
Badlop
ab9b30c4d4
* src/ejabberd_listener.erl (start_listener): Revert SVN r1260.
...
SVN Revision: 1290
2008-04-11 15:47:44 +00:00
Alexey Shchepin
9733e6874e
* src/ejabberd_config.erl: Removed a dependency on string:to_upper
...
SVN Revision: 1288
2008-04-11 05:52:10 +00:00
Alexey Shchepin
8b690c9f9f
* src/tls/tls_drv.c: Fixed gcc signedness warnings
...
* src/ejabberd_zlib/ejabberd_zlib_drv.c: Likewise
SVN Revision: 1287
2008-04-11 05:20:08 +00:00
Alexey Shchepin
bd884274c0
* src/expat_erl.c: Removed R9B workaround
...
SVN Revision: 1286
2008-04-11 05:19:27 +00:00
Christophe Romain
367610dd38
pubsub identity and database update bugfix
...
SVN Revision: 1285
2008-04-10 14:11:06 +00:00
Mickaël Rémond
b8b2bde8d0
*src/ejabberd_c2s.erl: Uniform default value for empty privacy list. Fixes (EJAB-603).
...
SVN Revision: 1281
2008-04-10 08:14:38 +00:00
Badlop
2af65d4f42
* src/ejabberd_auth_ldap.erl: LDAP function to get the number of
...
registered users is too slow (EJAB-331): set timeout in LDAP
search queries (thanks to Evgeniy Khramtsov) and return the number
of registered users.
SVN Revision: 1280
2008-04-08 09:37:06 +00:00
Badlop
076132a5d4
* src/ejabberd_auth_ldap.erl (get_vh_registered_users_number): New
...
function that returns 0 registered users (EJAB-331).
SVN Revision: 1276
2008-04-04 18:57:01 +00:00
Badlop
2c8cc8ae2d
* src/ejabberd_c2s.erl (process_presence_probe): Don't route a
...
presence probe to oneself (EJAB-498)
SVN Revision: 1275
2008-04-03 22:35:26 +00:00
Badlop
1649dec58e
* src/ejabberd_config.erl: Add support to include additional
...
configuration files. Add support for macro definition and
usage. (EJAB-593)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1273
2008-04-02 16:31:15 +00:00
Christophe Romain
f0ee4f999d
Do not ignore values passed from configure (EJAB-592)
...
SVN Revision: 1272
2008-04-02 14:24:18 +00:00
Christophe Romain
37fc28ef49
add condition inclusion of pep in disco identity (EJAB-564)
...
SVN Revision: 1268
2008-04-02 09:06:28 +00:00
Christophe Romain
ef6ce3c7c0
typo fix on ejabberdctl.template
...
SVN Revision: 1266
2008-04-01 11:47:51 +00:00
Badlop
5fd627b85b
* doc/api/Makefile: Report the correct ejabberd version. When
...
cleaning, remove also erlang.png
* src/mod_muc/mod_muc_room.erl: Update source code to prevent
warning messages from EDoc
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_pubsub/node_default.erl: Likewise
* src/mod_pubsub/nodetree_default.erl: Likewise
* src/mod_pubsub/nodetree_virtual.erl: Likewise
* src/mod_pubsub/pubsub.hrl: Likewise
SVN Revision: 1265
2008-04-01 10:11:39 +00:00
Christophe Romain
273c076ef6
Add firewalling port range definition
...
SVN Revision: 1264
2008-04-01 09:07:29 +00:00
Badlop
dcc00bca6d
* src/ejabberd_listener.erl: Remove code of the unused listening
...
socket option 'ssl' (EJAB-159)
* src/ejabberd_app.erl: Likewise
SVN Revision: 1263
2008-03-31 19:48:35 +00:00
Badlop
f634e4dc0d
* src/ejabberd_listener.erl (start_listener): Start also the
...
supervisor of the module
SVN Revision: 1260
2008-03-31 09:30:51 +00:00
Badlop
ab1610021d
* src/Makefile.in: Support for parallel compilation with 'make -j'
...
in multi core CPUs: fix compilation dependencies; compile
behaviors before other source code. (thanks to Jonathan Schleifer)
* src/mod_pubsub/Makefile.in: Likewise
* src/eldap/Makefile.in: Likewise
SVN Revision: 1258
2008-03-26 09:27:46 +00:00
Alexey Shchepin
9b3926baf1
* src/ejabberd_local.erl: The iq_response table wasn't cloned
...
automatically on all nodes which resulted in a single point of
failure
SVN Revision: 1257
2008-03-25 22:23:38 +00:00
Badlop
28c082551d
* src/Makefile.in: Only try to install epam if pam was enabled
...
in configure script (thanks to Etan Reisner)(EJAB-586)
SVN Revision: 1256
2008-03-25 18:59:45 +00:00
Badlop
48e066999b
* src/Makefile.in: Failure to install epam is not
...
critical (EJAB-573)
SVN Revision: 1255
2008-03-25 17:18:47 +00:00
Badlop
9e5721a5d9
* src/msgs/de.msg: Fix irc typo (thanks to Jonathan Schleifer)
...
* src/msgs/cs.msg: Likewise
* src/msgs/pl.msg: Likewise
* src/msgs/sk.msg: Likewise
SVN Revision: 1253
2008-03-24 01:28:55 +00:00
Mickaël Rémond
f7a9e5bac0
* src/eldap/Makefile.in: Generate ELDAPv3.beam during first Makefile pass (EJAB-583).
...
SVN Revision: 1249
2008-03-22 16:42:28 +00:00
Badlop
86df7de48f
* src/mod_caps.erl: Move two log calls ERROR_MSG to DEBUG
...
* src/shaper.erl: Move log call INFO_MSG to DEBUG
SVN Revision: 1247
2008-03-21 18:58:07 +00:00
Christophe Romain
1247a98cf2
Pubsub subscription is now wrapped in pubsub tags (EJAB-580)
...
SVN Revision: 1244
2008-03-21 16:05:32 +00:00
Christophe Romain
618af5e07a
Seek epam binary into priv/bin (EJAB-573)
...
SVN Revision: 1243
2008-03-21 15:42:14 +00:00
Christophe Romain
b2bd9759c8
Rewrite io:format calls to loglevel macros (EJAB-555)
...
SVN Revision: 1239
2008-03-21 14:44:16 +00:00
Mickaël Rémond
4cef493b91
* src/eldap.erl: Improved logging. We now use ejabberd logging framework (EJAB-582).
...
* src/eldap.erl: Faster LDAP reconnection (Thanks to Christophe Romain) (EJAB-581)
SVN Revision: 1236
2008-03-20 16:28:36 +00:00
Mickaël Rémond
320c266276
* src/ejabberd_s2s.erl: Only trigger s2s_connect_hook on successful connection (EJAB-566)
...
* src/ejabberd_s2s_out.erl: Likewise
SVN Revision: 1235
2008-03-17 10:16:21 +00:00
Mickaël Rémond
4cf68c2f9f
* src/ejabberd_ctl.erl: API improvement: Added reopen_log_hook (EJAB-565)
...
SVN Revision: 1234
2008-03-15 10:57:38 +00:00
Mickaël Rémond
295da9cf02
* src/ejabberd_s2s.erl: API improvement: Added s2s_connect_hook (EJAB-566).
...
SVN Revision: 1232
2008-03-15 09:35:33 +00:00
Badlop
04aec272db
* src/odbc/ejabberd_odbc.erl: Start ODBC explicitely because
...
Erlang R12 doesn't start automatically like in R11 and
older (thanks to Sergei Golovan)(EJAB-541)
SVN Revision: 1231
2008-03-13 14:34:47 +00:00
Badlop
7c377783fa
* src/ejabberd.hrl: Removed unused ejabberd_debug and
...
PRIVACY_SUPPORT. Reordered the remaining options
SVN Revision: 1230
2008-03-13 14:13:29 +00:00
Badlop
d2eb00d814
* src/mod_echo.erl: Small change to avoid a compilation warning of
...
unused function
SVN Revision: 1228
2008-03-12 23:05:49 +00:00
Badlop
9ae1282854
* src/web/ejabberd_web_admin.erl (term_to_string): Show Erlang
...
terms in one line in Erlang R12 (EJAB-503)
SVN Revision: 1227
2008-03-12 22:29:53 +00:00
Badlop
07454d8f1a
* src/ejabberd_s2s_in.erl (get_cert_domains): When compiling with
...
Erlang R12, replace the calls to deprecated module PKIX1Explicit88
with OTP-PKIX (EJAB-556)
SVN Revision: 1226
2008-03-11 14:25:35 +00:00
Badlop
78ce676e81
* src/ejabberd_update.erl: Fix crash when browsing the Update
...
page in Erlang R12 (EJAB-552)
SVN Revision: 1225
2008-03-10 11:59:53 +00:00
Alexey Shchepin
5cb8f4826c
* src/web/ejabberd_http_poll.erl: Fixed HTTP headers when a
...
requested session doesn't exist
SVN Revision: 1223
2008-03-09 21:28:42 +00:00
Badlop
ee339aebb8
* src/mod_proxy65/mod_proxy65_service.erl: Implement alternative
...
to the deprecated function inet:ip_to_bytes (thanks to Evgeniy
Khramtsov)(EJAB-542)
SVN Revision: 1222
2008-03-09 10:09:38 +00:00
Christophe Romain
53e804575f
add missing ~p to error message
...
SVN Revision: 1221
2008-03-07 14:56:37 +00:00
Mickaël Rémond
0f4ee703c6
* src/eldap/eldap_pool.erl: Improved logging
...
SVN Revision: 1220
2008-03-07 14:49:06 +00:00
Badlop
735b34e7b7
* doc/guide.tex: Improve documentation of host_config
...
add (EJAB-544)
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise
* src/ejabberd_config.erl: Likewise
SVN Revision: 1219
2008-03-04 10:36:57 +00:00
Badlop
a65273690d
* doc/guide.tex: mod_announce recommends, but doesn't require
...
mod_adhoc (thanks to Anastasia Gornostaeva)
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise
SVN Revision: 1218
2008-03-04 09:07:43 +00:00
Alexey Shchepin
76245f0fcf
* src/tls/tls.erl: recv_data/2 doesn't throw exceptions now
...
* src/ejabberd_zlib/ejabberd_zlib.erl: Likewise
SVN Revision: 1217
2008-03-03 11:55:19 +00:00
Mickaël Rémond
993ffe9096
* src/ejabberd_check.erl: Fixed missing clause (EJAB-533).
...
SVN Revision: 1215
2008-02-29 12:21:15 +00:00
Alexey Shchepin
8283a9faf3
* src/mod_roster.erl: Fixed "from" attribute in roster pushes
...
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 1213
2008-02-28 22:10:55 +00:00
Badlop
22a5bce9de
* src/ejabberd_app.erl (prep_stop): Stop modules when stopping
...
ejabberd (EJAB-536)
* src/mod_caps.erl (stop): Probably not needed to stop supervisor
child (EJAB-536)
* src/mod_muc/mod_muc.erl (room_destroyed): Catch message
sending (EJAB-536)
* src/mod_muc/mod_muc_room.erl (init): Ensure rooms are called
when the process dies due to a linked die (EJAB-536)
SVN Revision: 1212
2008-02-28 00:30:23 +00:00
Mickaël Rémond
868182d1c8
* src/ejabberd_check.erl: Separate config loading from configuration sanity checks (EJAB-533)
...
* src/src/ejabberd_app.erl: Likewise
* src/ejabberd_app.erl: Likewise
SVN Revision: 1210
2008-02-27 20:15:25 +00:00
Badlop
f4f3d06120
* src/msgs/it.msg: Updated (thanks to Smart2128)
...
SVN Revision: 1209
2008-02-26 08:59:09 +00:00
Badlop
c3a5b5b0fe
* src/msgs/ru.msg: Updated (thanks to Konstantin Khomoutov)
...
* src/msgs/zh.msg: Updated (thanks to Mike Wang and Zhan Caibao)
SVN Revision: 1202
2008-02-20 15:48:48 +00:00
Badlop
4bac690f90
* src/msgs/ca.msg: Updated (thanks to Vicent Alberola Canet)
...
* src/msgs/cs.msg: Updated (thanks to Lukas Polivka)
* src/msgs/de.msg: Updated (thanks to Cord Beermann and Nikolaus
Polak)
* src/msgs/eo.msg: Updated (thanks to Andreas van Cranenburgh)
* src/msgs/es.msg: Updated
* src/msgs/fr.msg: Updated (thanks to Christophe Romain)
* src/msgs/gl.msg: Updated (thanks to Carlos E. Lopez)
* src/msgs/nl.msg: Updated (thanks to Andreas van Cranenburgh)
* src/msgs/no.msg: Updated (thanks to Stian B. Barmen)
* src/msgs/pt-br.msg: Updated (thanks to Otavio Fernandes)
* src/msgs/uk.msg: Updated (thanks to Stoune and Ruslan Rakhmanin)
SVN Revision: 1201
2008-02-19 19:15:28 +00:00
Christophe Romain
9466b1a21f
add pgsql driver monitoring
...
SVN Revision: 1200
2008-02-19 17:06:49 +00:00
Mickaël Rémond
6e3ac3a5a0
* src/ejabberd_config.erl: dirty_get_registered_users now correctly returns all users for all vhosts no matter which back-end is used (EJAB-527)
...
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
SVN Revision: 1198
2008-02-19 13:49:29 +00:00
Christophe Romain
56e9971435
Bug in get_conn_type since SVN r1194 crashes http-bind and http-poll (thanks to Brian Cully) (EJAB-526)
...
SVN Revision: 1197
2008-02-18 09:55:06 +00:00
Christophe Romain
04d688c1ba
Retreive connection type in sm_register_connection_hook
...
SVN Revision: 1194
2008-02-15 16:35:32 +00:00
Badlop
def7b0ff90
* src/mod_muc/mod_muc_room.erl: Allow unmoderated rooms (EJAB-437)
...
* src/msgs/*: Recover old translations to several languages from
ejabberd 1.1.4
SVN Revision: 1191
2008-02-14 11:25:39 +00:00
Alexey Shchepin
aa22e20e0a
* src/cyrsasl_digest.erl: Unquote backslash in DIGEST-MD5 quoted
...
strings (EJAB-304)
SVN Revision: 1190
2008-02-14 05:23:16 +00:00
Alexey Shchepin
08a4392fa9
* src/mod_roster.erl: Removed the ancient Psi roster workaround
...
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 1189
2008-02-14 04:51:04 +00:00
Jérôme Sautret
0eb8aafc0d
* odbc_queries: fix list_users queries with limit/offset.
...
SVN Revision: 1188
2008-02-12 13:23:35 +00:00
Jérôme Sautret
1309f26f06
* odbc_queries: fix list_users query with prefix.
...
SVN Revision: 1187
2008-02-12 12:49:41 +00:00
Badlop
def8f81f20
* src/web/ejabberd_web_admin.erl: Fixed native support for all the
...
ACL types (EJAB-253)
SVN Revision: 1186
2008-02-12 01:16:11 +00:00
Badlop
866e5c2d82
* src/acl.erl: Normalize ACL before adding to the configuration
...
tables (EJAB-521)
SVN Revision: 1185
2008-02-12 01:04:47 +00:00
Mickaël Rémond
0ae7f15ce7
* src/ejabberd_auth.erl: Do not allow empty password at creation. On authent, check in all cases that password is not empty.
...
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
SVN Revision: 1183
2008-02-11 18:19:42 +00:00
Mickaël Rémond
4b5632a260
* src/ejabberd_receiver.erl: Avoid crash to appear in log, when trying to close a stream with an undefined state.
...
SVN Revision: 1182
2008-02-11 15:36:56 +00:00
Christophe Romain
7f6cdc6cfe
use if event instead of x when xmlns is pubsub#event (EJAB-518)
...
SVN Revision: 1181
2008-02-11 15:21:24 +00:00
Badlop
8104eac23a
* src/mod_muc/mod_muc_room.erl: Bugfix: local message stanza may
...
not have an attribute From (EJAB-515)
SVN Revision: 1180
2008-02-11 12:15:34 +00:00
Badlop
116966ce44
* src/mod_muc/mod_muc_room.erl: Include the error condition in the
...
presence status when kicking a participant due to an error
stanza (EJAB-496)
SVN Revision: 1179
2008-02-09 10:38:47 +00:00
Badlop
8ff5599d3a
* src/ejabberd.cfg.example: Document options to SQL keep alive
...
interval and pool size (EJAB-206)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1178
2008-02-08 18:28:36 +00:00
Mickaël Rémond
2fa599c40f
* src/mod_pubsub/node.template: Fixed typo
...
SVN Revision: 1177
2008-02-07 08:07:20 +00:00
Badlop
0beb1c8116
* src/mod_muc/mod_muc_room.erl: Support for decline of invitation
...
to MUC room (EJAB-515)
SVN Revision: 1175
2008-02-06 20:30:58 +00:00
Mickaël Rémond
ac204f0849
* src/mod_pubsub/node_buddy.erl: Fixed typo
...
* src/mod_pubsub/node_club.erl: Likewise
* src/mod_pubsub/node_dispatch.erl: Likewise
* src/mod_pubsub/node_pep.erl: Likewise
* src/mod_pubsub/node_private.erl: Likewise
SVN Revision: 1174
2008-02-06 18:19:25 +00:00
Mickaël Rémond
4e096f1590
* src/mod_pubsub/gen_pubsub_node.erl: API improvement: Added a way to generate custom item name
...
* src/mod_pubsub/node_dispatch.erl: Likewise
* src/mod_pubsub/node_buddy.erl: Likewise
* src/mod_pubsub/node_private.erl: Likewise
* src/mod_pubsub/node_club.erl: Likewise
* src/mod_pubsub/node_public.erl: Likewise
* src/mod_pubsub/node_default.erl: Likewise
* src/mod_pubsub/node_pep.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Small API improvements and refactoring
SVN Revision: 1173
2008-02-06 18:04:23 +00:00
Badlop
ba419eae59
* src/ejabberd.hrl: Updated version to 2.1.0-alpha
...
* doc/dev.html: Likewise
* doc/features.html: Likewise
* doc/guide.html: Likewise
* doc/version.tex: Likewise
SVN Revision: 1172
2008-02-04 16:44:42 +00:00
Alexey Shchepin
24a7d86577
* src/mod_muc/mod_muc_room.erl: Append "(n/a)" to disco room
...
descriptions when a number of occupants is not available
SVN Revision: 1171
2008-02-03 23:17:39 +00:00
Mickaël Rémond
65981598ed
* src/mod_pubsub/nodetree_virtual.erl: Fixed error report at startup.
...
SVN Revision: 1169
2008-02-02 14:24:01 +00:00
Mickaël Rémond
fff45aca21
* src/mod_pubsub/mod_pubsub.erl: Added the from field in the
...
get_subnodes pubsub plugin API function. This is usefull to write
plugins to generate the pubsub hierarchy dynamically, based on who
is doing the browsing request.
* src/mod_pubsub/gen_pubsub_nodetree.erl: Likewise
* src/mod_pubsub/nodetree_default.erl: Likewise
* src/mod_pubsub/nodetree_virtual.erl: Likewise
SVN Revision: 1168
2008-02-02 14:15:37 +00:00
Badlop
b6ff597740
* src/mod_echo.erl: Put in comments the call to the educational
...
function do_client_version
SVN Revision: 1165
2008-01-30 15:52:23 +00:00
Badlop
45b01994e2
* src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a
...
private message with type=error (EJAB-496). Updated.
SVN Revision: 1164
2008-01-29 18:37:45 +00:00
Badlop
cdc1698c8b
* src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a
...
private message with type=error (EJAB-496)
SVN Revision: 1163
2008-01-29 14:49:08 +00:00
Badlop
cca5d7fcbe
* src/msgs/eo.msg: New Esperanto translation (thanks to Andreas
...
van Cranenburgh)
* src/msgs/no.msg: New Norwegian translation (thanks to Stian
B. Barmen)
* doc/Makefile: Fixed small problem with contributed_modules.tex
SVN Revision: 1160
2008-01-25 10:23:12 +00:00
Christophe Romain
c8e580987d
pubsub dirty_sync typo fix on node configuration transaction
...
SVN Revision: 1159
2008-01-25 10:17:59 +00:00
Christophe Romain
58c491ade3
pubsub configuration patch (EJAB-508) and (EJAB-509)
...
SVN Revision: 1158
2008-01-25 09:24:10 +00:00
Badlop
f361633f36
* doc/guide.tex: Updated the names of log files.
...
* doc/guide.html: Likewise
* src/mod_muc/mod_muc_room.erl: Added log messages for room
destroy
* src/mod_caps.erl: Small beautify of log error messages
SVN Revision: 1155
2008-01-16 10:08:17 +00:00
Badlop
864d2056a7
* doc/guide.tex: Improved the documentation of Binary
...
installer. Updated the requirements, specifically: Erlang R10B-9
is required as minimum, and R12 is not yet supported. Added
section Upgrading ejabberd. Improved documentation about Erlang
runtime system environment variables and command-line parameters.
* doc/guide.html: Likewise
* doc/release_notes_2.0.0.txt: Updated to RC1
* doc/version.tex: Likewise
* src/ejabberd.hrl: Likewise
* doc/introduction.tex: Updated to 22 languages
* doc/Makefile: Ensure that Bash is used
SVN Revision: 1154
2008-01-15 17:53:40 +00:00
Badlop
2d2fcc8210
* doc/guide.tex: Updated copyright dates to 2008
...
* src/*: Likewise
SVN Revision: 1153
2008-01-15 17:02:57 +00:00
Jérôme Sautret
38976270b4
* src/Makefile.in: Allow compilation with Erlang R12 (EJAB-446).
...
* src/aclocal.m4: Likewise
* src/configure.ac: Likewise
* src/configure: Likewise
* src/ejabberd_s2s_in.erl: Likewise
SVN Revision: 1150
2008-01-15 11:11:27 +00:00
Badlop
25e6bddf29
* src/ejabberdctl.template: Instead of using the Erlang kernel
...
variable 'inetrc', use the ERL_INETRC environment variable that is
available since Erlang/OTP R10B-5.
SVN Revision: 1149
2008-01-13 22:46:00 +00:00
Christophe Romain
aa685c7794
set_subscription fix (EJAB-494)
...
SVN Revision: 1148
2008-01-12 19:47:19 +00:00
Christophe Romain
b106f894e4
don't ask capabilities to MUC room participants
...
SVN Revision: 1147
2008-01-11 13:57:29 +00:00
Christophe Romain
20c27ea9d9
EJAB-491 fix
...
SVN Revision: 1145
2008-01-11 01:39:10 +00:00
Christophe Romain
04eb1c6641
Force PEP parent node to be []
...
SVN Revision: 1144
2008-01-10 17:38:24 +00:00
Christophe Romain
b3bf437dd1
Send last published PEP event now checks the correct peer caps (EJAB-491)
...
SVN Revision: 1143
2008-01-10 15:02:54 +00:00
Badlop
7672515e76
* src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a
...
private message with type=error (EJAB-496)
SVN Revision: 1142
2008-01-09 16:01:16 +00:00
Badlop
635978b137
* src/ejabberdctl.template: Removed the option ERL_FULLSWEEP_AFTER
...
because it is almost useless regarding ejabberd's performance.
* src/ejabberdctl.cfg.example: Likewise
SVN Revision: 1140
2008-01-08 16:11:58 +00:00
Badlop
1a1f9d1488
* src/web/ejabberd_web_admin.erl: Uniformize the name of
...
ejabberd's web admin to: 'Web Admin' (EjAB-472)
* doc/guide.tex: Likewise
* doc/introduction.tex: Likewise
* src/web/ejabberd_web_admin.erl: Uniformize ejabberd name in the
text using the Latex command
SVN Revision: 1137
2008-01-01 18:20:57 +00:00
Badlop
c2e12d716b
* src/mod_muc/mod_muc_room.erl: Resend 'continue' elements in muc
...
room invitations (EJAB-490)
SVN Revision: 1135
2008-01-01 17:06:26 +00:00
Badlop
b23d82bc1e
* src/ejabberdctl.template: Create logs_dir if doesn't exist. New
...
parameters --config, --ctl-config, --logs, --spool. Crash dump
renamed to erl_crash_DATETIME.dump.
* src/ejabberdctl.template: Backport improvements from binary
installer (EJAB-488): options are simple values; enable Kernel
Poll by default, set SMP to auto, set max ports to 32000, max
processes to 250000.
* src/ejabberdctl.cfg.example: Likewise
* src/ejabberd.inetrc: Renamed ejabberd.inetrc to inetrc
* src/inetrc: Likewise
* src/Makefile.in: Likewise
* doc/guide.tex: Likewise
SVN Revision: 1133
2008-01-01 10:53:05 +00:00
Badlop
c7e9fe1059
* src/msgs/ca.msg: Updated (thanks to Vicent Alberola Canet)
...
SVN Revision: 1131
2007-12-31 10:26:01 +00:00
Alexey Shchepin
e0fc360cf8
* src/ejabberd_s2s_out.erl: Fixed behavior when outgoing_s2s_port
...
option is not defined
SVN Revision: 1129
2007-12-29 14:22:38 +00:00
Badlop
f3aa8a03d3
* src/mod_vcard_ldap.erl: Fix some field names (EJAB-483)
...
SVN Revision: 1127
2007-12-27 16:40:03 +00:00
Badlop
4562a79b69
* src/web/ejabberd_web_admin.erl: Translate menu items of webadmin
...
hooks in each module (EJAB-485)
* src/mod_shared_roster.erl: Likewise
SVN Revision: 1125
2007-12-26 14:53:37 +00:00
Badlop
264ea1c25f
* src/web/ejabberd_web_admin.erl: max_user_sessions access rule
...
contains an integer, but webadmin always expects atoms (EJAB-482)
SVN Revision: 1123
2007-12-26 12:21:52 +00:00
Badlop
e14d70529c
* src/mod_configure.erl: Bugfix, update to match changes in
...
mod_announce SVN r1099
SVN Revision: 1121
2007-12-25 00:27:10 +00:00
Mickaël Rémond
22f928122f
* Applied copyright patch 3.
...
SVN Revision: 1113
2007-12-24 13:57:53 +00:00
Mickaël Rémond
cd82cadd10
* applied copyright patch 2.
...
SVN Revision: 1112
2007-12-24 12:58:05 +00:00
Mickaël Rémond
281d2ca3d3
* Fixed typo.
...
SVN Revision: 1111
2007-12-24 12:25:56 +00:00
Mickaël Rémond
56fe3579bb
* Applied copyright update patch 1.
...
SVN Revision: 1110
2007-12-24 11:41:41 +00:00
Christophe Romain
56194f742b
pubsub: remove useless get_roster_info call
...
SVN Revision: 1109
2007-12-24 11:28:56 +00:00
Badlop
977841188c
* src/msgs/vi.msg: New Vietnamese translation (thanks to EQHO
...
Communications)
* src/msgs/th.msg: New Thai translation (thanks to EQHO
Communications)
* src/msgs/gl.msg: Updated (thanks to Carlos E. Lopez)
SVN Revision: 1105
2007-12-23 22:08:12 +00:00
Badlop
afdc9b9527
* src/mod_muc/mod_muc_room.erl: Log room creation and
...
destruction. Ensure JID of owners of MUC room are user, not
server (EJAB-435)
SVN Revision: 1104
2007-12-23 12:28:44 +00:00
Badlop
2d634e1b4f
* src/ejabberd.app: Update ejabberd.app: add new erlang
...
modules (EJAB-466)
SVN Revision: 1103
2007-12-22 19:51:55 +00:00
Badlop
27063837ae
* src/web/ejabberd_http.erl: Add 'http_bind' option for easy
...
configuration of HTTP-Binding
SVN Revision: 1101
2007-12-22 14:23:37 +00:00
Badlop
ccbc4b0c04
* src/mod_announce.erl: When editing MOTD, display current value (EJAB-475)
...
SVN Revision: 1100
2007-12-22 13:58:19 +00:00
Badlop
61295e9c1b
* src/mod_announce.erl: Fixed unnoticeable bug related to Node
...
matching. Renamed some nonstandard node names according to
XEP-0133. Small reordering of clauses.
SVN Revision: 1099
2007-12-22 12:26:17 +00:00
Christophe Romain
1f8c32cbff
debug log fix
...
SVN Revision: 1098
2007-12-22 01:14:56 +00:00
Christophe Romain
d74c527101
EJAB-469 bugfix
...
SVN Revision: 1097
2007-12-22 01:13:06 +00:00
Christophe Romain
02eaf9eaec
several pubsub/pep bugfix
...
SVN Revision: 1096
2007-12-22 00:04:05 +00:00
Badlop
43fc8b3329
* src/mod_caps.erl: Bugfix in timeout checking. Check for timeout
...
when an error response is received, and also before querying
SVN Revision: 1095
2007-12-21 23:36:44 +00:00
Badlop
d1f902768c
* src/ejabberd_ctl.erl: Added new command: mnesia (thanks to
...
Tsukasa Hamano)
SVN Revision: 1094
2007-12-21 21:50:22 +00:00
Badlop
08b3bd16c8
Small bugfix.
...
SVN Revision: 1092
2007-12-21 18:09:18 +00:00
Mickaël Rémond
cf37671ef4
* src/msgs/fr.msg: Updated French translation (EJAB-295)
...
SVN Revision: 1090
2007-12-21 14:22:03 +00:00
Christophe Romain
e7fda4a23f
pubsub disco#items bugfix (EJAB-465)
...
SVN Revision: 1089
2007-12-21 00:08:59 +00:00
Badlop
d58662f706
* src/msgs/uk.msg: Updated (thanks to Ruslan Rakhmanin)
...
* src/msgs/de.msg: Updated (thanks to Nikolaus Polak and Cord
Beermann)
* contrib/extract_translations/prepare-translation.sh: Small fix
SVN Revision: 1088
2007-12-20 23:25:22 +00:00
Badlop
36f9af523c
* src/mod_caps.erl: Don't include the Node attribute from C
...
element in the disco#info query
SVN Revision: 1087
2007-12-20 20:02:04 +00:00
Christophe Romain
1ba15b207c
User count performance improvements
...
SVN Revision: 1086
2007-12-20 17:12:45 +00:00
Christophe Romain
583f2fd19f
PEP notification bugfix
...
SVN Revision: 1085
2007-12-20 16:38:38 +00:00
Badlop
0cef0371c5
* src/msgs/zh.msg: Small update (thanks to Shelley Shyan)
...
* src/msgs/ru.msg: Small update (thanks to Konstantin Khomoutov)
SVN Revision: 1083
2007-12-20 09:06:28 +00:00
Badlop
9e799047c0
Fixed small mistake.
...
SVN Revision: 1082
2007-12-19 23:24:53 +00:00
Badlop
4646c1e015
* src/msgs/pl.msg: Updated (thanks to Andrzej Smyk)(EJAB-463)
...
* src/msgs/de.msg: Updated (thanks to Cord Beermann)
* src/msgs/es.msg: Small update (thanks to Badlop)
* src/msgs/cs.msg: Small update (thanks to Lukas Polivka alias
Spike411)
* src/web/ejabberd_web_admin.erl: No need to translate copyright
SVN Revision: 1081
2007-12-19 18:26:32 +00:00
Badlop
b07b2fe159
* src/mod_muc/mod_muc_log.erl: Add handling of kicks 321, 322, 332
...
SVN Revision: 1080
2007-12-18 19:19:24 +00:00
Christophe Romain
c0b2c5744f
Purge related pep nodes at remove_user
...
SVN Revision: 1077
2007-12-18 14:45:26 +00:00
Badlop
80b7abd8c8
* src/ejabberd_zlib/Makefile.win32: Compile
...
all erl files found in the directory, so it isn't needed to provide
an explicit list of target files
* src/eldap/Makefile.win32: Likewise
* src/mod_irc/Makefile.win32: Likewise
* src/mod_muc/Makefile.win32: Likewise
* src/mod_proxy65/Makefile.win32: Likewise
* src/mod_pubsub/Makefile.win32: Likewise
* src/odbc/Makefile.win32: Likewise
* src/stringprep/Makefile.win32: Likewise
* src/tls/Makefile.win32: Likewise
* src/web/Makefile.win32: Likewise
SVN Revision: 1076
2007-12-17 22:23:56 +00:00
Badlop
60f8b0772e
* src/ejabberd_zlib/Makefile.in: Compile all erl files found in
...
the directory, so it isn't needed to provide an explicit list of
target files
* src/eldap/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/mod_muc/Makefile.in: Likewise
* src/mod_proxy65/Makefile.in: Likewise
* src/mod_pubsub/Makefile.in: Likewise
* src/odbc/Makefile.in: Likewise
* src/pam/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
* src/web/Makefile.in: Likewise
SVN Revision: 1075
2007-12-17 18:59:51 +00:00
Christophe Romain
f114517bbc
mssql specific issue bugfix
...
SVN Revision: 1074
2007-12-17 14:10:26 +00:00
Badlop
09a30422f5
* doc/guide.tex: Remove 'ssl' option from documentation and
...
configuration load (EJAB-461)
* src/ejabberd_listener.erl: Likewise
* src/msgs/cs.msg: Small typo (thanks to Lukas Polivka alias
Spike411)
* src/ejabberd.cfg.example: Small change in order of options
SVN Revision: 1073
2007-12-17 11:03:22 +00:00
Badlop
2b91ebcc85
* src/mod_irc/iconv.erl: Changed order of handle_info
...
clause (EJAB-290)
* src/stringprep/stringprep.erl: Likesise
* src/eldap/eldap.erl: Removed handle_sync_event clause because it
is never called (EJAB-290)
SVN Revision: 1072
2007-12-15 13:01:32 +00:00
Badlop
090fceebc2
* src/mod_irc/mod_irc.erl: No need to translate copyright notice
...
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_vcard.erl: Likewise
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard_odbc.erl: Likewise
* src/msgs/*.msg: Likewise
* contrib/extract_translations/prepare-translation.sh: Bugfix
SVN Revision: 1071
2007-12-15 12:02:00 +00:00
Badlop
3174ea98f6
* src/msgs/*: Unified file format: First line is SVN Id
...
tag. Second is Language name. Next lines are authors, adding the
new ones on top. Each string must be in a single line (to
facilitate the automatic removal of unused strings). Last four
lines report file format for Emacs and Vim.
* contrib/extract_translations/prepare-translation.sh: New
features: extract all translations, include explanation for
translators in the file, remove unused strings from file, include
unused strings in a section for reference, provide information
about current translation and number of missing strings, compress
the files to a zip
* contrib/extract_translations/extract_translations.erl: Reverted
to the original version
SVN Revision: 1070
2007-12-14 21:28:29 +00:00
Alexey Shchepin
b14c88aaaf
* src/ejabberd_s2s_out.erl: Bugfix
...
SVN Revision: 1069
2007-12-14 09:12:14 +00:00
Christophe Romain
348427fab0
pubsub presence handler bugfix
...
SVN Revision: 1068
2007-12-12 16:16:00 +00:00
Badlop
ca894f8ad8
* src/msgs/it.msg: Updated (thanks to Luca Brivio)
...
SVN Revision: 1067
2007-12-12 09:41:33 +00:00
Christophe Romain
4b65154dd3
first patch to mssql quety, still one patch to be done
...
SVN Revision: 1066
2007-12-11 17:43:49 +00:00
Christophe Romain
f3322710c0
pubsub notification broadcast bugfix
...
SVN Revision: 1065
2007-12-11 16:19:17 +00:00
Badlop
4ac9c8dfc5
* src/msgs/tr.msg: New translation (thanks to Doruk Fisek)
...
* src/msgs/zh.msg: Updated (thanks to Shelley Shyan)
SVN Revision: 1064
2007-12-11 09:52:09 +00:00
Badlop
ebb33ddf74
* src/msgs/ja.msg: Updated (thanks to Tsukasa Hamano)
...
SVN Revision: 1063
2007-12-10 22:53:50 +00:00
Badlop
a4449fe8d0
* src/mod_irc/mod_irc.erl: Bugfix in ACL check (thanks to Sergei
...
Golovan)
SVN Revision: 1061
2007-12-10 14:44:43 +00:00
Christophe Romain
bf239fac9d
auto-create pe node bugfix
...
SVN Revision: 1060
2007-12-10 14:09:31 +00:00
Christophe Romain
b9286778d4
return back to good location for database upgrade call
...
SVN Revision: 1059
2007-12-10 09:56:15 +00:00
Christophe Romain
d4ff7eeb4a
pubsub database upgrade bugfix
...
SVN Revision: 1058
2007-12-10 09:33:30 +00:00
Mickaël Rémond
4ab25a3c0c
* src/web/ejabberd_http.erl: Fixed URL decoding code (EJAB-450)
...
SVN Revision: 1057
2007-12-09 10:45:53 +00:00
Mickaël Rémond
5d0f284769
* src/msg/fr.msg: Added missing space.
...
SVN Revision: 1056
2007-12-09 10:35:13 +00:00
Badlop
fbddeb60a0
* src/msgs/ru.msg: Updated (thanks to Konstantin Khomoutov)
...
SVN Revision: 1055
2007-12-09 00:36:26 +00:00
Badlop
941a5bf436
* src/msgs/ja.msg: New translation (thanks to Tsukasa Hamano)
...
* src/msgs/nl.msg: Updated (thanks to Andreas from Unstable.nl)
SVN Revision: 1054
2007-12-08 20:00:45 +00:00
Badlop
6b8113c56f
* src/ejabberd_config.erl: Report human-readable message when
...
Mnesia spool files are not readable.
SVN Revision: 1053
2007-12-08 18:39:23 +00:00
Mickaël Rémond
5a3c80e380
* src/ejabberd_s2s_out.erl: Increase dialback timeout as dialback can
...
sometimes take longer than expected.
SVN Revision: 1052
2007-12-08 16:39:02 +00:00
Christophe Romain
23b91e953a
pubsub disco_sm_items bugfix
...
SVN Revision: 1051
2007-12-08 15:24:38 +00:00
Alexey Shchepin
d788bd1a27
* src/ejabberd_sm.erl: Bugfix
...
SVN Revision: 1050
2007-12-07 20:57:44 +00:00
Badlop
791640fc98
* src/Makefile.in: Fix compilation warnings: Part 5: To fix a
...
warning about behaviour undefined, the erlang module that
implements the behaviour must be compiled before the module that
uses such behaviour (EJAB-290)
SVN Revision: 1049
2007-12-07 08:44:22 +00:00
Badlop
dd706eea94
* src/eldap/eldap.erl: Fix compilation warnings: Part 4 (EJAB-290)
...
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 1048
2007-12-07 01:40:24 +00:00
Badlop
95c69b0251
* src/mod_irc/iconv.erl: Fix compilation warnings: 3 (EJAB-290)
...
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_irc/mod_irc_connection.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/stringprep/stringprep.erl: Likewise
* src/web/ejabberd_http.erl: Likewise
* src/web/ejabberd_http_poll.erl: Likewise
SVN Revision: 1047
2007-12-07 00:48:11 +00:00
Badlop
b7c0a89a79
* src/mod_caps.erl: Fix compilation warnings: Part 2 (EJAB-290)
...
* src/mod_configure.erl:
* src/mod_configure2.erl:
* src/mod_offline_odbc.erl:
* src/mod_shared_roster.erl:
* src/mod_stats.erl:
* src/mod_version.erl:
SVN Revision: 1046
2007-12-07 00:09:48 +00:00
Badlop
6342c258a7
* src/cyrsasl.erl: Fix compilation warnings: Part 1 (EJAB-290)
...
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_config.erl: Likewise
* src/ejabberd_hooks.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_sm.erl: Likewise
* src/idna.erl: Likewise
* src/jd2ejd.erl: Likewise
SVN Revision: 1045
2007-12-06 23:15:04 +00:00
Badlop
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
Badlop
e79aa93d88
* src/ejabberdctl.cfg.example: Explain that each connection uses
...
two or three ports (thanks to Max Loparyev)
SVN Revision: 1043
2007-12-06 21:42:47 +00:00
Badlop
dfa74082f8
* src/configure: Regenerated
...
* doc/dev.html: Likewise
* doc/features.html: Likewise
* doc/guide.html: Likewise
* doc/version.tex: Likewise
* doc/introduction.tex: Updated number of translated languages
SVN Revision: 1042
2007-12-06 19:47:49 +00:00
Badlop
2e732b8b23
* src/web/ejabberd_web_admin.erl: Support more native acl_type on
...
web interface (EJAB-253)
SVN Revision: 1041
2007-12-06 18:54:18 +00:00
Badlop
60ea99d1a3
* src/ejabberd_c2s.erl: Increase the timeout of open socket
...
without authentication to 60 seconds because many Jabber clients
are not yet capable of handling this correctly (EJAB-355)
SVN Revision: 1040
2007-12-06 17:42:25 +00:00
Badlop
9527f3c9b1
* src/Makefile.in: Allow compilation with HiPE (EJAB-412)
...
* src/configure.ac: Likewise
SVN Revision: 1038
2007-12-06 17:09:35 +00:00
Badlop
10c6f3d991
* src/msgs/cs.msg: Updated (thanks to Lukáš Polívka alias
...
Spike411)
SVN Revision: 1037
2007-12-06 16:04:46 +00:00
Badlop
fc8c92a233
* src/mod_muc/mod_muc.erl: Catch creation of table
...
muc_online_users: it may be already created by other mod_muc
instance
SVN Revision: 1036
2007-12-06 15:40:21 +00:00
Badlop
4f78230dd8
* src/web/ejabberd_http.erl: Change loglevel for http
...
queries (EJAB-363)
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 1033
2007-12-06 11:24:57 +00:00
Badlop
6c0e4820d8
* doc/guide.tex: Add mod_caps and improve mod_pubsub documentation
...
* src/ejabberd.cfg.example: Added mod_caps enabled by default
SVN Revision: 1032
2007-12-06 11:13:29 +00:00
Christophe Romain
c90579146c
enable pep by default and add pubsub plugin examples
...
SVN Revision: 1031
2007-12-06 09:29:28 +00:00
Badlop
5f9de28973
* src/ejabberdctl.template: The parameter 'kernel inetrc' is used
...
even with -sname to guarantee the same behaviour that when using
-name (EJAB-317)
SVN Revision: 1029
2007-12-05 23:58:38 +00:00
Badlop
1e1f15aa61
* src/msgs/zh.msg: Updated (thanks to Shelley Shyan)
...
SVN Revision: 1026
2007-12-05 11:59:12 +00:00
Badlop
536a120c9d
* src/mod_muc/mod_muc_room.erl: Rephrase the invitation sentence
...
to make more natural
SVN Revision: 1025
2007-12-05 09:09:09 +00:00
Badlop
3a80aa24a8
* src/msgs/es.msg: Updated
...
SVN Revision: 1024
2007-12-05 00:59:33 +00:00
Badlop
2208d78782
* src/ejabberd.hrl: Set more proper version number
...
SVN Revision: 1023
2007-12-05 00:31:30 +00:00
Badlop
2e1bb5f0e6
* .gitignore: Removed (EJAB-441)
...
* src/.cvsignore: Likewise
SVN Revision: 1021
2007-12-04 21:40:25 +00:00
Badlop
d3a86d7660
* src/mod_pubsub/mod_pubsub.erl: Fixed URI.
...
SVN Revision: 1020
2007-12-04 21:35:41 +00:00
Badlop
1724ee2b15
* src/mod_pubsub/mod_pubsub.erl: Bugfix: don't report the Jabber
...
server as a pubsub service.
SVN Revision: 1019
2007-12-04 11:38:00 +00:00
Mickaël Rémond
abdbf55c87
* Temporary commit.
...
SVN Revision: 1015
2007-12-03 10:47:42 +00:00
Badlop
4ed283f009
* src/ejabberdctl.cfg.example: Bugfix in kernel poll. Added SMP
...
option. Reorganization of options
* src/ejabberdctl.template: Added SMP option
SVN Revision: 1014
2007-12-02 21:13:25 +00:00
Badlop
bfb7583bb2
* src/Makefile.in: New options make uninstall and
...
uninstall-all (EJAB-293)
SVN Revision: 1013
2007-12-02 01:03:18 +00:00
Mickaël Rémond
71c7879b48
* doc/guide.tex: Updated Windows compilation instructions.
...
* src/configure.erl: Likewise.
* doc/ejabberd.hrl: Preparing ejabberd 2.0.0 beta release.
* doc/version.tex: Likewise.
SVN Revision: 1009
2007-12-01 16:06:24 +00:00
Mickaël Rémond
43e31b1bf0
* src/tls/Makefile.win32: Updated for latest Win32 OpenSSL library.
...
SVN Revision: 1008
2007-12-01 15:14:41 +00:00
Mickaël Rémond
7d68866c59
* src/odbc_queries.erl: Added a default define value so that we
...
can recompile the file manually with a simple erlc command (with the
default generic value).
SVN Revision: 1007
2007-12-01 14:25:31 +00:00
Alexey Shchepin
c61d10f28a
* src/mod_pubsub/Makefile.in: Removed mod_pubsub_old mentioning
...
* src/mod_pubsub/Makefile.win32: Likewise
SVN Revision: 1006
2007-12-01 14:11:46 +00:00
Alexey Shchepin
9b2e6bcaef
* src/odbc/odbc_queries.erl: Reverted the previous patch because
...
it produces "redefining macro 'generic'" compilation error
SVN Revision: 1005
2007-12-01 05:20:45 +00:00
Alexey Shchepin
c3c782d882
* src/mod_caps.erl: CAPS support (thanks to Magnus Henoch)
...
* src/ejabberd_local.erl: Support for IQ responses
* src/jlib.erl: Added iq_query_or_response_info/1 function
* src/jlib.hrl: Added NS_PUBSUB_ERRORS and NS_CAPS
* src/mod_pubsub/Makefile.in: New pubsub+pep implementation
(thanks to Christophe Romain and Magnus Henoch)
* src/ejabberd_sm.erl: Added get_session_pid/3 function
* src/ejabberd_c2s.erl: Added get_subscribed_and_online/1 function
SVN Revision: 1004
2007-12-01 05:16:30 +00:00
Mickaël Rémond
e4cf286aa2
* src/odbc_queries.erl: Added a default define value so that we can
...
recompile the file manually with a simple erlc command.
SVN Revision: 1003
2007-11-30 18:06:26 +00:00
Badlop
02db5aa005
* src/mod_vcard.erl: Add type of x:data field to search
...
results (thanks to Robin Redeker) (EJAB-327)
* src/mod_vcard_ldap.erl:
* src/mod_vcard_odbc.erl:
SVN Revision: 1002
2007-11-29 18:24:31 +00:00
Badlop
dbdcadb6b3
* src/aclocal.m4: Fix autoconf caching for SSL libraries (thanks
...
to Michael Shields) (EJAB-439)
* src/configure.ac: Don't hardcode gcc and gcc options in
Makefiles (thanks to Etan Reisner) (EJAB-436)
SVN Revision: 1001
2007-11-29 17:22:34 +00:00
Badlop
44d65ff303
* src/configure.ac: Don't hardcode gcc and options (EJAB-436)
...
* src/Makefile.in:
* src/ejabberd_zlib/Makefile.in:
* src/eldap/Makefile.in:
* src/mod_irc/Makefile.in:
* src/mod_muc/Makefile.in:
* src/mod_proxy65/Makefile.in:
* src/mod_pubsub/Makefile.in:
* src/odbc/Makefile.in:
* src/pam/Makefile.in:
* src/stringprep/Makefile.in:
* src/tls/Makefile.in:
* src/web/Makefile.in:
SVN Revision: 1000
2007-11-29 16:59:35 +00:00
Badlop
4257f0c790
* src/mod_muc/mod_muc_room.erl: Hide the option 'Make room
...
moderated' because it isn't implemented, and set the default value
of 'moderated' to true because that is the behaviour
implemented (EJAB-419)
SVN Revision: 999
2007-11-29 16:16:10 +00:00
Badlop
0996e569a6
* doc/guide.tex: Update URI of ejabberd official home page, URI
...
of ejabberd.jabber.ru, and copyright dates (EJAB-366)
* doc/introduction.tex:
* src/ejabberd.hrl:
* src/ejabberd_admin.erl:
* src/mod_irc/mod_irc.erl:
* src/mod_irc/mod_irc_connection.erl:
* src/mod_muc/mod_muc.erl:
* src/mod_muc/mod_muc_log.erl:
* src/mod_proxy65/mod_proxy65_service.erl:
* src/mod_pubsub/mod_pubsub.erl:
* src/mod_vcard.erl:
* src/mod_vcard_ldap.erl:
* src/mod_vcard_odbc.erl:
* src/msgs/*.msg:
* src/web/ejabberd_web_admin.erl:
SVN Revision: 997
2007-11-27 23:35:26 +00:00
Badlop
69b425aeb7
* src/gen_mod.erl: Update in database the configuration changes in
...
modules (EJAB-330)
SVN Revision: 996
2007-11-27 22:30:51 +00:00
Badlop
eb330ac0e0
* src/mod_configure.erl: The command get-user-lastlogin is now
...
compatible with both Mnesia and ODBC (EJAB-383)
* src/mod_last.erl: Likewise
* src/mod_last_odbc.erl: Likewise
SVN Revision: 995
2007-11-27 18:54:06 +00:00
Alexey Shchepin
7ad9874dba
* src/mod_announce.erl: Bugfix (thanks to Christophe Romain)
...
SVN Revision: 992
2007-11-27 15:18:45 +00:00
Badlop
b4997bc20c
* src/mod_vcard.erl: Ensure mod_vcard to respect FORM_TYPE registry (EJAB-328).
...
* src/mod_vcard_ldap.erl: Likewise.
* src/mod_vcard_odbc.erl: Likewise.
* doc/guide.tex: Updated documentation.
SVN Revision: 990
2007-11-27 14:06:44 +00:00
Badlop
e7136065fc
* src/mod_muc/mod_muc_room.erl: Don't show the room name as the room description (EJAB-382).
...
SVN Revision: 989
2007-11-27 08:09:47 +00:00
Badlop
eb488b48fb
* src/ejabberd.cfg.example: Added example configuration of databases.
...
SVN Revision: 988
2007-11-26 21:29:14 +00:00
Badlop
2078c45656
* src/ejabberd_config.erl: Print error when the configuration
...
requires ODBC, MySQL or PostgreSQL libraries but are not
installed (EJAB-210).
SVN Revision: 986
2007-11-26 19:52:09 +00:00
Badlop
f6848603f9
* src/web/ejabberd_web_admin.erl: Added a favicon (EJAB-379).
...
SVN Revision: 985
2007-11-26 15:12:34 +00:00
Badlop
7f66b3dfb3
* src/msgs/wa.msg: New Walon translation (thanks to
...
Pablo Saratxaga) (EJAB-374).
SVN Revision: 984
2007-11-26 15:03:11 +00:00
Badlop
174c16a15f
* src/ejabberd.cfg.example: Huge reorganization and grouping of options (EJAB-392).
...
SVN Revision: 982
2007-11-26 14:35:53 +00:00
Badlop
9a03e5087e
* src/mod_echo.erl: Example function that demonstrates how to receive XMPP packets using Erlang's message passing mechanism (EJAB-247).
...
SVN Revision: 980
2007-11-26 10:15:18 +00:00
Badlop
87f7630fa3
* src/ejabberdctl.template: Write erl_crash.dump in the log/ directory, with unique filename (EJAB-433).
...
SVN Revision: 979
2007-11-26 08:57:21 +00:00
Badlop
399604e55d
* src/ejabberdctl.template: Removed bashisms (EJAB-399). Set environment variables instead of passing parameters when calling erl (EJAB-421).
...
* src/ejabberd_ctl.erl: Improvements in the help messages (EJAB-399).
* doc/guide.tex: Improvements in sections ejabberdctl, and Install from Source (EJAB-399).
SVN Revision: 978
2007-11-26 07:59:35 +00:00
Alexey Shchepin
a487652fe9
* src/ejabberd_router.erl: Bugfix
...
SVN Revision: 977
2007-11-25 16:39:56 +00:00
Alexey Shchepin
950060cd3c
* src/ejabberd_s2s_out.erl: Bugfix
...
SVN Revision: 976
2007-11-25 16:14:32 +00:00
Alexey Shchepin
65a7bb7d2a
* src/ejabberd_sm.erl: Optimized check_max_sessions (thanks to
...
Christophe Romain)
SVN Revision: 975
2007-11-25 15:35:20 +00:00
Mickaël Rémond
1415fa4b1c
* src/ejabberd_config.erl: Improved error message when ejabberd
...
config file is not found.
SVN Revision: 974
2007-11-22 13:46:54 +00:00
Christophe Romain
d7d34f87e7
Better count management and batch users retrieval internal database
...
SVN Revision: 972
2007-11-16 13:58:00 +00:00
Mickaël Rémond
2100ea63ca
* Making sure SVN properties are correctly set.
...
SVN Revision: 970
2007-11-15 10:33:18 +00:00
Mickaël Rémond
76f7e643e3
* src/ejabberd_config.erl: Refactoring: Move internal data structure to an include file.
...
* src/ejabberd_config.hrl: Likewise.
SVN Revision: 969
2007-11-09 10:18:38 +00:00
Mickaël Rémond
d6967f2745
* src/ejabberd_auth.erl: Better count management and batch users retrieval for relational database (Thanks to Massimiliano Mirra).
...
* src/ejabberd_auth_odbc.erl: Likewise.
* src/odbc/odbc_queries.erl: Likewise.
SVN Revision: 968
2007-11-03 17:35:23 +00:00
Mickaël Rémond
08cfab8a06
* src/web/ejabberd_http_poll.erl: Refactoring. Moved c2s limits acquisition to a separate module.
...
* src/ejabberd_c2s_config.erl: Likewise.
SVN Revision: 966
2007-11-02 14:45:06 +00:00
Mickaël Rémond
426f6072dc
* src/web/ejabberd_http_poll.erl: Support for c2s ACL access,
...
max_stanza and shaper on http_bind connections (EJAB-243,
EJAB-415, EJAB-416)
SVN Revision: 965
2007-11-01 13:59:29 +00:00
Jérôme Sautret
96ded4535d
* src/ejabberd_s2s.erl: don't use the resource of the sender to choose
...
a s2s connection to ensure that a muc room always uses the same
connection
Merge branch 'ejabberd_s2s'
Conflicts:
.gitignore
src/configure
src/ejabberd_c2s.erl
src/ejabberd_s2s.erl
SVN Revision: 963
2007-10-30 17:38:40 +00:00
Christophe Romain
c167c80f6d
Bugfix on previous change (EJAB-380)
...
SVN Revision: 960
2007-10-17 08:51:35 +00:00
Alexey Shchepin
0d557566fb
* src/ejabberdctl.template: Several improvements (EJAB-380)
...
(thanks to Sander Devrieze, Sergei Golovan, Torsten Werner and
Badlop)
* src/ejabberdctl.cfg.example: Likewise
* src/ejabberd.inetrc: Likewise
* src/Makefile.in: Likewise
SVN Revision: 959
2007-10-17 02:33:19 +00:00
Alexey Shchepin
7583eef401
* src/mod_privacy.erl: Bugfix
...
SVN Revision: 958
2007-10-17 02:19:44 +00:00
Alexey Shchepin
5f41b6c6f1
* src/mod_vcard_odbc.erl: Reverted previous change
...
SVN Revision: 957
2007-10-07 10:52:45 +00:00
Alexey Shchepin
a3380daa79
* src/mod_vcard_odbc.erl: Bugfix
...
SVN Revision: 956
2007-10-06 17:52:12 +00:00
Alexey Shchepin
5ab52e2712
* src/mod_offline_odbc.erl: Bugfix
...
SVN Revision: 955
2007-10-06 17:35:15 +00:00
Alexey Shchepin
4971de9d2a
SVN Revision: 954
2007-10-01 10:49:42 +00:00
Alexey Shchepin
63487ff7b2
* src/ejabberd_auth_pam.erl: Support for PAM authentication
...
(thanks to Evgeniy Khramtsov)
* src/ejabberd.cfg.example: Likewise
* src/configure.ac: Likewise
* src/aclocal.m4: Likewise
* src/Makefile.in: Likewise
* examples/ejabberd.pam: Likewise
* doc/guide.tex: Likewise
SVN Revision: 953
2007-10-01 10:33:03 +00:00
Christophe Romain
665abff588
Added some missing NOT NULL restrictions
...
SVN Revision: 952
2007-09-28 13:33:27 +00:00
Christophe Romain
0bb936f848
apply rootdir patch from Badlop (EJAB-385)
...
SVN Revision: 951
2007-09-27 12:32:05 +00:00
Alexey Shchepin
f82b84158e
* src/ejabberd_s2s.erl: Max number of connections and max number
...
of connections per node now can be specified via
max_s2s_connections and max_s2s_connections_per_node acl rules
SVN Revision: 950
2007-09-25 16:32:18 +00:00
Mickaël Rémond
b53f2be7f2
* src/ejabberd_s2s_out.erl: Changed to actual p1_fsm behaviour. It was working
...
correctly as the API of p1_fsm and gen_fsm is strictly the same.
SVN Revision: 948
2007-09-14 14:21:25 +00:00
Mickaël Rémond
48a2813ec6
* src/ejabberd_s2_in.erl: Added debug hook for s2s loop (EJAB-358).
...
SVN Revision: 947
2007-09-14 14:21:12 +00:00
Mickaël Rémond
fd666398ee
* src/ejabberd_c2s.erl: Added debug hook for c2s loop (EJAB-358).
...
SVN Revision: 946
2007-09-14 14:20:56 +00:00
Mickaël Rémond
31449bc720
* src/ejabberd_s2s.erl: open all missing connections if needed.
...
SVN Revision: 945
2007-09-14 14:20:43 +00:00
Mickaël Rémond
f6d376a4fc
* src/ejabberd_s2s.erl: untabify
...
SVN Revision: 944
2007-09-14 14:20:30 +00:00
Mickaël Rémond
5a0b8288d4
* src/ejabberd_s2s.erl: don't check blacklist for services.
...
SVN Revision: 943
2007-09-14 14:20:15 +00:00
Mickaël Rémond
de63c622c2
* src/ejabberd_s2s.erl: Fixed merge conflict (duplicate functions).
...
SVN Revision: 942
2007-09-14 14:20:01 +00:00
Mickaël Rémond
b3fb9d9100
Try to open all s2s connections at the same time, to guarantee the right order of the packets.
...
SVN Revision: 941
2007-09-14 14:19:48 +00:00
Mickaël Rémond
653e6c1791
Comment.
...
SVN Revision: 938
2007-09-14 14:19:07 +00:00
Mickaël Rémond
78e6eb58d4
max_s2s_connexions_number local parameter added.
...
SVN Revision: 937
2007-09-14 14:18:51 +00:00
Mickaël Rémond
f6bf5973ef
* src/ejabberd_s2s_out.erl: Implements s2s negociation timeouts and s2s connection retrial interval (EJAB-357, EJAB-294).
...
SVN Revision: 936
2007-09-14 14:18:32 +00:00
Mickaël Rémond
0efaacb24e
open up to 3 s2s outgoing connection per domain pair
...
SVN Revision: 935
2007-09-14 14:18:17 +00:00
Mickaël Rémond
8d3d59535d
* src/ejabberd_c2s.erl: Hibernate inactive c2s processes (EJAB-356).
...
SVN Revision: 934
2007-09-14 14:18:01 +00:00
Mickaël Rémond
f787a3ed71
* src/ejabberd_c2s.erl: Implements timeouts during session opening negociation (EJAB-355).
...
SVN Revision: 933
2007-09-14 14:17:42 +00:00
Mickaël Rémond
afec054544
* src/ejabberd_c2s.erl: Option to prevent the use of Erlang OTP supervisor for transient processes (EJAB-354).
...
* src/ejabberd_s2s_in.erl: Likewise.
* src/ejabberd_s2s_out.erl: Likewise.
* src/mod_muc/mod_muc_room.erl: Likewise.
* src/configure.ac: Likewise.
* src/configure: Likewise.
* src/Makefile.in: Likewise.
* src/mod_muc/Makefile.in: Likewise.
SVN Revision: 931
2007-09-14 14:16:36 +00:00
Mickaël Rémond
b78d8ee55f
* src/ejabberd_s2s_out.erl: Moved s2s connexion information from INFO level to DEBUG level and more human readable information explaining what is going on (EJAB-353).
...
SVN Revision: 930
2007-09-14 14:16:20 +00:00
Mickaël Rémond
ffd7267082
* src/ejabberd_s2s_in.erl: Moved s2s connexion information from INFO level to DEBUG level (EJAB-353).
...
SVN Revision: 929
2007-09-14 14:16:04 +00:00
Mickaël Rémond
9fc203ee6d
open up to 3 s2s outgoing connection per domain pair
...
SVN Revision: 928
2007-09-14 14:15:44 +00:00
Alexey Shchepin
e809c6c322
* src/gen_mod.erl: Added get_module_opt_host/3 (thanks to Badlop)
...
SVN Revision: 927
2007-09-11 11:20:36 +00:00
Mickaël Rémond
d26b8a0251
* src/mod_configure.erl: Virtual host support for mod_configure (Thanks to Badlop) (EJAB-285).
...
SVN Revision: 921
2007-09-06 07:45:01 +00:00
Alexey Shchepin
ef57d79093
* src/mod_offline_odbc.erl: Bugfix
...
SVN Revision: 920
2007-09-04 22:12:33 +00:00
Mickaël Rémond
dcc05ac8d0
* src/mod_register.erl: update ejabberd commands to support XEP-0133 (initial patch by Badlop) (EJAB-325).
...
* src/mod_configure.erl: Likewise.
* src/mod_announce.erl: Likewise.
* src/jlib.hrl: Likewise.
* src/ejabberd.cfg.example: Likewise.
* doc/guide.tex: Likewise.
SVN Revision: 918
2007-09-04 07:55:41 +00:00
Alexey Shchepin
5994816a27
* src/jlib.erl: Removed http_base_64:decode call
...
SVN Revision: 908
2007-09-02 15:56:17 +00:00
Alexey Shchepin
978b7aea12
* src/mod_muc/mod_muc_room.erl: Added logging of MUC admin/owner
...
queries
SVN Revision: 907
2007-09-01 21:15:40 +00:00
Alexey Shchepin
722563ed94
* src/mod_muc/mod_muc_room.erl: Added user_message_shaper and
...
room_shaper options
* src/mod_muc/mod_muc.erl: Likewise
SVN Revision: 906
2007-09-01 21:05:04 +00:00
Mickaël Rémond
2c57215904
* src/web/ejabberd_web_admin.erl: Make the web interface pages
...
"translatable" (Thanks to Badlop) (EJAB-11).
SVN Revision: 902
2007-08-31 16:13:35 +00:00
Alexey Shchepin
6cc2042fec
* src/ejabberd.cfg.example: Updated mod_muc 'host' option default
...
value (thanks to Badlop)
SVN Revision: 901
2007-08-29 18:29:07 +00:00
Alexey Shchepin
4a26e75992
* src/mod_muc/mod_muc_room.erl: The mod_muc option max_users now
...
limits max number of users in rooms and max_users_admin_threshold
sets a number of admin or owner accounts allowd to join after
max_users occupants
SVN Revision: 900
2007-08-29 17:54:45 +00:00
Alexey Shchepin
90ff184472
* src/mod_muc/mod_muc_log.erl: Added missed HTMLization in a
...
nickname change logging (thanks to Badlop)
SVN Revision: 896
2007-08-29 13:17:03 +00:00
Mickaël Rémond
52c10089aa
* src/mod_muc/mod_muc_room.erl: Changed default max number of user
...
in a room to 200 (EJAB-248)
SVN Revision: 895
2007-08-28 15:05:52 +00:00
Mickaël Rémond
b0bb9a79c3
* src/mod_offline_odbc.erl: Implements quota for offline messages
...
in relational database (EJAB-314)
* src/odbc/odbc_queries.erl: Likewise
SVN Revision: 893
2007-08-28 14:36:39 +00:00
Mickaël Rémond
a78037fc3c
* src/mod_muc/mod_muc_room.erl: Implements muc max users option
...
from XEP-0045 (Thanks to Jerome Sautret) (EJAB-248).
SVN Revision: 892
2007-08-28 14:35:50 +00:00
Alexey Shchepin
5dfa6edda3
* src/gen_mod.erl: Substitute @HOST@ with hostname in the 'host'
...
option (thanks to Badlop)
* src/mod_vcard.erl: Likewise
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard_odbc.erl: Likewise
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_echo.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
SVN Revision: 888
2007-08-25 17:24:00 +00:00
Alexey Shchepin
24ff98d50d
Fixed conflict
...
SVN Revision: 887
2007-08-24 16:18:46 +00:00
Alexey Shchepin
a8bc3a46af
* src/web/ejabberd_web_admin.erl: Moved roster stuff to mod_roster*
...
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 886
2007-08-24 16:15:05 +00:00
Alexey Shchepin
38ad132ba2
* src/ejabberd_sm.erl: Removed check which denies resource to
...
receive its own presence
SVN Revision: 885
2007-08-24 03:54:42 +00:00
Alexey Shchepin
727a70c2cb
* src/web/ejabberd_web_admin.erl: Added hooks to allow plugins to
...
add their pages without modifying ejabberd_web_admin.erl (thanks
to Badlop)
* src/web/ejabberd_web_admin.hrl: Macro definitions moved here
* src/mod_shared_roster.erl: Updated
* src/mod_offline.erl: Likewise
* src/mod_offline_odbc.erl: Likewise
SVN Revision: 884
2007-08-23 00:51:54 +00:00
Alexey Shchepin
106cf7f963
* src/jlib.erl: Use http_base_64:decode if available
...
SVN Revision: 883
2007-08-21 22:28:41 +00:00
Alexey Shchepin
3f92fb1acc
* src/mod_roster.erl: Don't send roster push when unsubscribing in
...
"None + Pending In" state
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 882
2007-08-20 18:57:11 +00:00
Alexey Shchepin
8cc493a43f
* src/mod_offline.erl: Renamed MAX_OFFLINE_MSGS to MaxOfflineMsgs
...
SVN Revision: 881
2007-08-20 18:02:12 +00:00
Jérôme Sautret
6fcef6f5c4
* src/odbc/ejabberd_odbc_sup.erl: Add an odbc_pool_size config file option to choose the number of SQL
...
connection in each pool (EJAB-58).
* src/odbc/ejabberd_odbc.erl: Add an odbc_keepalive_interval config file option to perform a keep
alive query at given interval (EJAB-206).
SVN Revision: 879
2007-08-16 16:37:00 +00:00
Mickaël Rémond
731457a8bb
* src/mod_offline.erl: Added a config option to define the maximum
...
number of offline messages per user (EJAB-314).
SVN Revision: 878
2007-08-13 17:28:26 +00:00
Mickaël Rémond
db957c4295
* src/mod_offline.erl: Returns an error message to sender when
...
message is discarded due to quota (EJAB-314).
SVN Revision: 871
2007-08-13 10:27:28 +00:00
Mickaël Rémond
915d94b0dc
* src/odbc/ejabberd_odbc.erl: UTF-8 support for MySQL5 (EJAB-318).
...
SVN Revision: 868
2007-08-12 15:39:01 +00:00
Mickaël Rémond
b352d1bddd
* src/mod_offline.erl: Typo.
...
SVN Revision: 861
2007-08-08 09:54:26 +00:00
Mickaël Rémond
4e82569bcb
* src/mod_offline.erl: Only count messages if a quota has been
...
actually set (EJAB-314).
* src/p1_mnesia.erl: Minor coding style change.
SVN Revision: 860
2007-08-08 09:48:41 +00:00
Mickaël Rémond
9d03ea3f98
* src/mod_offline.erl: Started implementation of mod_offline
...
quota. For now, it require change in code. Will be turn into a
config file parameter soon. (EJAB-314).
* src/p1_mnesia.erl: Added memory efficient record count in
Mnesia.
SVN Revision: 859
2007-08-07 16:43:02 +00:00
Mickaël Rémond
c72cb51c73
* src/mod_announce.erl: Added support to all the announce features described in documentation. Access to all announce features through command line, adhoc commands and disco (Thanks to Badlop) (EJAB-18).
...
* src/gen_mod.erl: Likewise.
* doc/guide.tex: Likewise.
SVN Revision: 858
2007-08-03 08:53:05 +00:00
Alexey Shchepin
7c24a9a400
* src/mod_muc/mod_muc.erl: Added default_room_options option
...
(thanks to Etan Reisner and Badlop)
* src/mod_muc/mod_muc_room.erl: Likewise
* doc/guide.tex: Updated
SVN Revision: 856
2007-08-02 02:30:25 +00:00
Mickaël Rémond
f9221e2212
* src/ejabberd_s2s_out.erl: Avoid bouncing messages twice if terminate happens during open_connect.
...
SVN Revision: 854
2007-08-01 11:25:23 +00:00
Mickaël Rémond
dda2464b85
* src/ejabberd_s2s_out.erl: On terminate, bounce internal process queue and Erlang message queue.
...
SVN Revision: 853
2007-08-01 11:18:52 +00:00
Mickaël Rémond
a1481f27aa
* src/mod_private.erl: Reduce memory consumption on user private storage removal (EJAB-299).
...
SVN Revision: 852
2007-08-01 09:36:30 +00:00
Mickaël Rémond
442dd0667b
* src/xml.erl: Removing debug printout.
...
SVN Revision: 851
2007-07-31 14:47:52 +00:00
Mickaël Rémond
1ab47669ff
* src/xml.erl: Making use of CDATA escaping optional through with a compile time option (EJAB-298).
...
* src/Makefile.in: Likewise.
* src/configure.ac: Likewise.
SVN Revision: 849
2007-07-31 12:05:00 +00:00
Alexey Shchepin
a78ea8fb54
* src/mod_version.erl: Added option to hide OS version (thanks to
...
Badlop)
* doc/guide.tex: Updated
SVN Revision: 848
2007-07-31 04:13:58 +00:00
Alexey Shchepin
588b43f9b7
* src/msgs/zh.msg: Updated (thanks to Shelley Shyan)
...
* src/msgs/es.msg: Updated (thanks to Badlop)
SVN Revision: 847
2007-07-31 04:13:49 +00:00
Alexey Shchepin
db5aa57774
* src/msgs/gl.msg: New galician translation (thanks to
...
Carlos E. Lopez)
SVN Revision: 846
2007-07-31 04:13:39 +00:00
Alexey Shchepin
27a826cfe8
* src/ejabberd_config.erl: Added possibility for appending values
...
to config options (thanks to Badlop)
* doc/guide.tex: Updated
SVN Revision: 845
2007-07-31 04:13:29 +00:00
Mickaël Rémond
bdb2c6820f
* src/xml.erl: Better escaping management with CDATA. We only add CDATA enclosure when needed. CDATA end token is properly escaped.
...
SVN Revision: 844
2007-07-30 17:35:00 +00:00
Mickaël Rémond
af33f13371
* src/xml.erl: Only wrap xmldata nodes in xml cdata "tag" if bigger than 50 bytes. Shorter xmlcdata nodes will be escaped.
...
SVN Revision: 842
2007-07-30 13:13:59 +00:00
Mickaël Rémond
15eee1c604
* src/tls/tls_drv.c: Sends the entire certificate chain (EJAB-209).
...
SVN Revision: 841
2007-07-30 12:29:02 +00:00
Mickaël Rémond
bf6e5a0d26
* src/acl.erl: Remove compilation warnings (EJAB-290).
...
SVN Revision: 840
2007-07-30 11:06:50 +00:00
Mickaël Rémond
e9bbed2299
* src/xml_stream.erl: Group CDATA on a single xmlcdata node (splitting is not relevant as dependant on TCP/IP packet fragmentation) (EJAB-292).
...
SVN Revision: 839
2007-07-30 10:06:49 +00:00
Mickaël Rémond
3f51e73944
* src/xml.erl: Remove compilation warnings (EJAB-290).
...
SVN Revision: 838
2007-07-30 09:09:24 +00:00
Mickaël Rémond
3cd7d1b54b
* src/xml.erl: Removed more code commented out.
...
SVN Revision: 837
2007-07-30 08:36:03 +00:00
Mickaël Rémond
b8cd5c3f0e
* src/xml.erl: Do not crypt binary CData, but enclose the value in
...
XML CDATA "tag".
* src/xml.erl: Code clean-up: removed old code in comments.
SVN Revision: 836
2007-07-30 08:32:47 +00:00
Mickaël Rémond
888acbdb2e
* src/mod_roster_odbc.erl: Better error management when bad JID in roster table (EJAB-289).
...
SVN Revision: 835
2007-07-28 09:36:37 +00:00
Mickaël Rémond
bf416ad52d
* src/web/ejabberd_web_admin.erl: Code clean-up.
...
SVN Revision: 834
2007-07-26 10:22:44 +00:00
Mickaël Rémond
eee30112ef
* Added TODO comment
...
SVN Revision: 833
2007-07-26 10:13:04 +00:00
Mickaël Rémond
59fa698967
* src/mod_offline.erl: Code clean-up.
...
SVN Revision: 832
2007-07-26 10:08:41 +00:00
Mickaël Rémond
8d9e093788
* src/gen_mod.erl: Throw error more cleanly.
...
SVN Revision: 831
2007-07-26 09:56:38 +00:00
Mickaël Rémond
75448d953d
* src/mod_configure.erl: One ACL call was not virtual host compliant.
...
SVN Revision: 829
2007-07-26 09:49:23 +00:00
Mickaël Rémond
b1a3c639cb
* src/ejabberd_auth_odbc.erl: Fixed wrong call preventing user removal with relational databases.
...
SVN Revision: 828
2007-07-26 09:42:14 +00:00
Mickaël Rémond
9081f1f2b6
* src/mod_last_odbc.erl: Adapted to mod_privacy changes.
...
* src/mod_privacy_odbc.erl: Refactoring to extract records in include file.
SVN Revision: 827
2007-07-26 09:37:16 +00:00
Mickaël Rémond
df57442d75
* src/mod_last.erl: Adapted to mod_privacy changes.
...
SVN Revision: 826
2007-07-26 09:29:52 +00:00
Mickaël Rémond
ad16c0f4a4
* src/mod_last.erl: Adapted to mod_privacy changes.
...
* src/mod_privacy.erl: Refactoring to extract records in include file.
* src/mod_privacy.hrl: Likewise.
SVN Revision: 825
2007-07-26 09:13:31 +00:00
Mickaël Rémond
54a5b2d3e9
* src/mod_roster_odbc.erl: Fixed wrong call.
...
SVN Revision: 824
2007-07-26 08:30:25 +00:00
Mickaël Rémond
637ce31f5e
* src/p1_fsm.erl: Use of catch can break tail recursion.
...
SVN Revision: 823
2007-07-25 08:48:55 +00:00
Mickaël Rémond
6e24711099
* src/ejabberd_s2s_out.erl: Autodisconnect s2s connections which are overloaded (EJAB-287).
...
* src/p1_fsm.erl: Likewise.
SVN Revision: 821
2007-07-24 09:04:09 +00:00
Mickaël Rémond
799ff1d883
* src/ejabberd_s2s_in.erl: Add s2s whitelist / blacklist support on incoming s2s connections (EJAB-283)
...
* src/ejabberd_s2s.erl: Likewise
SVN Revision: 820
2007-07-19 21:17:13 +00:00
Mickaël Rémond
944ef9bbc2
* src/ejabberd_s2s.erl: Fixed typo.
...
SVN Revision: 819
2007-07-18 18:42:00 +00:00
Mickaël Rémond
9da2c78eb4
* src/ejabberd_s2s.erl: Implements s2s hosts whitelist / blacklist
...
* src/ejabberd.cfg.example: Likewise
SVN Revision: 818
2007-07-18 17:42:53 +00:00
Mickaël Rémond
abadd82c66
* src/ejabberd_s2s_out.erl: Make s2s connections more robust
...
* src/ejabberd_s2s.erl: Likewise
SVN Revision: 817
2007-07-18 16:26:50 +00:00
Mickaël Rémond
dcf883005d
* src/mod_configure.erl: Bugfix: Show only virtual host users on admin disco for all users (EJAB-268) (Thanks to Badlop).
...
SVN Revision: 816
2007-07-17 08:21:28 +00:00
Mickaël Rémond
0b0c889bca
* src/mod_muc/mod_muc_log.erl: Recognise more URI schemes in logged HTML (EJAB-279) (Thanks to qu1j0t3).
...
SVN Revision: 815
2007-07-17 07:55:26 +00:00
Mickaël Rémond
1b19d72e6f
* src/ejabberd_s2s_out.erl: Improved place of the INFO / DEBUG printout (EJAB-282).
...
SVN Revision: 814
2007-07-17 07:20:55 +00:00
Mickaël Rémond
745be8373f
* src/odbc/ejabberd_odbc.erl: Better error handling for MySQL native driver (EJAB-224).
...
SVN Revision: 813
2007-07-17 07:09:04 +00:00
Alexey Shchepin
2810c2b300
* src/ejabberd_s2s.erl: Added remove_connection/3
...
* src/ejabberd_s2s_out.erl: Bugfix: remove only own s2s record
SVN Revision: 812
2007-07-15 07:28:47 +00:00
Alexey Shchepin
907878081d
* src/ejabberd_s2s_out.erl: Bounce packets after unregistering s2s
...
connection, not before
SVN Revision: 811
2007-07-11 14:10:28 +00:00
Mickaël Rémond
b16e3f6d0b
* src/mod_echo.erl: mod_echo does not reply to other components. This is to make sure that a component will not discover its own capabilities (EJAB-281).
...
* src/ejabberd.cfg: disable mod_echo in the example config file. mod_echo is mainly a development/test module.
SVN Revision: 810
2007-07-11 08:37:30 +00:00
Mickaël Rémond
3fe646c3cb
* src/odbc/mssql.sql: Nickname cannot be null in rosterusers table (MSSQL)
...
* src/odbc/mysql.sql: Likewise
* src/odbc/pg.sql: Likewise
SVN Revision: 809
2007-07-09 17:22:09 +00:00
Mickaël Rémond
03fde5d50c
* Added missing file.
...
SVN Revision: 807
2007-06-30 06:07:09 +00:00
Mickaël Rémond
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
Mickaël Rémond
ede1693f20
* src/ejabberd_auth_anonymous.erl: Do not purge non anonymous accounts when using anonymous authentication with another type of auth (EJAB-216).
...
SVN Revision: 805
2007-06-28 17:39:53 +00:00
Mickaël Rémond
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
Christophe Romain
d27fbcc27c
corrects EJAB-273, remove obsolete OnlineUsers calculation
...
SVN Revision: 801
2007-06-28 08:31:46 +00:00
Jérôme Sautret
2e00142b38
Cancel revision 798
...
SVN Revision: 799
2007-06-27 11:05:14 +00:00
Jérôme Sautret
9cd3a6db07
Unsafe working version of http file transfer
...
SVN Revision: 798
2007-06-27 10:01:39 +00:00
Alexey Shchepin
ef7e43b2dc
* src/mod_muc/mod_muc_room.erl: Include <body/> in MUC invitations
...
for older clients (thanks to Michael Scherer)
SVN Revision: 796
2007-06-26 18:00:36 +00:00
Mickaël Rémond
20da906311
* src/mod_muc/mod_muc_room.erl: New anti-abuse options: min_presence_interval and min_message_interval (EJAB-227)
...
* doc/guide.tex: Likewise
SVN Revision: 794
2007-06-25 16:43:42 +00:00
Christophe Romain
7ec8ce9e50
apply patch from EJAB-261
...
SVN Revision: 793
2007-06-25 12:09:43 +00:00
Mickaël Rémond
009339a956
* doc/guide.tex: Watchdog alert documentation
...
* src/ejabberd.cfg.example: Likewise
SVN Revision: 790
2007-06-25 07:15:30 +00:00
Alexey Shchepin
57e3d9fda7
* src/mod_irc/mod_irc.erl: Added an option for default IRC
...
encoding (thanks to Badlop)
* doc/guide.tex: Updated
SVN Revision: 789
2007-06-22 15:25:27 +00:00
Alexey Shchepin
a53efc2b05
* src/mod_disco.erl: Don't override accumulated value in
...
get_local_identity/5 (thanks to Magnus Henoch and Badlop)
SVN Revision: 788
2007-06-22 14:15:43 +00:00
Alexey Shchepin
56b5d113a4
* src/web/ejabberd_web_admin.erl: Added links to server and
...
virtual host homes (thanks to Badlop)
SVN Revision: 787
2007-06-22 14:04:45 +00:00
Mickaël Rémond
81117800e8
* src/mod_muc/mod_muc_room.erl: It is now possible to limit who is allowed to create persistent MUC rooms (Thanks to Badlop) (EJAB-257)
...
* src/mod_muc/mod_muc.erl: Likewise
* doc/guide.tex: Likewise
* src/ejabberd.cfg.example: Likewise
SVN Revision: 786
2007-06-20 11:25:19 +00:00
Mickaël Rémond
d2dd6eef09
* src/odbc/odbc_queries.erl: Added missing users_number/1 for MSSQL (EJAB-239).
...
SVN Revision: 785
2007-06-18 10:22:54 +00:00
Alexey Shchepin
697566476f
* src/mod_roster_odbc.erl: Fixed typo
...
SVN Revision: 782
2007-06-12 16:44:15 +00:00
Alexey Shchepin
241c49dc3c
* src/web/ejabberd_web_admin.erl: Show IP address of connected
...
resources on user info page (thanks to Oleg Palij)
SVN Revision: 781
2007-06-10 18:13:37 +00:00
Alexey Shchepin
3b7e23df5a
* src/ejabberd_config.erl: Fixed "language" option processing
...
(thanks to Badlop)
SVN Revision: 780
2007-06-07 18:27:35 +00:00
Alexey Shchepin
ab0315e592
* src/msgs/zh.msg: Updated (thanks to Shelley Shyan)
...
* src/msgs/ca.msg: New Catalan translation (thanks to Vicent
Alberola)
SVN Revision: 779
2007-06-07 18:17:16 +00:00
Mickaël Rémond
9f48fe49c3
* src/xml.erl: Add new helper function get_subtag_cdata/2.
...
SVN Revision: 778
2007-06-05 01:50:28 +00:00
Alexey Shchepin
b9e790f637
* src/mod_vcard_odbc.erl: Fix for previous commit (thanks to
...
Badlop)
SVN Revision: 777
2007-05-30 21:15:28 +00:00
Mickaël Rémond
5c15f185c2
* src/mod_vcard_odbc.erl: Make service description translatable in discovery (EJAB-236)
...
* src/mod_vcard_ldap.erl: Likewise
SVN Revision: 776
2007-05-29 14:53:09 +00:00
Mickaël Rémond
c228e7aeb3
* src/Makefile.in: Added Dialyzer target (EJAB-189 - Thanks to Geoff Cant)
...
* src/Makefile.in: Build XmppAddr.beam in a single pass
* src/mod_muc/Makefile.in: +debug_info directive support
* src/stringprep/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/web/Makefile.in: Likewise
* src/eldap/Makefile.in: Likewise
* src/mod_pubsub/Makefile.in: Likewise
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_proxy65/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
* src/odbc/Makefile.in: Likewise
SVN Revision: 775
2007-05-29 14:31:12 +00:00
Mickaël Rémond
03740c8bca
* src/mod_vcard.erl: Make services description translatable in discovery (EJAB-236 - thanks to Badlop)
...
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
* src/msgs/fr.msg: Added service description translation
SVN Revision: 774
2007-05-29 13:14:09 +00:00
Alexey Shchepin
c9e139d80a
* src/ejabberdctl.template: Updated version of ejabberdctl (thanks
...
to Christophe Romain)
* tools/ejabberdctl: Likewise
* src/Makefile.in: Updated
SVN Revision: 773
2007-05-21 03:41:13 +00:00
Alexey Shchepin
9a6e8e3c55
* src/ejabberd_sm.erl: Updated the session table to store
...
additional session info
* src/ejabberd_c2s.erl: Report IP address to ejabberd_sm (thanks
to Christophe Romain)
SVN Revision: 772
2007-05-21 03:21:34 +00:00
Alexey Shchepin
06320f429a
* src/msgs/zh.msg: New chinese translation (thanks to Shelley
...
Shyan)
SVN Revision: 771
2007-05-18 13:01:05 +00:00
Alexey Shchepin
8c326ea928
* src/mod_muc/mod_muc_room.erl: Corrected error messages when
...
trying to join members-only room (thanks to Badlop)
* src/ejabberd_c2s.erl: Added c2s_update_presence hook
SVN Revision: 770
2007-05-16 10:13:04 +00:00
Alexey Shchepin
897cc13f42
* src/ejd2odbc.erl: Bugfix (thanks to Badlop)
...
SVN Revision: 769
2007-05-15 00:07:25 +00:00
Alexey Shchepin
b444faaf89
* src/ejd2odbc.erl: Bugfix (thanks to Badlop)
...
SVN Revision: 768
2007-05-13 22:41:19 +00:00
Alexey Shchepin
a087c00a92
* src/mod_stats.erl: Updated
...
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 767
2007-05-12 18:14:21 +00:00
Alexey Shchepin
8aab10d28c
* src/ejabberd_auth.erl: Added get_vh_registered_users_number/1
...
function
* src/ejabberd_auth_odbc.erl: Likewise
* src/odbc/odbc_queries.erl: Added users_number/1 function
* src/ejabberd.cfg.example: Added an example for
pgsql_users_number_estimate option
SVN Revision: 766
2007-05-12 18:09:38 +00:00
Alexey Shchepin
a10923c197
* src/ejabberd_auth_anonymous.erl: Added anonymous_purge_hook
...
(thanks to Christophe Romain and Mickael Remond)
* src/mod_offline.erl: Likewise
* src/mod_offline_odbc.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 765
2007-05-12 16:28:34 +00:00
Alexey Shchepin
737bb8888a
* src/mod_muc/mod_muc.erl: Bugfix
...
SVN Revision: 764
2007-05-09 14:47:58 +00:00
Alexey Shchepin
396b945d20
* src/ejabberd_receiver.erl: Workaround for inet_drv bug
...
* src/web/ejabberd_http_poll.erl: Added sockname/1 and peername/1
stubs
SVN Revision: 763
2007-05-07 17:52:35 +00:00
Alexey Shchepin
32613987a8
* src/web/ejabberd_http.hrl: Added "ip" field in the "request"
...
record
* src/web/ejabberd_http.erl: Likewise
SVN Revision: 762
2007-05-07 15:47:33 +00:00
Alexey Shchepin
372944df6c
* src/ejabberd_sm.erl: Added set_presence_hook
...
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 761
2007-05-03 15:45:24 +00:00
Alexey Shchepin
ab0d7b9151
* src/ejabberd_sm.erl: Added set_presence_hook
...
SVN Revision: 760
2007-05-03 07:41:16 +00:00
Alexey Shchepin
2ae5d13ab8
* src/ejabberd_sm.erl: Added check for existence of incoming
...
subscription destination
SVN Revision: 759
2007-05-03 05:15:12 +00:00
Alexey Shchepin
acdb78c28a
* src/msgs/it.msg: Added italian translation (thanks to Luca
...
Brivio)
SVN Revision: 758
2007-05-03 04:29:35 +00:00
Alexey Shchepin
b9e7fa2ef1
* src/mod_muc/mod_muc_room.erl: More accurate invitation errors
...
(thanks to Magnus Henoch)
SVN Revision: 757
2007-05-03 04:07:29 +00:00
Christophe Romain
3acce9763a
make install does not overwrites existing ejabberd.cfg anymore, ejabberd.cfg-new created instead
...
SVN Revision: 756
2007-04-30 07:08:01 +00:00
Alexey Shchepin
1e5a9d9f43
* src/mod_roster_odbc.erl: Don't deliver roster items in "None +
...
Pending In" state
* src/mod_roster.erl: Likewise
SVN Revision: 752
2007-04-26 14:45:16 +00:00
Alexey Shchepin
fa6b6b8f5a
* src/ejabberd_socket.erl: Added API for monitoring socket
...
processes
* src/ejabberd_frontend_socket.erl: Likewise
* src/ejabberd_c2s.erl: Added socket monitoring
* src/mod_muc/mod_muc_room.erl: Fixed the stop reason for the
destroy event
SVN Revision: 751
2007-04-12 06:08:32 +00:00
Alexey Shchepin
c65e1e7ae0
* src/ejabberd_sm.erl: Minor optimisation
...
* src/ejabberd_system_monitor.erl: Experimental watchdog
* src/ejabberd_sup.erl: Likewise
* src/ejabberd_config.erl: Likewise
SVN Revision: 750
2007-04-12 05:31:53 +00:00
Alexey Shchepin
86cd895b6d
* src/mod_muc/mod_muc.erl: Better behaviour under high load
...
SVN Revision: 748
2007-03-22 02:26:35 +00:00
Alexey Shchepin
77282b0e1a
* src/ejabberd_s2s.erl: Don't bounce packets with "error" and
...
"result" type
SVN Revision: 747
2007-03-17 23:02:06 +00:00
Alexey Shchepin
3d7090f62c
* src/ejabberd_s2s.erl: Fixed spelling
...
SVN Revision: 746
2007-03-17 22:53:42 +00:00
Alexey Shchepin
829f30e63b
* src/ejabberd_s2s.erl: Don't start s2s process for existing
...
connection in case of race condition
SVN Revision: 745
2007-03-17 22:17:03 +00:00
Alexey Shchepin
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
Mickaël Rémond
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
Mickaël Rémond
44d3ea9c42
* src/web/ejabberd_http.erl: Support for binaries in ejabberd HTTP
...
server (Thanks to Massimiliano Mirra) (EJAB-197).
SVN Revision: 742
2007-03-10 17:57:19 +00:00
Mickaël Rémond
2f11e6beac
* src/configure.ac: autoconf improvements (thanks to Tony Finch) (EJAB-204).
...
* src/aclocal.m4: Likewise.
SVN Revision: 741
2007-03-10 16:27:17 +00:00