From 59f1c3c303efc6a57f9cb0e3cd64d2634e1a62ae Mon Sep 17 00:00:00 2001
From: Nick Zavaritsky <mejedi@gmail.com>
Date: Thu, 3 Sep 2015 16:17:38 +0300
Subject: [PATCH] gh-42: Remove SO_BSDCOMPAT in socket package
Linux-specific option obsolete since kernel 2.2
---
doc/sphinx/reference/socket.rst | 1 -
src/lua/bsdsocket.cc | 3 ---
test/box/bsdsocket.result | 4 ----
test/box/bsdsocket.test.lua | 1 -
4 files changed, 9 deletions(-)
diff --git a/doc/sphinx/reference/socket.rst b/doc/sphinx/reference/socket.rst
index 9ad7f28849..6d7ce57a57 100644
--- a/doc/sphinx/reference/socket.rst
+++ b/doc/sphinx/reference/socket.rst
@@ -336,7 +336,6 @@ the function invocations will look like ``sock:function_name(...)``.
* SO_ACCEPTCONN
* SO_BINDTODEVICE
* SO_BROADCAST
- * SO_BSDCOMPAT
* SO_DEBUG
* SO_DOMAIN
* SO_ERROR
diff --git a/src/lua/bsdsocket.cc b/src/lua/bsdsocket.cc
index 75c9fa4b7b..cbd8653281 100644
--- a/src/lua/bsdsocket.cc
+++ b/src/lua/bsdsocket.cc
@@ -186,9 +186,6 @@ static const struct { char name[32]; int value, type, rw; } so_opts[] = {
#ifdef SO_BROADCAST
{"SO_BROADCAST", SO_BROADCAST, 1, 1, },
#endif
-#ifdef SO_BSDCOMPAT
- {"SO_BSDCOMPAT", SO_BSDCOMPAT, 1, 1, },
-#endif
#ifdef SO_DEBUG
{"SO_DEBUG", SO_DEBUG, 1, 1, },
#endif
diff --git a/test/box/bsdsocket.result b/test/box/bsdsocket.result
index 1d25cb4e08..1e2f905354 100644
--- a/test/box/bsdsocket.result
+++ b/test/box/bsdsocket.result
@@ -258,10 +258,6 @@ s:error()
---
- null
...
-s:setsockopt('SOL_SOCKET', 'SO_BSDCOMPAT', false)
----
-- true
-...
s:setsockopt('SOL_SOCKET', 'SO_DEBUG', false)
---
- true
diff --git a/test/box/bsdsocket.test.lua b/test/box/bsdsocket.test.lua
index dfc35fd191..1a431295f0 100644
--- a/test/box/bsdsocket.test.lua
+++ b/test/box/bsdsocket.test.lua
@@ -86,7 +86,6 @@ sevres[1].host
s:setsockopt('SOL_SOCKET', 'SO_BROADCAST', false)
s:getsockopt('SOL_SOCKET', 'SO_TYPE')
s:error()
-s:setsockopt('SOL_SOCKET', 'SO_BSDCOMPAT', false)
s:setsockopt('SOL_SOCKET', 'SO_DEBUG', false)
s:getsockopt('SOL_SOCKET', 'SO_DEBUG')
s:setsockopt('SOL_SOCKET', 'SO_ACCEPTCONN', 1)
--
GitLab