Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity
2,236 Commits 7 Branches 110 Tags 68 MiB
c8df607173
Commit Graph

287 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
91a7110941 * src/*.erl: Fix EDoc comments 
SVN Revision: 1771
 2009-01-03 21:29:54 +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