Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity
1,648 Commits 7 Branches 109 Tags 66 MiB
818f28d85f
Commit Graph

46 Commits

Author SHA1 Message Date
Badlop
60f52b2cd8 Add forgotten copyright and license notices. Fix blackspaces. 
SVN Revision: 2152
 2009-06-09 10:56:49 +00:00
Badlop
b245d68568 * 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
Badlop
4c08e65fab * 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
ed3cae6f11 * 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
6482c11f92 * 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
Jean-Sébastien Pédron
fc77b48344 Merge from trunk (r1804 to r1829). 
The merge party is over, you may now double-check that everything is in
place.

PR:		EJABP-1

SVN Revision: 1830
 2009-01-19 15:27:07 +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
25009ff9f4 Merge from trunk (r1764 to r1787). 
Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1827
 2009-01-19 11:59:40 +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
67a87af459 Merge from trunk (r1563 to r1613). 
PR:		EJABP-1

SVN Revision: 1614
 2008-10-08 12:02:30 +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
07b1210b50 Merge revisions from 1444 to revision 1457 from trunk. 
SVN Revision: 1458
 2008-07-17 15:33:50 +00:00
Jean-Sébastien Pédron
574dbbfd08 Merge revisions from 1434 to revision 1444 from trunk. 
SVN Revision: 1445
 2008-07-15 08:45: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
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
Christophe Romain
b2bd9759c8 Rewrite io:format calls to loglevel macros (EJAB-555) 
SVN Revision: 1239
 2008-03-21 14:44:16 +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
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
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
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
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
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
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
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
Alexey Shchepin
cd7595e3f4 * src/ejabberd_socket.erl: Added sockname/1 and peername/1 
functions
* src/ejabberd_frontend_socket.erl: Likewise
* src/tls/tls.erl: Likewise
* src/ejabberd_zlib/ejabberd_zlib.erl: Likewise

* src/mod_private_odbc.erl: Private storage support using odbc
* src/odbc/pg.sql: Likewise

SVN Revision: 663
 2006-10-19 04:46:24 +00:00
Mickaël Rémond
a7f22bfded * Makefile.in: Fix for MacOSX compilation (EJAB-124). 
* ejabberd_zlib/Makefile.in: Likewise.
* mod_irc/Makefile.in: Likewise.
* stringprep/Makefile.in: Likewise.
* tls/Makefile.in: Likewise.

SVN Revision: 596
 2006-08-28 14:56:13 +00:00
Alexey Shchepin
cc4d404364 * src/tls/tls_drv.c: Report OpenSSL error messages (thanks to 
Magnus Henoch)

SVN Revision: 593
 2006-08-04 02:25:10 +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
92bac4761b * src/tls/Makefile.in: Use CPPFLAGS (thanks to Magnus Henoch) 
SVN Revision: 436
 2005-11-19 00:57:29 +00:00
Alexey Shchepin
c6441edc7a * src/ejabberd_s2s_in.erl: Support for dNSName certificate field 
and DNS name matching
* src/XmppAddr.asn1: Moved here from src/tls/XmppAddr.asn1
* src/tls/XmppAddr.asn1: Likewise    
* src/Makefile.in: Updated
* src/tls/Makefile.in: Updated

SVN Revision: 435
 2005-11-17 05:29:33 +00:00
Alexey Shchepin
f6343f01f7 * src/ejabberd_s2s_out.erl: Support for STARTTLS+SASL EXTERNAL 
* src/ejabberd_s2s_in.erl: Likewise
* src/tls/tls.erl: Likewise
* src/tls/tls_drv.c: Likewise
* src/tls/XmppAddr.asn1: Likewise
* src/tls/Makefile.in: Likewise

SVN Revision: 430
 2005-11-03 05:04:54 +00:00
Alexey Shchepin
144f9f09e7 * src/tls/tls.erl: Accept {error,already_loaded} from 
erl_ddll:load_driver/2
* src/stringprep/stringprep.erl: Likewise
* src/mod_irc/iconv.erl: Likewise
* src/ejabberd_app.erl: Likewise

SVN Revision: 427
 2005-10-25 02:19:01 +00:00
Alexey Shchepin
1433dafe6b * src/tls/tls_drv.c: Support for "connect" method 
* src/tls/tls.erl: Likewise

* src/ejabberd_s2s_in.erl: Support for STARTTLS+Dialback
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_receiver.erl: Added a few hacks ({active,once} mode
should be used instead of recv/3 call to avoid them)
* src/ejabberd_config.erl: Added s2s_use_starttls and s2s_certfile
options
* src/ejabberd.cfg.example: Likewise

SVN Revision: 426
 2005-10-25 01:08:37 +00:00
Alexey Shchepin
9f1fd5ee3f * src/tls/tls_drv.c: Reverted previous patch 
SVN Revision: 327
 2005-04-24 12:09:47 +00:00
Alexey Shchepin
13de45118d * src/ejabberd_c2s.erl: Send new id for each new stream inside one 
session (thanks to Maxim Ryazanov)

* src/tls/tls_drv.c: Now reads all certificates from certificate
file instead of reading only first one (thanks to Karl-Johan
Karlsson)

* examples/transport-configs/init-scripts/jabber-gg-transport:
Fixed typo (thanks to Sander Devrieze)

SVN Revision: 305
 2005-04-09 23:47:56 +00:00
Alexey Shchepin
2f7f3d9b00 * src/aclocal.m4: Fixed headers detecting in AM_WITH_OPENSSL 
(thanks to Leif Johansson)

* src/ejabberd_auth.erl: Added support for ldap_rootdn and
ldap_password options (thanks to Stefan de Konink)
* src/mod_vcard_ldap.erl: Likewise

* src/ejabberd_router.erl: Now possible to route packet via
function call instead of message sending
* src/ejabberd_sm.erl: Added function route/3, use it in route
table
* src/ejabberd_local.erl: Likewise
* src/ejabberd_s2s.erl: Likewise

* (all): Fixed spelling of word "authentication"

* src/*/Makefile.in: Replaced erlc with @ERLC@

SVN Revision: 285
 2004-11-05 21:14:31 +00:00
Alexey Shchepin
e9f6529ead * src/tls/Makefile.win32: Added (thanks to Sergei Golovan) 
* src/win32/: Updated (thanks to Sergei Golovan)

SVN Revision: 281
 2004-10-10 17:15:24 +00:00
Alexey Shchepin
cbcb2bd3a6 * src/aclocal.m4: Better expat and openssl detection (thanks to 
Anton Vanin)

* src/**/Makefile.in: Updated (thanks to Anton Vanin)
* src/configure.ac: Likewise

SVN Revision: 267
 2004-09-26 20:46:43 +00:00
Alexey Shchepin
0ef537cc6c * src/aclocal.m4: Updated to check for openssl library (thanks to 
AV)
* src/configure.ac: Likewise
* src/configure: Likewise
* src/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise

SVN Revision: 254
 2004-08-05 20:46:24 +00:00
Alexey Shchepin
73d7e1161e * src/tls/tls.erl: Added recv_data/2 function 
* src/jlib.erl: Added NS_TLS macro

* src/ejabberd_receiver.erl: Support for STARTTLS
* src/ejabberd_c2s.erl: Likewise

SVN Revision: 252
 2004-08-01 20:12:20 +00:00
Alexey Shchepin
76f00658f2 * src/tls/tls_drv.c: Added freeing of SSL stuff 
* src/xml_stream.erl: Added start/2 function
* src/ejabberd_receiver.erl: Now using xml_stream:start/2

SVN Revision: 250
 2004-07-28 20:08:53 +00:00
Alexey Shchepin
e10fc255aa * src/tls/tls.erl: Updated 
SVN Revision: 249
 2004-07-26 22:37:24 +00:00
Alexey Shchepin
3377c54ecd *** empty log message *** 
SVN Revision: 248
 2004-07-26 16:45:38 +00:00
Alexey Shchepin
4b2919c207 * src/tls/: Library for TLS support (not completed) 
* src/ejabberd_auth.erl: Now uses two LDAP connections

* src/ejabberd_c2s.erl: Return resource on get_presence request
(thanks to Mickael Remond)

* src/mod_configure2.erl: Bugfix (thanks to Sergei Golovan)

* src/msgs/ua.msg: New Ukrainian translation (thanks to usercard)

* src/msgs/nl.msg: Updated (thanks to Sander Devrieze)

SVN Revision: 247
 2004-07-25 21:27:56 +00:00