From owner-svn-ports-all@freebsd.org Wed Nov 9 21:57:26 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0581AC38B65; Wed, 9 Nov 2016 21:57:26 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B30741FF; Wed, 9 Nov 2016 21:57:25 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA9LvOwE092927; Wed, 9 Nov 2016 21:57:24 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA9LvOMN092925; Wed, 9 Nov 2016 21:57:24 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201611092157.uA9LvOMN092925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Wed, 9 Nov 2016 21:57:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425810 - in head/mail/dovecot2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2016 21:57:26 -0000 Author: adamw Date: Wed Nov 9 21:57:24 2016 New Revision: 425810 URL: https://svnweb.freebsd.org/changeset/ports/425810 Log: Add an upstream github commit: https://github.com/dovecot/core/commit/b284962364068d5e9d60b8b1e98ba61b4b6593ec lib-http: client: Fixed assert failure occurring when server eturns error status early while client is still sending blocking payload. PR: 214365 Submitted by: Larry Rosenman Added: head/mail/dovecot2/files/patch-src_lib-http_http-client-request.c (contents, props changed) Modified: head/mail/dovecot2/Makefile Modified: head/mail/dovecot2/Makefile ============================================================================== --- head/mail/dovecot2/Makefile Wed Nov 9 21:54:29 2016 (r425809) +++ head/mail/dovecot2/Makefile Wed Nov 9 21:57:24 2016 (r425810) @@ -14,7 +14,7 @@ PORTNAME= dovecot PORTVERSION= 2.2.26.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R:R}/ PKGNAMESUFFIX= 2 Added: head/mail/dovecot2/files/patch-src_lib-http_http-client-request.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dovecot2/files/patch-src_lib-http_http-client-request.c Wed Nov 9 21:57:24 2016 (r425810) @@ -0,0 +1,22 @@ +--- src/lib-http/http-client-request.c.orig 2016-10-27 12:26:28 UTC ++++ src/lib-http/http-client-request.c +@@ -786,10 +786,16 @@ int http_client_request_send_payload(str + i_assert(data != NULL); + + ret = http_client_request_continue_payload(&req, data, size); +- if (ret < 0) ++ if (ret < 0) { ++ /* failed to send payload */ + *_req = NULL; +- else { +- i_assert(ret == 0); ++ } else if (ret > 0) { ++ /* premature end of request; ++ server sent error before all payload could be sent */ ++ ret = -1; ++ *_req = NULL; ++ } else { ++ /* not finished sending payload */ + i_assert(req != NULL); + } + return ret;