From 434b5cd24bc7b7c0cea851f7d795c15a9a9dcd39 Mon Sep 17 00:00:00 2001
From: Martin Matuska <mm@FreeBSD.org>
Date: Sat, 24 Dec 2011 00:25:38 +0000
Subject: Add patch to fix vendor issue 2377 (SSL renegotiations) [1] Add patch
 to correctly report supported network handlers (lighttpd -V) [2]

References:
http://redmine.lighttpd.net/issues/2377 [1]

Reported by:	Christos Chatzaras <chris_at_cretaforce_dot_gr> [1] [2]
Obtained from:	lighttpd svn rev. 2822 [1]
---
 www/lighttpd/files/patch-src-connections.c | 14 ++++++++++++++
 www/lighttpd/files/patch-src-server.c      | 19 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 www/lighttpd/files/patch-src-connections.c
 create mode 100644 www/lighttpd/files/patch-src-server.c

(limited to 'www/lighttpd/files')

diff --git a/www/lighttpd/files/patch-src-connections.c b/www/lighttpd/files/patch-src-connections.c
new file mode 100644
index 000000000000..97f25856c51f
--- /dev/null
+++ b/www/lighttpd/files/patch-src-connections.c
@@ -0,0 +1,14 @@
+Index: src/connections.c
+===================================================================
+--- src/connections.c	(revision 2821)
++++ src/connections.c	(revision 2822)
+@@ -1360,9 +1360,7 @@
+ 			}
+ 
+ 			con->renegotiations = 0;
+-#ifndef OPENSSL_NO_TLSEXT
+ 			SSL_set_app_data(con->ssl, con);
+-#endif
+ 			SSL_set_accept_state(con->ssl);
+ 			con->conf.is_ssl=1;
+ 
diff --git a/www/lighttpd/files/patch-src-server.c b/www/lighttpd/files/patch-src-server.c
new file mode 100644
index 000000000000..458b4ec5b10b
--- /dev/null
+++ b/www/lighttpd/files/patch-src-server.c
@@ -0,0 +1,19 @@
+--- src/server.c.orig	2011-12-24 01:18:53.093922971 +0100
++++ src/server.c	2011-12-24 01:18:56.738921103 +0100
+@@ -411,7 +411,7 @@
+       "\nNetwork handler:\n\n"
+ #if defined(USE_LINUX_SENDFILE) || defined(USE_FREEBSD_SENDFILE) || defined(USE_SOLARIS_SENDFILEV) || defined(USE_AIX_SENDFILE)
+       "\t+ sendfile\n"
+-#else
++#endif
+   #ifdef USE_WRITEV
+       "\t+ writev\n"
+   #else
+@@ -422,7 +422,6 @@
+   #else
+       "\t- mmap support\n"
+   #endif
+-#endif
+       "\nFeatures:\n\n"
+ #ifdef HAVE_IPV6
+       "\t+ IPv6 support\n"
-- 
cgit v1.2.3