diff options
| author | Thiago Macieira <thiago@kde.org> | 2009-07-16 16:05:16 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2009-07-16 16:05:16 +0200 |
| commit | 37019e9d271390fa8c62c1aae62d30bb9068adaa (patch) | |
| tree | 536d5838b73939a6a885f4ef61de1c18814b9529 /bus/session.conf.in | |
| parent | 56f7ce147e82c7eb529ccba634013e97d53b23c0 (diff) | |
| parent | 9f06daccce3f4e75cfac7c97bfb1743affb55cb2 (diff) | |
Merge branch 'fd-passing'
Conflicts:
dbus/dbus-connection.c
dbus/dbus-message-util.c
dbus/dbus-sysdeps-unix.c
Diffstat (limited to 'bus/session.conf.in')
| -rw-r--r-- | bus/session.conf.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bus/session.conf.in b/bus/session.conf.in index e7229ad5..85395c52 100644 --- a/bus/session.conf.in +++ b/bus/session.conf.in @@ -45,8 +45,11 @@ <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max --> <limit name="max_incoming_bytes">1000000000</limit> + <limit name="max_incoming_unix_fds">250000000</limit> <limit name="max_outgoing_bytes">1000000000</limit> + <limit name="max_outgoing_unix_fds">250000000</limit> <limit name="max_message_size">1000000000</limit> + <limit name="max_message_unix_fds">4096</limit> <limit name="service_start_timeout">120000</limit> <limit name="auth_timeout">240000</limit> <limit name="max_completed_connections">100000</limit> |