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
Christophe Romain
70c1e1d0b1
enforce pubsub cleaner
2010-11-04 16:54:24 +01: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
Alexey Shchepin
aea394861d
Added a protocol for a client to send the number of local unread messages
...
Conflicts:
src/ejabberd_c2s.erl
2010-10-25 10:09:06 +03: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
Badlop
2e33904bb8
Don't check whether the contact is a locally registered account or not (EJABS-1550)
2010-10-24 00:48:57 +02:00
Badlop
2d3bbd43d7
Allow add_rosteritem functions to work even when no know mod_roster is enabled
2010-10-21 21:07:07 +02:00
Christophe Romain
011464e6ac
improve documentation (thanks to Karim Gemayel)
2010-10-21 11:14:24 +02:00
Badlop
6c0e9ef575
Fix return values of some functions. newgroups argument changed to groups.
2010-10-21 00:23:33 +02:00
Badlop
ca62271a89
Apply Apollo fixes. More fixes. Improve command descriptions.
2010-10-20 16:41:27 +02:00
Evgeniy Khramtsov
c96a1805e8
- get rid of rpc:call to avoid group leader inheritance
...
- do not log migration errors
- remove stopping node from cluster hashing explicitly
2010-10-20 17:26:01 +10:00
Badlop
babff870a8
Remove custom ON command: send_notification/6
2010-10-19 17:17:55 +02:00
Badlop
5cd3de9cd7
Copy changes from Apollo's mod_xmlrpc to 2.2.x's mod_xmlrpc
...
Changes:
* link_contacts new arguments: group1::string, group2::string
* New method add_rosteritem_groups/5
* New method del_rosteritem_groups/5
* New method modify_rosteritem_groups/7
* get_roster change argument group::string -> groups::[string]
2010-10-19 16:55:24 +02:00
Badlop
437d8c6b7c
Copy ejabberd_xmlrpc from ejabberd-modules SVN
2010-10-19 16:51:28 +02:00
Badlop
440eef74e9
Copy xmlrpc-1.13 source code
2010-10-19 16:51:24 +02:00
Christophe Romain
c849552177
fix add_rosteritem issue (TECH-1181)
2010-10-19 15:19:41 +02:00
Alexey Shchepin
aa60140ba8
Revert "Merge ApplePush to 2.2.x"
...
This reverts commit b8b6fc0da5
.
Conflicts:
src/mod_applepush.erl
src/mod_applepush_service.erl
2010-10-19 13:53:10 +03:00
Alexey Shchepin
59135cac6f
Revert "ApplePush : previous merge missed timeout handler in c2s."
...
This reverts commit 40625b29f2
.
2010-10-19 13:52:46 +03:00
Alexey Shchepin
8d69d4aaba
Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test"
...
This reverts commit 00d8b2ac30
, reversing
changes made to cac23c39c9
.
2010-10-19 13:52:17 +03:00
Alexey Shchepin
426b7ca769
Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into 2.2.x"
...
This reverts commit ba326eb976
, reversing
changes made to 00d8b2ac30
.
2010-10-19 13:52:09 +03:00
Alexey Shchepin
b61d16dd33
Revert "Merge remote branch 'applepush/2.1.x-applepush' into 2.2.x"
...
This reverts commit f76dcd0d48
, reversing
changes made to 7da8d9e4e3
.
2010-10-19 13:51:44 +03:00
Alexey Shchepin
807af3c08a
Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 2.2.x-applepush
2010-10-19 13:08:46 +03: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
Badlop
d07424365d
Fix bug in mod_pubsub in_subscription return value
2010-10-19 00:25:14 +02:00
Badlop
70fe2948b9
Revert "Remove some compiled files"
...
That removal was only intended for ejabberd master,
as it requires also changes in gitignore, Makefile.in and aclocal.m4
This reverts commit 179a0cf255
.
2010-10-18 23:17:12 +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
Evgeniy Khramtsov
a5166f3946
copied feature_inspect_packet hook from iphone svn repo
2010-10-15 23:13:29 +10: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
Juan Pablo Carlino
11b00b92e9
merge from Team Leader 2.2 (r973)
2010-10-14 19:00:19 -03: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
Alexey Shchepin
c10e43f95f
Improved behaviour on SSL handshake failure
2010-10-14 15:59:23 +03:00
Evgeniy Khramtsov
eeffc77a1a
ignore RPC timeout during migration
2010-10-14 20:29:45 +10:00
Evgeniy Khramtsov
254686ab46
fixes timeout calculation
2010-10-14 20:15:53 +10:00
Evgeniy Khramtsov
4a6fc46713
increase rehash timeout to 30 seconds; increase hashing points
2010-10-14 20:02:34 +10:00
Christophe Romain
bde3bce1e7
remove non generic comment
2010-10-13 15:26:38 +02:00
Christophe Romain
f76dcd0d48
Merge remote branch 'applepush/2.1.x-applepush' into 2.2.x
2010-10-13 12:36:04 +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
ac87749d55
add find_s2s_bridge hook
2010-10-11 18:40:57 +10:00
Evgeniy Khramtsov
3a7d02dbd3
fixes anonymous sessions lookup
2010-10-09 00:44:23 +10:00
Evgeniy Khramtsov
350af319bf
fixes annoying crash with controller change
2010-10-08 19:26:49 +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
Christophe Romain
f81473fc65
fix licence issue and (c) to 2010
2010-09-28 13:36:16 +02: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
Christophe Romain
b6dcd41225
added antiflood and filter modules from TeamLeader
2010-09-24 16:11:59 +02:00
Christophe Romain
db2baa8f84
pubsub clean now cluster aware
2010-09-24 16:11:39 +02:00
Alexey Shchepin
a93991bef2
Mark out-of-reception sessions in #session.info
2010-09-23 18:14:04 +03:00
Alexey Shchepin
7127d067c8
Revert the previous change, as priority is 0 by default
2010-09-23 18:05:56 +03:00
Alexey Shchepin
ba326eb976
Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into 2.2.x
2010-09-23 16:22:03 +03:00
Alexey Shchepin
fd50b2169b
Insert "priority" element in out-of-reception presences
2010-09-23 16:18:53 +03:00
Alexey Shchepin
00d8b2ac30
Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test
...
Conflicts:
src/ejabberd_c2s.erl
src/mod_offline.erl
src/mod_offline_odbc.erl
2010-09-22 22:38:32 +03:00
Alexey Shchepin
cac23c39c9
Disable notifications for a user on "Invalid token" error
2010-09-22 22:19:36 +03:00
Alexey Shchepin
a5813b798f
Fixed "sender" log field
2010-09-22 22:19:17 +03:00
Evgeniy Khramtsov
8e5297f4c3
fixes default value for cache_life_time
2010-09-21 04:31:18 +10:00
Evgeniy Khramtsov
191cd2af3c
different hooks should be called for session migration and session close
2010-09-21 03:17:52 +10:00
Alexey Shchepin
f2cfee11de
Disable notifications for a user on "Invalid token" error
2010-09-20 13:35:42 +03: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
Eric Cestari
b0c79c57b0
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2010-09-17 16:26:09 +02: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
Christophe Romain
893c47a2e0
add ability to retreive only node names
2010-09-17 07:28:28 +02:00
Christophe Romain
694af69982
ejabberd.app now set to version 2.2.x
2010-09-17 06:46:40 +02:00
Christophe Romain
c576f340f9
upgrade to lattest pubsub schema
2010-09-17 06:40:48 +02:00
Badlop
179a0cf255
Remove some compiled files
2010-09-17 00:14:13 +02:00
Eric Cestari
a45ecb70ff
[TECH-1511] debug traces reorganized
2010-09-16 15:08:53 +02:00
Christophe Romain
df1ab9149f
remove garbage configuration
2010-09-16 14:53:20 +02:00
Eric Cestari
cb54444f00
Merge branch '2.2.x' into websockets
2010-09-16 14:44:44 +02:00
Eric Cestari
c77e7fbb7d
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2010-09-16 14:38:52 +02:00
Eric Cestari
40625b29f2
ApplePush : previous merge missed timeout handler in c2s.
2010-09-16 14:37:27 +02:00
Christophe Romain
2624f3ba51
added pubsub helper modules
2010-09-16 14:31:08 +02:00
Eric Cestari
44832e12b3
Merge branch '2.2.x' into websockets
2010-09-16 11:07:12 +02:00
Eric Cestari
caa8d0c411
Merge branch '2.2.x' of git+ssh://gitorious.process-one.net/~ecestari/ejabberd/ecestaris-maincustomers into 2.2.x
2010-09-16 10:54:45 +02:00
Eric Cestari
b0a81778af
[TECH-1511] preliminary XMPP support via websockets
2010-09-15 17:20:54 +02:00
Christophe Romain
652774a83c
remove obsolete files
2010-09-15 13:51:46 +02:00
Alexey Shchepin
2aea503a2a
Don't resend badge if there are no offline messages
2010-09-14 21:27:02 +02:00
Alexey Shchepin
0d8aacb3e7
Do not disable push on send error
2010-09-14 21:26:50 +02:00
Alexey Shchepin
e6be70943f
Added badge resending functions
2010-09-14 21:26:36 +02:00
Alexey Shchepin
c86e4faba3
Fixed "sender" log field
2010-09-14 18:00:01 +03:00
Christophe Romain
c3c06ccd1c
Merge remote branch 'mainline/2.1.x' into 2.2.x
2010-09-14 16:59:46 +02:00
Alexey Shchepin
261acfce54
Don't resend badge if there are no offline messages
2010-09-13 15:46:39 +03:00
Eric Cestari
c8567f1de2
[TECH-1511] Calls start() on handler to get a PID
2010-09-13 14:23:42 +02:00
Badlop
8a0ccfc401
Support timezone West of UTC (thanks to Edwin Fine)(EJAB-1301)
2010-09-13 12:06:13 +02:00
Eric Cestari
35a0e27d04
[TECH-1511] clean support for websockets.
...
Added handlers in configuration file
2010-09-13 12:04:52 +02:00
Alexey Shchepin
73f7b2ba38
Do not disable push on send error
2010-09-13 06:22:14 +03:00
Alexey Shchepin
8a693df6e6
Added badge resending functions
2010-09-13 06:19:38 +03: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
660a2735f0
mod_keepalive added to repos
2010-09-10 14:11:56 +02:00
Eric Cestari
77136bccdf
[TECH-1151] websocket initial code
2010-09-10 14:06:26 +02:00
Eric Cestari
b8b6fc0da5
Merge ApplePush to 2.2.x
2010-09-09 17:00:18 +02:00
Eric Cestari
4134edf8de
Merge ApplePush to branch 2.2.x
2010-09-09 16:16:28 +02:00
Eric Cestari
a77d53d738
[TECH-1068] Added missing catch in process function
2010-09-08 17:25:37 +02:00
Eric Cestari
92a60ff7fd
flash hack merge fix from BBC
2010-09-08 17:03:49 +02:00
Eric Cestari
33c7d36a95
Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2010-09-08 16:54:26 +02:00
Christophe Romain
6c7316cbdd
apply flash hack patch
2010-09-08 16:51:06 +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