svn commit: r425810 - in head/mail/dovecot2: . files

[Adam Weinberger]

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;