Date: Thu, 25 Oct 2018 11:47:06 +0000 (UTC) From: Bernhard Froehlich <decke@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482966 - in head/multimedia/tvheadend: . files Message-ID: <201810251147.w9PBl6us059910@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: decke Date: Thu Oct 25 11:47:05 2018 New Revision: 482966 URL: https://svnweb.freebsd.org/changeset/ports/482966 Log: multimedia/tvheadend: Follow upstream and revert "FreeBSD: Fix recv problem if no data received." Reported by: Jongsung Kim <jongsung.kim@gmail.com> Added: head/multimedia/tvheadend/files/patch-src_tcp.c (contents, props changed) Modified: head/multimedia/tvheadend/Makefile Modified: head/multimedia/tvheadend/Makefile ============================================================================== --- head/multimedia/tvheadend/Makefile Thu Oct 25 11:32:03 2018 (r482965) +++ head/multimedia/tvheadend/Makefile Thu Oct 25 11:47:05 2018 (r482966) @@ -4,6 +4,7 @@ PORTNAME= tvheadend PORTVERSION= 4.2.7 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org Added: head/multimedia/tvheadend/files/patch-src_tcp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/tvheadend/files/patch-src_tcp.c Thu Oct 25 11:47:05 2018 (r482966) @@ -0,0 +1,23 @@ +commit f08bbef11c77a6a81d4e2bf974e36e54b0cd14d6 +Author: Jaroslav Kysela <perex@perex.cz> +Date: Tue Oct 16 16:51:00 2018 +0200 + + Revert "FreeBSD: Fix recv problem if no data received." + + This reverts commit 3895c923a3a959da05080831b8146c09ed143b00. + +--- src/tcp.c ++++ src/tcp.c +@@ -454,11 +454,8 @@ tcp_socket_dead(int fd) + if (err) + return -err; + #ifdef PLATFORM_FREEBSD +- err = recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT); +- if (err < 0) ++ if (recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT) < 0) + return -errno; +- else if (err == 0) +- return -EIO; + #else + if (recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT) == 0) + return -EIO;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810251147.w9PBl6us059910>