cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

the accept retry change was rejected upstream. applications that use apr

Browse Source 
have to retry upon EINTR instead of apr doing for them.
This commit is contained in:
kurt 2007-04-26 16:05:01 +00:00
parent ea6505e148
commit e828bd16b5
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/apr/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.10 2007/04/01 20:03:07 kurt Exp $
# $OpenBSD: Makefile,v 1.11 2007/04/26 16:05:01 kurt Exp $
COMMENT= "Apache Portable Runtime"
DISTNAME= apr-1.2.7
PKGNAME= ${DISTNAME}p1
FULLPKGNAME= apr${MT}-1.2.7p1
PKGNAME= ${DISTNAME}p2
FULLPKGNAME= apr${MT}-1.2.7p2
SHARED_LIBS += apr-1${MT} 2.7 # .2.7
CATEGORIES= devel

21
devel/apr/patches/patch-network_io_unix_sockets_c
View File

@ -1,22 +1,7 @@
$OpenBSD: patch-network_io_unix_sockets_c,v 1.2 2007/04/01 20:03:07 kurt Exp $
$OpenBSD: patch-network_io_unix_sockets_c,v 1.3 2007/04/26 16:05:01 kurt Exp $
--- network_io/unix/sockets.c.orig Thu Dec 8 12:24:36 2005
+++ network_io/unix/sockets.c Wed Mar 28 15:26:44 2007
@@ -184,9 +184,11 @@ apr_status_t apr_socket_accept(apr_socket_t **new, apr
#endif
(*new)->timeout = -1;
- (*new)->socketdes = accept(sock->socketdes,
- (struct sockaddr *)&(*new)->remote_addr->sa,
- &(*new)->remote_addr->salen);
+ do {
+ (*new)->socketdes = accept(sock->socketdes,
+ (struct sockaddr *)&(*new)->remote_addr->sa,
+ &(*new)->remote_addr->salen);
+ } while ((*new)->socketdes == -1 && errno == EINTR);
if ((*new)->socketdes < 0) {
return errno;
@@ -256,6 +258,15 @@ apr_status_t apr_socket_accept(apr_socket_t **new, apr
+++ network_io/unix/sockets.c Thu Apr 26 11:52:13 2007
@@ -256,6 +256,15 @@ apr_status_t apr_socket_accept(apr_socket_t **new, apr
apr_status_t apr_socket_connect(apr_socket_t *sock, apr_sockaddr_t *sa)
{
int rc;