c2f5b3a3a8
Fixes the following security issues: CVE-2018-16843: Excessive memory usage in HTTP/2 CVE-2018-16844: Excessive CPU usage in HTTP/2 CVE-2018-16845: Memory disclosure in the ngx_http_mp4_module Refreshed patch 0004 + 0007 as they no longer applied cleanly. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 7783d63c87f94797aa134786214b0a84c000be75 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Martin <s.martin49@gmail.com>
|
|
Date: Thu, 29 May 2014 19:22:27 +0200
|
|
Subject: [PATCH] auto/lib/libxslt/conf: use pkg-config
|
|
|
|
Change to using pkg-config to find the path to libxslt and its
|
|
dependencies.
|
|
|
|
Signed-off-by: Martin Bark <martin@barkynet.com>
|
|
[Peter: updated for 1.15.6]
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
---
|
|
auto/lib/libxslt/conf | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
|
|
index 3063ac7c..3209e364 100644
|
|
--- a/auto/lib/libxslt/conf
|
|
+++ b/auto/lib/libxslt/conf
|
|
@@ -12,8 +12,9 @@
|
|
#include <libxslt/xsltInternals.h>
|
|
#include <libxslt/transform.h>
|
|
#include <libxslt/xsltutils.h>"
|
|
- ngx_feature_path="/usr/include/libxml2"
|
|
- ngx_feature_libs="-lxml2 -lxslt"
|
|
+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt|
|
|
+ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
|
|
+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)"
|
|
ngx_feature_test="xmlParserCtxtPtr ctxt = NULL;
|
|
xsltStylesheetPtr sheet = NULL;
|
|
xmlDocPtr doc = NULL;
|
|
--
|
|
2.11.0
|
|
|