summaryrefslogtreecommitdiffhomepage
path: root/go
diff options
context:
space:
mode:
authorAndrei Belov <defan@nginx.com>2020-04-16 18:27:26 +0300
committerAndrei Belov <defan@nginx.com>2020-04-16 18:27:26 +0300
commit74f32d26b91f49d3392605e81c1597b375890b60 (patch)
treeadfc67dfc86461441bde65512f745ce27bd6ea28 /go
parent2ff9df10ef1df43c935c870175e52473dad2c21a (diff)
parent9877087756144d3bdf343d0d4e91e1efbcc62c93 (diff)
downloadunit-1.17.0-1.tar.gz
unit-1.17.0-1.tar.bz2
Merged with the default branch.1.17.0-1
Diffstat (limited to '')
-rw-r--r--go/port.go10
1 files changed, 9 insertions, 1 deletions
diff --git a/go/port.go b/go/port.go
index a68cae74..59a13f8b 100644
--- a/go/port.go
+++ b/go/port.go
@@ -50,7 +50,11 @@ func add_port(p *port) {
port_registry_.m = make(map[port_key]*port)
}
- port_registry_.m[p.key] = p
+ old := port_registry_.m[p.key]
+
+ if old == nil {
+ port_registry_.m[p.key] = p
+ }
port_registry_.Unlock()
}
@@ -138,6 +142,8 @@ func nxt_go_port_send(pid C.int, id C.int, buf unsafe.Pointer, buf_size C.int,
if err != nil {
nxt_go_warn("write result %d (%d), %s", n, oobn, err)
+
+ n = -1
}
return C.ssize_t(n)
@@ -164,6 +170,8 @@ func nxt_go_port_recv(pid C.int, id C.int, buf unsafe.Pointer, buf_size C.int,
if err != nil {
nxt_go_warn("read result %d (%d), %s", n, oobn, err)
+
+ n = -1
}
return C.ssize_t(n)