com php-src: fixes to xp_socket.c: main/streams/xp_so cket.c
| From: | Anatol Belski | Date: | Wed, 16 Oct 2013 09:32:20 +0000 |
| Subject: | com php-src: fixes to xp_socket.c: main/streams/xp_so cket.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73507@lists.php.net to get a copy of this message | ||
Commit: 5748286990c8371c84ec63caf5bd3e89bb6a7530
Author: Anatol Belski <ab@php.net> Wed, 17 Jul 2013 04:53:56 -0700
Parents: b610404004017ab9df98144f01afb7d5e5848c7d
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5748286990c8371c84ec63caf5bd3e89bb6a7530
Log:
fixes to xp_socket.c
Changed paths:
M main/streams/xp_socket.c
Diff:
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index 28817a7..c0f9927 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -39,6 +39,13 @@
# define MSG_PEEK 0
#endif
+#ifdef PHP_WIN32
+/* send/recv family on windows expects int */
+# define XP_SOCK_BUF_SIZE(sz) (((sz) > INT_MAX) ? INT_MAX : (int)(sz))
+#else
+# define XP_SOCK_BUF_SIZE(sz) (sz)
+#endif
+
php_stream_ops php_stream_generic_socket_ops;
PHPAPI php_stream_ops php_stream_socket_ops;
php_stream_ops php_stream_udp_socket_ops;
@@ -54,7 +61,7 @@ static int php_tcp_sockop_set_option(php_stream *stream, int option, int value,
static zend_str_size_size_t php_sockop_write(php_stream *stream, const char *buf,
zend_str_size_size_t count TSRMLS_DC)
{
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
- zend_str_size didwrite;
+ ssize_t didwrite;
struct timeval *ptimeout;
if (sock->socket == -1) {
@@ -67,7 +74,7 @@ static zend_str_size_size_t php_sockop_write(php_stream *stream, const char *buf
ptimeout = &sock->timeout;
retry:
- didwrite = send(sock->socket, buf, count, (sock->is_blocked && ptimeout) ?
MSG_DONTWAIT : 0);
+ didwrite = send(sock->socket, buf, XP_SOCK_BUF_SIZE(count), (sock->is_blocked &&
ptimeout) ? MSG_DONTWAIT : 0);
if (didwrite <= 0) {
long err = php_socket_errno();
@@ -144,7 +151,7 @@ static void php_sock_stream_wait_for_data(php_stream *stream, php_netstream_data
static zend_str_size_size_t php_sockop_read(php_stream *stream, char *buf, zend_str_size_size_t
count TSRMLS_DC)
{
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
- zend_str_size nr_bytes = 0;
+ ssize_t nr_bytes = 0;
if (sock->socket == -1) {
return 0;
@@ -156,7 +163,7 @@ static zend_str_size_size_t php_sockop_read(php_stream *stream, char *buf, zend_
return 0;
}
- nr_bytes = recv(sock->socket, buf, count, (sock->is_blocked &&
sock->timeout.tv_sec != -1) ? MSG_DONTWAIT : 0);
+ nr_bytes = recv(sock->socket, buf, XP_SOCK_BUF_SIZE(count), (sock->is_blocked &&
sock->timeout.tv_sec != -1) ? MSG_DONTWAIT : 0);
stream->eof = (nr_bytes == 0 || (nr_bytes == -1 && php_socket_errno() != EWOULDBLOCK));
@@ -234,31 +241,32 @@ static inline int sock_sendto(php_netstream_data_t *sock, const char *buf,
size_
struct sockaddr *addr, socklen_t addrlen
TSRMLS_DC)
{
- int ret;
+ ssize_t ret;
if (addr) {
- ret = sendto(sock->socket, buf, buflen, flags, addr, addrlen);
+ ret = sendto(sock->socket, buf, XP_SOCK_BUF_SIZE(buflen), flags, addr,
XP_SOCK_BUF_SIZE(addrlen));
+
return (ret == SOCK_CONN_ERR) ? -1 : ret;
}
- return ((ret = send(sock->socket, buf, buflen, flags)) == SOCK_CONN_ERR) ? -1 : ret;
+ return ((ret = send(sock->socket, buf, XP_SOCK_BUF_SIZE(buflen), flags)) == SOCK_CONN_ERR) ? -1
: ret;
}
static inline int sock_recvfrom(php_netstream_data_t *sock, char *buf, size_t buflen, int flags,
- char **textaddr, long *textaddrlen,
+ char **textaddr, zend_str_size_long *textaddrlen,
struct sockaddr **addr, socklen_t *addrlen
TSRMLS_DC)
{
php_sockaddr_storage sa;
socklen_t sl = sizeof(sa);
- int ret;
+ ssize_t ret;
int want_addr = textaddr || addr;
if (want_addr) {
- 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, textaddrlen, addr, addrlen TSRMLS_CC);
} 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;
}