diff options
| author | Michael Wallner <mike@php.net> | 2014-04-02 11:10:59 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-04-02 11:10:59 +0200 |
| commit | af147ac9b7619fa56a3e6607d4109ef9c127a914 (patch) | |
| tree | 038838669cfdfe03ce1adc2272cc1444e3551835 /main/streams/xp_socket.c | |
| parent | 8e238148f95c23ff2fc160a6bd01b8268a3191c3 (diff) | |
| parent | 91a9d24aa30507e6c7d8937db2de24394f0ce121 (diff) | |
| download | php-git-af147ac9b7619fa56a3e6607d4109ef9c127a914.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #64330
Diffstat (limited to 'main/streams/xp_socket.c')
| -rw-r--r-- | main/streams/xp_socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 5bbbd78fac..b44d5bb98e 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 |