Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps) bump luasocket from 3.0-rc1 to 3.0.0 #8590

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,14 @@
[#8592](https://github.com/Kong/kong/pull/8592)
- Bumped inspect from 3.1.2 to 3.1.3
[#8589](https://github.com/Kong/kong/pull/8589)
- Bumped LuaSocket from 3.0-rc1 to 3.0.0
[#8590](https://github.com/Kong/kong/pull/8590)

### Additions

#### Plugins

- **Zipkin**: add support for including HTTP path in span name
- **Zipkin**: add support for including HTTP path in span name
through configuration property `http_span_name`.
[#8150](https://github.com/Kong/kong/pull/8150)

Expand Down
2 changes: 1 addition & 1 deletion kong-2.8.0-0.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ description = {
dependencies = {
"inspect == 3.1.3",
"luasec == 1.0.2",
"luasocket == 3.0-rc1",
"luasocket == 3.0.0",
"penlight == 1.12.0",
"lua-resty-http == 0.16.1",
"lua-resty-jit-uuid == 0.0.7",
Expand Down
6 changes: 4 additions & 2 deletions spec/helpers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,8 @@ local function http_server(port, ...)
function(port)
local socket = require "socket"
local server = assert(socket.tcp())
assert(server:setoption('reuseaddr', true))
--TODO: Commented out, see https://github.com/lunarmodules/luasocket/issues/371
--assert(server:setoption('reuseaddr', true))
assert(server:bind("*", port))
assert(server:listen())
local client = assert(server:accept())
Expand Down Expand Up @@ -1231,7 +1232,8 @@ local function udp_server(port, n, timeout)
local socket = require "socket"
local server = assert(socket.udp())
server:settimeout(timeout or 360)
server:setoption("reuseaddr", true)
--TODO: Commented out, see https://github.com/lunarmodules/luasocket/issues/371
--assert(server:setoption('reuseaddr', true))
server:setsockname("127.0.0.1", port)
local err
local data = {}
Expand Down