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

fix bug #1019808 and bump package. maintainer@ ok.

Browse Source
This commit is contained in:
fgsch 2005-10-12 02:41:41 +00:00
parent 67d018a320
commit 7f59f4b5cc
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/python/2.4/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2005/08/10 02:14:13 jolan Exp $
# $OpenBSD: Makefile,v 1.3 2005/10/12 02:41:41 fgsch Exp $
VERSION= 2.4
PATCHLEVEL= .1
PKG_PATCHLEVEL= p0
PKG_PATCHLEVEL= p1
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
PATCH_LIST= patch-* sup64-*

27
lang/python/2.4/patches/patch-Modules_socketmodule_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_socketmodule_c,v 1.1.1.1 2005/06/07 01:12:58 alek Exp $
--- Modules/socketmodule.c.orig Sun Nov 7 15:24:25 2004
+++ Modules/socketmodule.c Thu Dec 30 22:46:12 2004
$OpenBSD: patch-Modules_socketmodule_c,v 1.2 2005/10/12 02:41:41 fgsch Exp $
--- Modules/socketmodule.c.orig Sun Nov 7 11:24:25 2004
+++ Modules/socketmodule.c Mon Oct 3 13:54:53 2005
@@ -63,9 +63,6 @@ Local naming conventions:
#include "Python.h"
@ -11,7 +11,26 @@ $OpenBSD: patch-Modules_socketmodule_c,v 1.1.1.1 2005/06/07 01:12:58 alek Exp $
/* Socket object documentation */
PyDoc_STRVAR(sock_doc,
"socket([family[, type[, proto]]]) -> socket object\n\
@@ -3220,7 +3217,7 @@ socket_inet_aton(PyObject *self, PyObjec
@@ -1736,10 +1733,15 @@ internal_connect(PySocketSockObject *s,
if (s->sock_timeout > 0.0) {
if (res < 0 && errno == EINPROGRESS) {
+ socklen_t res_size = sizeof res;
+ int save_errno;
+
timeout = internal_select(s, 1);
- res = connect(s->sock_fd, addr, addrlen);
- if (res < 0 && errno == EISCONN)
- res = 0;
+ save_errno = errno;
+ (void)getsockopt(s->sock_fd, SOL_SOCKET, SO_ERROR,
+ &res, &res_size);
+ errno = save_errno;
+ res = res ? -1 : 0;
}
}
@@ -3220,7 +3222,7 @@ socket_inet_aton(PyObject *self, PyObjec
struct in_addr buf;
#else
/* Have to use inet_addr() instead */