diff options
| author | Erlang/OTP <[email protected]> | 2015-12-03 11:11:00 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-12-03 11:11:00 +0100 |
| commit | df7c7b59c9f1b796e72d1d27a35a61f1392d7f23 (patch) | |
| tree | 5acb1151ef55f60f4759b313c83bc3a097c2cb37 /erts/emulator/drivers/common | |
| parent | bd1251dfe4d60f09e569731d36a92e94acbe297a (diff) | |
| parent | 54204bb039a780e7b8d9295303bf7a4f41744641 (diff) | |
| download | otp-df7c7b59c9f1b796e72d1d27a35a61f1392d7f23.tar.gz otp-df7c7b59c9f1b796e72d1d27a35a61f1392d7f23.tar.bz2 otp-df7c7b59c9f1b796e72d1d27a35a61f1392d7f23.zip | |
Merge branch 'raimo/inet-setopts-multi-raw/OTP-11482' into maint-17
* raimo/inet-setopts-multi-raw/OTP-11482:
Update appup
Testcase for inet:setopts/2 multiple raw options
Fix inet:setopts/2 to take multiple raw options
Fix error propagate from setopts
Diffstat (limited to 'erts/emulator/drivers/common')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 3c6922eb8e..6fff863fa6 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-2013. All Rights Reserved. + * Copyright Ericsson AB 1997-2015. 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 @@ -6051,9 +6051,9 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len) int arg_sz; enum PacketParseType old_htype = desc->htype; int old_active = desc->active; - int propagate = 0; /* Set to 1 if failure to set this option - should be propagated to erlang (not all - errors can be propagated for BC reasons) */ + int propagate; /* Set to 1 if failure to set this option + should be propagated to erlang (not all + errors can be propagated for BC reasons) */ int res; #ifdef HAVE_SCTP /* SCTP sockets are treated completely separately: */ @@ -6070,6 +6070,7 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len) arg_ptr = (char*) &ival; arg_sz = sizeof(ival); proto = SOL_SOCKET; + propagate = 0; switch(opt) { case INET_LOPT_HEADER: |