diff options
| author | ale <ale@FreeBSD.org> | 2009-10-12 21:14:26 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2009-10-12 21:14:26 +0800 |
| commit | 5e432d2cc4d2793c8246d77256f0b6fb85064dde (patch) | |
| tree | 37bad4decd9c4c971fd54d2fd49482c0084c65da | |
| parent | 59370f5d1bc825a6e8f634f006e4bc03ce09f9e7 (diff) | |
| download | freebsd-ports-gnome-5e432d2cc4d2793c8246d77256f0b6fb85064dde.tar.gz freebsd-ports-gnome-5e432d2cc4d2793c8246d77256f0b6fb85064dde.tar.zst freebsd-ports-gnome-5e432d2cc4d2793c8246d77256f0b6fb85064dde.zip | |
Fix sockets.
PR: ports/139343
Submitted by: Boris <lytboris@gmail.com>
| -rw-r--r-- | lang/php5/Makefile | 2 | ||||
| -rw-r--r-- | lang/php5/files/patch-main_streams_xp_socket.c | 11 | ||||
| -rw-r--r-- | lang/php53/Makefile | 2 | ||||
| -rw-r--r-- | lang/php53/files/patch-main_streams_xp_socket.c | 11 |
4 files changed, 24 insertions, 2 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 17a4a59e70f8..a028f827010f 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -7,7 +7,7 @@ PORTNAME= php5 PORTVERSION= 5.2.11 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions diff --git a/lang/php5/files/patch-main_streams_xp_socket.c b/lang/php5/files/patch-main_streams_xp_socket.c new file mode 100644 index 000000000000..7b4c5e15d448 --- /dev/null +++ b/lang/php5/files/patch-main_streams_xp_socket.c @@ -0,0 +1,11 @@ +--- main/streams/xp_socket.c 2009/09/04 07:59:48 288034 ++++ main/streams/xp_socket.c 2009/09/23 10:25:54 288604 +@@ -289,7 +289,7 @@ + if (sock->socket == -1) { + alive = 0; + } else if (php_pollfd_for(sock->socket, PHP_POLLREADABLE|POLLPRI, &tv) > 0) { +- if (recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) != SOCK_CONN_ERR && php_socket_errno() != EWOULDBLOCK) { ++ if (0 >= recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EWOULDBLOCK) { + alive = 0; + } + } diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 17a4a59e70f8..a028f827010f 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -7,7 +7,7 @@ PORTNAME= php5 PORTVERSION= 5.2.11 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions diff --git a/lang/php53/files/patch-main_streams_xp_socket.c b/lang/php53/files/patch-main_streams_xp_socket.c new file mode 100644 index 000000000000..7b4c5e15d448 --- /dev/null +++ b/lang/php53/files/patch-main_streams_xp_socket.c @@ -0,0 +1,11 @@ +--- main/streams/xp_socket.c 2009/09/04 07:59:48 288034 ++++ main/streams/xp_socket.c 2009/09/23 10:25:54 288604 +@@ -289,7 +289,7 @@ + if (sock->socket == -1) { + alive = 0; + } else if (php_pollfd_for(sock->socket, PHP_POLLREADABLE|POLLPRI, &tv) > 0) { +- if (recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) != SOCK_CONN_ERR && php_socket_errno() != EWOULDBLOCK) { ++ if (0 >= recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EWOULDBLOCK) { + alive = 0; + } + } |