Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-06 15:37:52 +01:00
Code Releases Activity
2,910 Commits 7 Branches 109 Tags 65 MiB
7c0b2f5425
Commit Graph

402 Commits

Author SHA1 Message Date
Badlop
ba9094a089 Add link in the Backup page to the Guide 2011-05-29 20:51:33 +02:00
Eric Cestari
d65b785f5d Closing properly the XMPP websocket process 2011-05-09 11:02:22 +02:00
Evgeniy Khramtsov
c98ddeb59f Merge branch '2.1.x' into 2.2.x 
Conflicts:
	src/ejabberd_captcha.erl
	src/expat_erl.c
	src/mod_muc/mod_muc_room.erl
 2011-05-04 00:04:10 +10:00
Evgeniy Khramtsov
07cf6f09b8 Implement CAPTCHA limit 2011-04-18 16:06:36 +10: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
Christophe Romain
33d4126290 merge with latest 2.1.x (pre 2.1.7) 2011-04-11 15:47:04 +02:00
Christophe Romain
5ad1d08b89 SSL sockets don't compute length of data (EJABS-1460) 2011-03-15 13:53:38 +01:00
Badlop
18fd67b311 Change string in WebAdmin to reuse an existing one 2011-03-13 18:34:50 +01:00
Christophe Romain
f39ccd73c5 Merge remote branch 'mainline/2.1.x' into 2.2.x 2011-02-14 13:54:06 +01:00
Christophe Romain
fd52f2cb7d update copyright up to 2011 2011-02-14 13:50:55 +01:00
Eric Cestari
bde46896d6 Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x 2011-02-08 16:39:38 +01:00
Eric Cestari
0c30b012f7 Websocket: corrects bug of ejabberd dropping connection under message rate. 2011-02-08 16:39:13 +01:00
Badlop
14b39a0ee4 Merge remote branch 'origin/2.1.x' into 2.2.x 
Conflicts:
	src/web/ejabberd_http_bind.erl
 2011-01-31 18:57:13 +01:00
Eric Cestari
e380eee223 WebSocket support update 
- added JSON encoding
- fix problem where session was not closed
- origin can now be decided by a custom module
 2011-01-19 14:54:20 +01:00
Eric Cestari
1959546ff9 Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x 2011-01-19 14:49:45 +01:00
Badlop
0edda6150b Clarify error message when BOSH query is sent to non-running module 2011-01-12 21:22:43 +01:00
Christophe Romain
1a2e6b02ab sync with latest 2.1.6 befor tagging 2011-01-12 12:11:04 +01:00
Eric Cestari
56bf156b6f logging works on non-configured hosts. 
In the log file, information should be logged under the default hostname.
 2011-01-11 12:55:03 +01:00
Eric Cestari
062d58026a mod_http_fileserver.erl will only conditionally gzip content by checking Accept-Encoding. 2011-01-07 15:28:26 +01:00
Eric Cestari
7ef85dddea Refactoring of ejabberd_http_fileserver.erl 
- not a gen_server anymore. Should be way faster now (no more message passing between processes)
- configuration stored in mochiglobal
- support for etag
- support for gzip compression: 
	- static (if a foo.gz is in the same dir as requested foo, it will be served)
	- always (will always gzip, will use static is available)
	- false, don't gzip
- logfile is now in another module.
 2011-01-07 15:12:51 +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
02cfb11a6d Merge branch '2.1.x' into mergefix 
Conflicts:
	.gitignore
	src/ejabberd.app
	src/ejabberd_c2s.erl
	src/ejabberd_captcha.erl
	src/ejabberd_node_groups.erl
	src/mod_caps.erl
	src/web/ejabberd_http.erl
	src/web/ejabberd_http_bind.erl
 2010-12-14 23:10:08 +09:00
Badlop
6dd35923b0 Fix warning about unused variables 2010-12-13 11:14:39 +01:00
Badlop
b83dd9f954 Support for X-Forwarded-For HTTP header (EJAB-1356) 2010-12-07 16:47:55 +01:00
Evgeniy Khramtsov
bfedd21c98 Disable error/1 auto-import (introduced in R14) 2010-12-03 23:38:18 +09: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
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
Alexey Shchepin
1d1496a667 Don't loop when there is nothing after a stream start 2010-11-26 17:08:00 +01:00
Alexey Shchepin
b3facf092a Don't loop when there is nothing after a stream start 2010-11-25 20:33:51 +02:00
Badlop
9b88fd6646 Fix some English strings 2010-11-19 13:44:30 +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
Badlop
f672fd0824 Added mod_register_web: web page for account registration (EJAB-471) 2010-11-05 18:19:52 +01:00
Badlop
2d08dcf11a Fix errors detected by Dialyzer 2010-10-15 13:17:32 +02:00
Christophe Romain
7da8d9e4e3 merge resolved against latest 2.1.x 2010-10-13 11:02:22 +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
350af319bf fixes annoying crash with controller change 2010-10-08 19:26:49 +10:00
Eric Cestari
8ea523889b [TECH-1151] Websockets are now handled in pure binary 2010-09-17 16:10:59 +02:00
Eric Cestari
b44c462b0e [TECH-1151] IP now correctly stored 2010-09-17 14:49:04 +02:00
Eric Cestari
0987700a27 Rename protocol version 76 to 00 (new official name) 2010-09-17 14:24:24 +02:00
Eric Cestari
ff4f052bb1 [TECH-1151] Origin and Protocol parameters are configurable and set. 2010-09-17 14:23:34 +02:00
Eric Cestari
a45ecb70ff [TECH-1511] debug traces reorganized 2010-09-16 15:08:53 +02:00
Eric Cestari
44832e12b3 Merge branch '2.2.x' into websockets 2010-09-16 11:07:12 +02:00
Eric Cestari
b0a81778af [TECH-1511] preliminary XMPP support via websockets 2010-09-15 17:20:54 +02:00
Eric Cestari
c8567f1de2 [TECH-1511] Calls start() on handler to get a PID 2010-09-13 14:23:42 +02:00
Eric Cestari
35a0e27d04 [TECH-1511] clean support for websockets. 
Added handlers in configuration file
 2010-09-13 12:04:52 +02:00
Eric Cestari
c41bdea1f1 [TECH-1511] rough support for websockets 2010-09-10 17:14:58 +02:00
Eric Cestari
cccbf7de12 [TECH-1151] websockets are properly detected. 2010-09-10 15:04:19 +02:00
Eric Cestari
77136bccdf [TECH-1151] websocket initial code 2010-09-10 14:06:26 +02:00
Eric Cestari
a77d53d738 [TECH-1068] Added missing catch in process function 2010-09-08 17:25:37 +02:00
Eric Cestari
09da9eeb95 Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers into 2.2.x 2010-09-08 15:32:21 +02:00
Christophe Romain
76d4ba66b2 merge 2.1.x to 2.2.x 2010-09-08 15:30:52 +02:00
Eric Cestari
f284fc3284 [TECH-1068] Atom feed is good enough. 2010-09-08 15:30:28 +02:00
Eric Cestari
86a59fb469 Implemented rough access_model access control. 2010-09-07 17:23:13 +02:00
Eric Cestari
31da259a75 HTTP Delete item 2010-09-07 16:42:12 +02:00
Eric Cestari
363711a370 New features : 
- edit an item
- edit node configuration
 2010-09-07 16:22:57 +02:00
Eric Cestari
bf98fa0c01 Added node creation with configure form 
Added deletion
Better behavior in case of a crash (returns 500)
 2010-09-07 14:35:40 +02:00
Eric Cestari
cd923838c3 Making progress on the Atom interface. 
- GET items
- POST items
- GET nodes

HTTP error codes now are the ones XMPP returns.
 2010-09-07 11:32:14 +02:00
Eric Cestari
a22ebd3c49 Added support for GET a single item 
and GET an atom feed of a node
 2010-09-03 15:54:51 +02:00
Eric Cestari
353d16b8ef Post to pubsub using http POST : 
{5280, ejabberd_http, [
			 http_poll, 
			 web_admin,
			 {request_handlers, [{["pshb"], pshb_http}]} % this should be added
			]}

 To post to a node the content of the file "sam.atom" on the "foo", on the localhost virtual host, using cstar@localhost
  curl -u cstar@localhost:encore  -i -X POST  http://localhost:5280/pshb/localhost/foo -d @sam.atom
 2010-09-02 16:57:21 +02:00
Badlop
d87fff1a4c Bugfix http-poll for correctly parsing binary (thanks to Peter Lemenkov) 2010-08-19 17:38:38 +02:00
Christophe Romain
7be707f7bc Merge branch '2.1.x' into 2.2.x 2010-08-05 10:20:47 +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
Christophe Romain
628571f8cf merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash 2010-07-13 12:04:30 +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
Evgeniy Khramtsov
715cc5ea3b New configure option: --enable-nif 2010-07-01 20:54:01 +10:00
Badlop
3ab90c9d3a Don't ask for client certificate when using tls (EJAB-1267) 2010-06-25 18:33:46 +02:00
Badlop
a28aaa1fdd Log error when HTTP request has ambiguous Host header (EJAB-1261) 2010-06-16 11:33:17 +02:00
Badlop
d4ec7a2f01 New optional BOSH connection attribute process-delay (EJAB-1257) 2010-06-07 13:44:55 +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
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
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
6ac46c6171 Fix EDoc comment 2010-05-10 16:12:48 +02: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
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
705c5b4c1c New Access rule webadmin_view for read-only (thanks to Oleg Palij)(EJAB-213) 2010-04-27 23:27:44 +02: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
4a7a33168a Reduce verbosity of HTTP Binding log messages (thanks to Alexey Shchepin) 2010-02-19 00:01:26 +01:00
Badlop
6867ca43e4 Cross-domain HTTP-Bind support (thanks to Jack Moffitt)(EJAB-1168) 2010-02-15 22:42:59 +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
Evgeniy Khramtsov
9d84caebdb avoid resending <stream:error> stanzas on terminate (EJAB-1180) 
SVN Revision: 2955
 2010-02-03 11:25:03 +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
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
Badlop
05ee83bddc Improve parsing of ejabberd_sm:get_user_info result. 
SVN Revision: 2857
 2010-01-04 18:59:01 +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
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
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
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
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