summaryrefslogtreecommitdiff
path: root/main/streams
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2014-04-02 11:09:26 +0200
committerMichael Wallner <mike@php.net>2014-04-02 11:09:26 +0200
commit91a9d24aa30507e6c7d8937db2de24394f0ce121 (patch)
treee7f50691e3e5942fa70f45e439fa79dd59bfb65d /main/streams
parentf244513fc059a9b7ee2b91ad65f1a2f013b5d588 (diff)
downloadphp-git-91a9d24aa30507e6c7d8937db2de24394f0ce121.tar.gz
Fix bug #64330
stream_socket_server() creates wrong Abstract Namespace UNIX sockets
Diffstat (limited to 'main/streams')
-rw-r--r--main/streams/xp_socket.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index 2c7ca8d414..53f0769a1c 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -588,7 +588,8 @@ static inline int php_tcp_sockop_bind(php_stream *stream, php_netstream_data_t *
parse_unix_address(xparam, &unix_addr TSRMLS_CC);
- return bind(sock->socket, (struct sockaddr *)&unix_addr, sizeof(unix_addr));
+ return bind(sock->socket, (const struct sockaddr *)&unix_addr,
+ (socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + xparam->inputs.namelen);
}
#endif