Attachment #204073 for bug #237613

View | Details | Raw Unified | Return to bug 237613
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-1 / +1 lines)
3		3
4	PORTNAME= nullmailer	4	PORTNAME= nullmailer
5	PORTVERSION= 1.13	5	PORTVERSION= 1.13
6	PORTREVISION= 3	6	PORTREVISION= 4
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= mail	8	CATEGORIES= mail
9	MASTER_SITES= http://untroubled.org/nullmailer/ \	9	MASTER_SITES= http://untroubled.org/nullmailer/ \




--- lib/fdbuf/tlsibuf.cc.orig
+++ lib/fdbuf/tlsibuf.cc
@@ -27,5 +27,10 @@
 
 ssize_t tlsibuf::_read(char* buf, ssize_t len)
 {
-  return gnutls_record_recv(session, buf, len);
+  ssize_t rc;
+  do
+  {
+    rc = gnutls_record_recv(session, buf, len);
+  } while (rc == GNUTLS_E_AGAIN || rc == GNUTLS_E_INTERRUPTED);
+  return rc;
 }




--- lib/fdbuf/tlsobuf.cc.orig
+++ lib/fdbuf/tlsobuf.cc
@@ -27,5 +27,10 @@
 
 ssize_t tlsobuf::_write(const char* buf, ssize_t len)
 {
-  return gnutls_record_send(session, buf, len);
+  ssize_t rc;
+  do
+  {
+    rc = gnutls_record_send(session, buf, len);
+  } while(rc == GNUTLS_E_AGAIN || rc == GNUTLS_E_INTERRUPTED);
+  return rc;
 }

Return to bug 237613

Line 0 Link Here

(-)files/patch-lib_fdbuf_tlsibuf.cc (+14 lines)
	1	--- lib/fdbuf/tlsibuf.cc.orig
	2	+++ lib/fdbuf/tlsibuf.cc
	3	@@ -27,5 +27,10 @@
	4
	5	ssize_t tlsibuf::_read(char* buf, ssize_t len)
	6	{
	7	- return gnutls_record_recv(session, buf, len);
	8	+ ssize_t rc;
	9	+ do
	10	+ {
	11	+ rc = gnutls_record_recv(session, buf, len);
	12	+ } while (rc == GNUTLS_E_AGAIN \|\| rc == GNUTLS_E_INTERRUPTED);
	13	+ return rc;
	14	}

Line 0 Link Here

(-)files/patch-lib_fdbuf_tlsobuf.cc (+14 lines)
	1	--- lib/fdbuf/tlsobuf.cc.orig
	2	+++ lib/fdbuf/tlsobuf.cc
	3	@@ -27,5 +27,10 @@
	4
	5	ssize_t tlsobuf::_write(const char* buf, ssize_t len)
	6	{
	7	- return gnutls_record_send(session, buf, len);
	8	+ ssize_t rc;
	9	+ do
	10	+ {
	11	+ rc = gnutls_record_send(session, buf, len);
	12	+ } while(rc == GNUTLS_E_AGAIN \|\| rc == GNUTLS_E_INTERRUPTED);
	13	+ return rc;
	14	}