mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
Code Issues Releases Activity

Fix sockets.

Browse Source 
PR:		ports/139343
Submitted by:	Boris <lytboris@gmail.com>
This commit is contained in:
Alex Dupre 2009-10-12 13:14:26 +00:00
parent 2def94d6cd
commit 136555d328
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=242726
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/php5/Makefile
View File

@ -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

11
lang/php5/files/patch-main_streams_xp_socket.c Normal file
View File

@ -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;
}
}

2
lang/php53/Makefile
View File

@ -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

11
lang/php53/files/patch-main_streams_xp_socket.c Normal file
View File

@ -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;
}
}