aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-01-14 08:52:59 +0100
committerPatrik Nyblom <[email protected]>2011-02-21 15:13:02 +0100
commitc478e3fda9b244fe49da78e6a64021b40a792688 (patch)
tree8db51ccd4535cd0fe9eb2f5e4c62d25fae7022aa /erts/emulator
parentb0d6abb72cf32df548703b284b737a4a7c0a9d8a (diff)
downloadotp-c478e3fda9b244fe49da78e6a64021b40a792688.tar.gz
otp-c478e3fda9b244fe49da78e6a64021b40a792688.tar.bz2
otp-c478e3fda9b244fe49da78e6a64021b40a792688.zip
Ignore permission error when implicitly setting SO_PRIORITY
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 818bc6334e..49da0ef118 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1997-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2011. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -5095,6 +5095,9 @@ static int setopt_prio_tos_trick
SO_PRIORITY,
(char *) &tmp_ival_prio,
tmp_arg_sz_prio);
+ if (res != 0 && sock_errno() == EPERM) {
+ res = 0;
+ }
}
}
}