Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-28 22:52:27 +02:00
Code Releases Activity
2,659 Commits 7 Branches 107 Tags 82 MiB
4caf4da9a6
Commit Graph

55 Commits

Author SHA1 Message Date
Pablo Polvorin
b22e8b706a 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:34:09 +01:00
Badlop
1bcd481fdc Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 
SVN Revision: 2892
 2010-01-12 16:15:16 +00:00
Badlop
929022bc0f Apply a forgotten part of the original patch (EJAB-1119) 
SVN Revision: 2793
 2009-12-08 17:33:30 +00:00
Badlop
21a36819b0 Fix memory and port leak when TLS is enabled in HTTP (thanks to Brian Cully)(EJAB-1119) 
SVN Revision: 2791
 2009-12-07 17:34:52 +00:00
Badlop
372658d299 Merged from trunk SVN r2671: 
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: 2681
 2009-10-19 14:53:21 +00:00
Badlop
73f2fc76d9 Log an error if HTTP request does not include Host header (EJAB-966) 
SVN Revision: 2387
 2009-07-23 14:51:16 +00:00
Badlop
020a3e6d6b Revert workaround of EJAB-611 because it seems no longer required (EJAB-709) 
SVN Revision: 2371
 2009-07-17 21:47:26 +00:00
Pablo Polvorin
dc613df3b1 Do not indent the resulting html. Indentation in exmpp is buggy, and there isn't a real adventage on indenting the generated html 
SVN Revision: 2106
 2009-05-27 15:02:44 +00:00
Badlop
55bebb0f62 Implement XEP-158 CAPTCHA Forms, support in mod_muc, sample script (thanks to Evgeniy Khramtsov)(EJAB-895) 
SVN Revision: 2102
 2009-05-26 17:20:09 +00:00
Badlop
c73e87e9c8 Merge fix from trunk r1910 
* src/web/ejabberd_http.erl: Added a workaround for inet:peername
returning 'ebadf'

SVN Revision: 1928
 2009-02-27 16:19:19 +00:00
Pablo Polvorin
7c10f3422a src/web/ejabberd_web_admin.erl, src/web/ejabberd_web_admin.hrl: 
Many exmpp related fixes. Fix a bug when displaying users lists, 
if we can't access the 'offline_msg' mnesia table (using mod_offline_odbc).
This fix should be temporal, we should find a better way to manage this
situation.

src/web/ejabberd_http.erl: Language must be in binary() format.

src/translate.erl: Remove a debug call to io:format/2.

src/ejabberd_sm.erl, src/mod_configure.erl, src/mod_disco.erl:
ejabberd_sm:get_user_resources/2 returns resources as binary().

src/ejabberd_sm.erl: Bugfix in get_user_info/3.

SVN Revision: 1886
 2009-02-18 18:03:11 +00:00
Jean-Sébastien Pédron
93b26d947c Add documentation stub for some types. This will be filled later. 
PR:		EJABP-1

SVN Revision: 1865
 2009-02-06 13:34:12 +00:00
Jean-Sébastien Pédron
ff500d8297 Merge from trunk (r1787 to r1804). 
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.

Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1766, r1768, r1781, r1783, r1794, r1797, r1799, r1802.

Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1829
 2009-01-19 14:47:33 +00:00
Jean-Sébastien Pédron
9e96043255 Merge from trunk (r1649 to r1692). 
PR:		EJABP-1

SVN Revision: 1695
 2008-12-01 15:53:30 +00:00
Jean-Sébastien Pédron
50b1e4c36f Convert to exmpp. 
The admin web interface is working but HTTP polling seems broken in the
trunk.

PR:		EJABP-1

SVN Revision: 1654
 2008-10-13 15:36:43 +00:00
Jean-Sébastien Pédron
4eaa8e19c9 Merge from trunk (r1457 to r1563). 
SVN Revision: 1564
 2008-09-16 14:39:57 +00:00
Jean-Sébastien Pédron
332fb55e3a MFC: 
Merge revisions from 1362 to revision 1434 from trunk.

SVN Revision: 1435
 2008-07-11 12:48:27 +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
Badlop
2d2fcc8210 * doc/guide.tex: Updated copyright dates to 2008 
* src/*: Likewise

SVN Revision: 1153
 2008-01-15 17:02:57 +00:00
Mickaël Rémond
22f928122f * Applied copyright patch 3. 
SVN Revision: 1113
 2007-12-24 13:57:53 +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
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
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
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
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
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
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
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
Alexey Shchepin
5b4e116cfd * src/web/ejabberd_http.erl: Added separate version of 
element_to_string for HTML encoding
* src/xml.erl: Reverted previous change

SVN Revision: 722
 2007-02-04 16:04:40 +00:00
Alexey Shchepin
00807235c4 * src/web/*: Plugin architecture for HTTP modules (thanks to 
Massimiliano Mirra)

SVN Revision: 713
 2007-01-25 05:53:58 +00:00
Alexey Shchepin
aa478100d8 * src/ejabberd_socket.erl: Support for non-xml sockets 
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/web/ejabberd_http.erl: Likewise

SVN Revision: 629
 2006-09-25 03:51:11 +00:00
Mickaël Rémond
05c50cc5ca * src/web/ejabberd_http.erl: The web module now accepts HTTP 
absolute URL (used behind a proxy). This apply to HTTP polling and to
the web interface (Thanks to Jean-Sebastien Pedron).

SVN Revision: 576
 2006-06-02 15:02:39 +00:00
Alexey Shchepin
dc57e75e8f * src/web/ejabberd_http.erl: Authentication check moved to 
ejabberd_web.erl
* src/web/ejabberd_web.erl: Likewise

* src/web/Makefile.in: Added ejabberd_http.hrl dependency

* src/web/ejabberd_http_poll.erl: Updated to use {active, once}
socket mode

* src/mod_irc/mod_irc.erl: Updated to use gen_server behaviour and
ejabberd supervision tree
* src/mod_irc/mod_irc_connection.erl: Likewise

SVN Revision: 498
 2006-02-03 03:28:15 +00:00
Alexey Shchepin
6bb510d99e * src/ejabberd_service.erl: Bugfix 
* src/ejabberd_receiver.erl: Rewritten to use {active, once} mode
for socket
* src/ejabberd_c2s.erl: Update
* src/ejabberd_listener.erl: Likewise
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/shaper.erl: Likewise
* src/tls/tls.erl: Likewise
* src/web/ejabberd_http.erl: Likewise

SVN Revision: 483
 2006-01-13 01:55:20 +00:00
Alexey Shchepin
53ddd788ef * src/web/ejabberd_http.erl: Now web interface is compliant to 
XHTML 1.0 Transitional (thanks to Sander Devrieze)
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 444
 2005-11-26 18:56:39 +00:00
Alexey Shchepin
3fdf05a507 * src/web/ejabberd_web_admin.erl: Fixed encoding of user names in 
URLs

* src/web/ejabberd_http.erl: Added url_encode function from yaws

SVN Revision: 441
 2005-11-22 18:25:02 +00:00
Alexey Shchepin
94ed3740d9 * src/web/ejabberd_http.erl: "Connection:" header value now 
matched case-insensitive, and returned to client, replaced
duplicate is_space($\r) with is_space($\t) (thanks to Maxim
Ryazanov)

SVN Revision: 353
 2005-05-22 23:29:54 +00:00
tmallard
374446f847 Merged the Process One contributions ( Virtual Hosting ) 
SVN Revision: 307
 2005-04-17 18:08:34 +00:00
Alexey Shchepin
34de660c44 * src/web/ejabberd_http.erl: Fixed processing of POST body for 
HTTP Polling

* src/web/ejabberd_http.erl: Support for "Connection" HTTP header
(thanks to Sergei Golovan)

* src/translate.erl: Much better handling of xml:lang (thanks to
Sergei Golovan)

SVN Revision: 271
 2004-09-30 21:54:39 +00:00
Alexey Shchepin
0e2af703bd * src/web/ejabberd_http.erl: Bugfix 
SVN Revision: 269
 2004-09-29 14:09:02 +00:00
Alexey Shchepin
4e7e67c8b5 * src/jlib.hrl: Added namespace for iq-register stream feature 
* src/ejabberd_c2s.erl: Send iq-register feature

* src/ejabberd_config.erl: Config file can be configured from the
command line (thanks to Mickael Remond)

* src/web/ejabberd_http.erl: Added SSL support (thanks to Sergei
Golovan)

* src/msgs/*.msg: Updated (thanks to Sergei Golovan)

* src/jlib.hrl: Updated error codes (thanks to Sergei Golovan)
* src/ejabberd_c2s.erl: Likewise

SVN Revision: 266
 2004-09-25 20:52:20 +00:00
Alexey Shchepin
b88da95b51 * src/Makefile.win32: Updated (thanks to Sergei Golovan) 
* src/Makefile.in: Added installation of ejabberd.cfg (thanks to
Sergei Golovan)

* src/web/ejabberd_http.erl: Fixed support for HTTP/1.0 clients

* doc/guide.tex: Updated (thanks to Sergei Golovan)

SVN Revision: 240
 2004-07-06 21:34:50 +00:00
Alexey Shchepin
0b4539caa1 * src/web/ejabberd_http.erl: Added options for enabling HTTP 
polling and admin interface
* src/web/ejabberd_web.erl: Likewise
* src/ejabberd.cfg.example: Updated

* src/web/ejabberd_web_admin.erl: Updated

* doc/guide.tex: Updated

SVN Revision: 236
 2004-05-22 19:48:35 +00:00
Alexey Shchepin
a16524151c * src/web/ejabberd_web_admin.erl: Updated 
SVN Revision: 228
 2004-05-04 19:47:24 +00:00
Alexey Shchepin
4760ff3201 * src/web/ejabberd_http.erl: 'Accept-Language' header support 
* src/web/ejabberd_web_admin.erl: Likewise
* src/msgs/ru.msg: Updated

* src/mod_muc/mod_muc_room.erl: Send status code "201" on room
creation

SVN Revision: 227
 2004-05-01 20:10:25 +00:00
Alexey Shchepin
aaccaa5a45 * src/web/ejabberd_web_admin.erl: Better design for administration 
interface (not completed) (thanks to Andrey Zamaraev)
* src/web/ejabberd_http.erl: Updated
* src/web/ejabberd_web.erl: Likewise

SVN Revision: 225
 2004-04-26 15:38:07 +00:00
Alexey Shchepin
0ab31f0822 * src/web/ejabberd_http.erl: Increased receive buffer 
* src/mod_irc/mod_irc_connection.erl: Support for "/quote" command

SVN Revision: 224
 2004-04-17 19:00:10 +00:00
Alexey Shchepin
2f47b7edd9 * doc/guide.tex: Updated 
* src/web/ejabberd_web.erl: Updated

* src/web/ejabberd_http.erl: Bugfix

SVN Revision: 220
 2004-03-20 20:55:58 +00:00
Alexey Shchepin
b4798f76a3 * src/web/ejabberd_web.erl: New interface for ACLs editing 
* src/web/ejabberd_http_poll.erl: Fixed "Content-Type" header,
"Set-Cookie" is included only in first response in session, added
missed behaviour definition

* src/web/ejabberd_http.erl: "Content-Type" header now can be
changed

SVN Revision: 215
 2004-03-13 20:01:37 +00:00