mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 04:30:28 +00:00
pjproject: Update bundled to 2.12 release.
This change removes patches which have been merged into upstream and updates some existing ones. It also adds some additional config_site.h changes to restore previous behavior, as well as a patch to allow multiple Authorization headers. There seems to be some confusion or disagreement on language in RFC 8760 in regards to whether multiple Authorization headers are supported. The RFC implies it is allowed, as does some past sipcore discussion. There is also the catch all of "local policy" to allow it. In the case of Asterisk we allow it. ASTERISK-29351 Change-Id: Id39ece02dedb7b9f739e0e37ea47d76854af7191
This commit is contained in:
committed by
Friendly Automation
parent
a7cf3979ec
commit
fa0078fbe4
@@ -1,19 +1,9 @@
|
||||
From e8000cc80e5f8ba02cc52852edc02cdb0e949525 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Mudgett <rmudgett@digium.com>
|
||||
Date: Mon, 6 Aug 2018 11:24:25 -0500
|
||||
Subject: [PATCH 1/5] 0000-configure-ssl-library-path.patch
|
||||
|
||||
---
|
||||
aconfigure | 6 +++++-
|
||||
aconfigure.ac | 6 +++++-
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/aconfigure b/aconfigure
|
||||
index 1c449b8..c4c6060 100755
|
||||
index d6f0e8809..9dcd46398 100755
|
||||
--- a/aconfigure
|
||||
+++ b/aconfigure
|
||||
@@ -7954,7 +7954,11 @@ else
|
||||
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
||||
@@ -8986,7 +8986,11 @@ else $as_nop
|
||||
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
||||
CFLAGS="$CFLAGS -I$with_ssl/include"
|
||||
CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
|
||||
- LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||
@@ -22,15 +12,15 @@ index 1c449b8..c4c6060 100755
|
||||
+ else
|
||||
+ LDFLAGS="$LDFLAGS -L$with_ssl"
|
||||
+ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
|
||||
$as_echo "Using SSL prefix... $with_ssl" >&6; }
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
|
||||
printf "%s\n" "Using SSL prefix... $with_ssl" >&6; }
|
||||
fi
|
||||
diff --git a/aconfigure.ac b/aconfigure.ac
|
||||
index 2c272cd..a5d6d97 100644
|
||||
index 16b311045..849da81ab 100644
|
||||
--- a/aconfigure.ac
|
||||
+++ b/aconfigure.ac
|
||||
@@ -1580,7 +1580,11 @@ AC_ARG_ENABLE(ssl,
|
||||
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
||||
@@ -1838,7 +1838,11 @@ AC_ARG_ENABLE(ssl,
|
||||
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
||||
CFLAGS="$CFLAGS -I$with_ssl/include"
|
||||
CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
|
||||
- LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||
@@ -42,6 +32,3 @@ index 2c272cd..a5d6d97 100644
|
||||
AC_MSG_RESULT([Using SSL prefix... $with_ssl])
|
||||
fi
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
Reference in New Issue
Block a user