diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-02-08 13:27:41 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-02-08 13:27:41 +0000 |
| commit | 164096d209109dd6a63244d88a3806f2e527027c (patch) | |
| tree | 6202cf45b0d463b5f9ae635fb6afbf61b6fb308e /net/libfetch | |
| parent | 7f0501a74c2ceecee716234eeac400c3fa56efc5 (diff) | |
| download | pkgsrc-164096d209109dd6a63244d88a3806f2e527027c.tar.gz | |
Do not use TCP_NOPUSH on Darwin, it adds a 5 second delay after the initial
handshake. Bump PKGREVISION.
Diffstat (limited to 'net/libfetch')
| -rw-r--r-- | net/libfetch/Makefile | 4 | ||||
| -rw-r--r-- | net/libfetch/files/http.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/net/libfetch/Makefile b/net/libfetch/Makefile index dd2f568ca86..55180aea4f5 100644 --- a/net/libfetch/Makefile +++ b/net/libfetch/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.54 2014/08/28 10:46:24 jperkin Exp $ +# $NetBSD: Makefile,v 1.55 2016/02/08 13:27:41 jperkin Exp $ # DISTNAME= libfetch-2.36 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= # empty DISTFILES= # empty diff --git a/net/libfetch/files/http.c b/net/libfetch/files/http.c index 8bf6e2f66ab..ff6e1d91c61 100644 --- a/net/libfetch/files/http.c +++ b/net/libfetch/files/http.c @@ -1,4 +1,4 @@ -/* $NetBSD: http.c,v 1.37 2014/06/11 13:12:12 joerg Exp $ */ +/* $NetBSD: http.c,v 1.38 2016/02/08 13:27:42 jperkin Exp $ */ /*- * Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav * Copyright (c) 2003 Thomas Klausner <wiz@NetBSD.org> @@ -332,7 +332,7 @@ http_closefn(void *v) setsockopt(io->conn->sd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)); fetch_cache_put(io->conn, fetch_close); -#ifdef TCP_NOPUSH +#if defined(TCP_NOPUSH) && !defined(__APPLE__) val = 1; setsockopt(io->conn->sd, IPPROTO_TCP, TCP_NOPUSH, &val, sizeof(val)); @@ -715,7 +715,7 @@ http_connect(struct url *URL, struct url *purl, const char *flags, int *cached) { conn_t *conn; int af, verbose; -#ifdef TCP_NOPUSH +#if defined(TCP_NOPUSH) && !defined(__APPLE__) int val; #endif @@ -764,7 +764,7 @@ http_connect(struct url *URL, struct url *purl, const char *flags, int *cached) return (NULL); } -#ifdef TCP_NOPUSH +#if defined(TCP_NOPUSH) && !defined(__APPLE__) val = 1; setsockopt(conn->sd, IPPROTO_TCP, TCP_NOPUSH, &val, sizeof(val)); #endif @@ -961,7 +961,7 @@ http_request(struct url *URL, const char *op, struct url_stat *us, * be compatible with such configurations, fiddle with socket * options to force the pending data to be written. */ -#ifdef TCP_NOPUSH +#if defined(TCP_NOPUSH) && !defined(__APPLE__) val = 0; setsockopt(conn->sd, IPPROTO_TCP, TCP_NOPUSH, &val, sizeof(val)); |