mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-31 18:55:19 +00:00
c812ad62f7
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
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
diff --git a/aconfigure b/aconfigure
|
|
index d6f0e8809..9dcd46398 100755
|
|
--- a/aconfigure
|
|
+++ b/aconfigure
|
|
@@ -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"
|
|
+ if test -d $with_ssl/lib; then
|
|
+ LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
|
+ else
|
|
+ LDFLAGS="$LDFLAGS -L$with_ssl"
|
|
+ fi
|
|
{ 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 16b311045..849da81ab 100644
|
|
--- a/aconfigure.ac
|
|
+++ b/aconfigure.ac
|
|
@@ -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"
|
|
+ if test -d $with_ssl/lib; then
|
|
+ LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
|
+ else
|
|
+ LDFLAGS="$LDFLAGS -L$with_ssl"
|
|
+ fi
|
|
AC_MSG_RESULT([Using SSL prefix... $with_ssl])
|
|
fi
|
|
|