diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-07 14:20:33 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-07 14:20:33 +0000 |
commit | c1ee7a6e6d21447788c7512e7197d49ebfbc3096 (patch) | |
tree | f6dbf52c47e29ab57edc25ed499f7c6f4745ef75 /main/lighttpd/0010-Fixed-typo-found-by-openSUSE-user-boo-907709.patch | |
parent | 77345a923c72d9e8d0a4202d893239ba43b903a3 (diff) | |
download | aports-c1ee7a6e6d21447788c7512e7197d49ebfbc3096.tar.bz2 aports-c1ee7a6e6d21447788c7512e7197d49ebfbc3096.tar.xz |
main/lighttpd: security fix for CVE-2015-3200
The upstream patch does not apply without applying lot other stuff so we
simply apply all since 1.4.35 release.
ref #4329
Diffstat (limited to 'main/lighttpd/0010-Fixed-typo-found-by-openSUSE-user-boo-907709.patch')
-rw-r--r-- | main/lighttpd/0010-Fixed-typo-found-by-openSUSE-user-boo-907709.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/main/lighttpd/0010-Fixed-typo-found-by-openSUSE-user-boo-907709.patch b/main/lighttpd/0010-Fixed-typo-found-by-openSUSE-user-boo-907709.patch new file mode 100644 index 0000000000..9f95d3ee41 --- /dev/null +++ b/main/lighttpd/0010-Fixed-typo-found-by-openSUSE-user-boo-907709.patch @@ -0,0 +1,38 @@ +From e1aab1c420e8d291299d1024e1c3450d85bec772 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@opensu.se> +Date: Thu, 5 Feb 2015 15:29:01 +0000 +Subject: [PATCH 10/29] Fixed typo found by openSUSE user (boo# 907709) + +git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2970 152afb58-edef-0310-8abb-c4023f1b3aa9 +--- + doc/config/vhosts.d/vhosts.template | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/config/vhosts.d/vhosts.template b/doc/config/vhosts.d/vhosts.template +index 2c443aa..efd441f 100644 +--- a/doc/config/vhosts.d/vhosts.template ++++ b/doc/config/vhosts.d/vhosts.template +@@ -8,17 +8,17 @@ $HTTP["host"] == "download.example.com" { + var.server_name = "download.example.com" + + server.name = server_name +- ## ++ ## example how to include another config: + ## use trigger before download + ## +- include "conf.d/trigger_b4_dl.conf" ++ # include "conf.d/trigger_b4_dl.conf" + + server.document-root = vhosts_dir + "/example.com/download/htdocs" + ## + ## use a seperate access log file + ## At the moment you cant have different error log files. + ## +- accesslog.filename = log_root + "/" + server_name "/access.log" ++ accesslog.filename = log_root + "/" + server_name + "/access.log" + } + + $SERVER["socket"] == "127.0.0.1:443" { +-- +2.4.5 + |