com php-src: Merge branch 'PHP-5.6' into PHP-7.0: main/streams/ xp_socket.c

From: Date: Sun, 19 Jun 2016 04:33:54 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: main/streams/ xp_socket.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92429@lists.php.net to get a copy of this message
Commit: 6b83832cf48ec42008b262ace9742fe820d322cd Author: Xinchen Hui <laruence@gmail.com> Sat, 18 Jun 2016 21:33:54 -0700 Parents: cc64702796ce323840eae5ec7a286788d6b4979c c4c1993af63fe4c0d19d44ebbd38996471c141af Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6b83832cf48ec42008b262ace9742fe820d322cd Log: Merge branch 'PHP-5.6' into PHP-7.0 Conflicts: main/streams/xp_socket.c Changed paths: MM main/streams/xp_socket.c Diff: diff --cc main/streams/xp_socket.c index 7a21fbe,90c5df0..bf7e98c --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@@ -262,22 -243,33 +262,32 @@@ static inline int sock_sendto(php_netst } static inline int sock_recvfrom(php_netstream_data_t *sock, char *buf, size_t buflen, int flags, - char **textaddr, long *textaddrlen, + zend_string **textaddr, struct sockaddr **addr, socklen_t *addrlen - TSRMLS_DC) + ) { - php_sockaddr_storage sa; - socklen_t sl = sizeof(sa); int ret; int want_addr = textaddr || addr; if (want_addr) { + php_sockaddr_storage sa; + socklen_t sl = sizeof(sa); - ret = recvfrom(sock->socket, buf, buflen, flags, (struct sockaddr*)&sa, &sl); + ret = recvfrom(sock->socket, buf, XP_SOCK_BUF_SIZE(buflen), flags, (struct sockaddr*)&sa, &sl); ret = (ret == SOCK_CONN_ERR) ? -1 : ret; - php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl, - textaddr, addr, addrlen); + if (sl) { + php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl, - textaddr, textaddrlen, addr, addrlen TSRMLS_CC); ++ textaddr, addr, addrlen); + } else { + if (textaddr) { - *textaddr = estrndup("", 0); - *textaddrlen = 0; ++ *textaddr = ZSTR_EMPTY_ALLOC(); + } + if (addr) { + *addr = NULL; + *addrlen = 0; + } + } } else { - ret = recv(sock->socket, buf, buflen, flags); + ret = recv(sock->socket, buf, XP_SOCK_BUF_SIZE(buflen), flags); ret = (ret == SOCK_CONN_ERR) ? -1 : ret; }

« previous php.cvs (#92429) next »