From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 13 Aug 2018 14:36:54 +0000 (+0300)
Subject: up to 1.4.50
X-Git-Tag: auto/th/lighttpd-1.4.50-1~2
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=4b37c9295d1158cde3598d13d933c2a9c67cd468;hp=85a2698926f30b4378927f46b7a579202eef443a;p=packages%2Flighttpd.git

up to 1.4.50

https://www.lighttpd.net/2018/8/13/1.4.50/
---

diff --git a/lighttpd-bug-2876.patch b/lighttpd-bug-2876.patch
deleted file mode 100644
index b1c03e1..0000000
--- a/lighttpd-bug-2876.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e21906b3b41cda3cefebcc8b96ae6ad08549e504 Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Thu, 15 Mar 2018 23:21:37 -0400
-Subject: [PATCH] [core] fix crash if 'host' empty in config (fixes #2876)
-
-x-ref:
- "segfault with fastcgi app"
-  https://redmine.lighttpd.net/issues/2876
----
- src/gw_backend.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/gw_backend.c b/src/gw_backend.c
-index dbef6328..7b5ef190 100644
---- a/src/gw_backend.c
-+++ b/src/gw_backend.c
-@@ -1399,8 +1399,12 @@ int gw_set_defaults_backend(server *srv, gw_plugin_data *p, data_unset *du, size
-                     host->port = 80;
-                 }
- 
--                host->family = (!buffer_string_is_empty(host->host)
--                                && NULL != strchr(host->host->ptr, ':'))
-+                if (buffer_string_is_empty(host->host)) {
-+                    buffer_copy_string_len(host->host,
-+                                           CONST_STR_LEN("127.0.0.1"));
-+                }
-+
-+                host->family = (NULL != strchr(host->host->ptr, ':'))
-                   ? AF_INET6
-                   : AF_INET;
-             }
diff --git a/lighttpd.spec b/lighttpd.spec
index 01d0554..ff21b92 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -39,12 +39,12 @@
 Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
-Version:	1.4.49
-Release:	4
+Version:	1.4.50
+Release:	1
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
-# Source0-md5:	aaf8165379351c3766e5ad1e5c9dbe8b
+# Source0-md5:	cc23eba4e8eef1100aad0bbd36c4699a
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.user
@@ -120,7 +120,6 @@ Patch3:		%{name}-branding.patch
 Patch4:		systemd.patch
 Patch6:		test-port-setup.patch
 Patch7:		env-documentroot.patch
-Patch8:		lighttpd-bug-2876.patch
 Patch9:		bug-2882.patch
 URL:		https://www.lighttpd.net/
 %{?with_geoip:BuildRequires:	GeoIP-devel}
@@ -956,7 +955,6 @@ Plik monitrc do monitorowania serwera www lighttpd.
 %patch4 -p1
 %patch6 -p1
 #%patch7 -p1 probably fixed upstream
-%patch8 -p1
 %patch9 -p1
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead