php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-06 07:32:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #79063: Curl openssl does not respect PKG_CONFIG_PATH

Browse Source
This commit is contained in:
Nikita Popov
2020-01-06 10:29:41 +01:00
parent 2d29904f25
commit b59f760472
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -19,6 +19,7 @@ PHP NEWS
- CURL:
. Fixed bug #79033 (Curl timeout error with specific url and post). (cmb)
. Fixed bug #79063 (curl openssl does not respect PKG_CONFIG_PATH). (Nikita)
- Date:
. Fixed bug #79015 (undefined-behavior in php_date.c). (cmb)

9
ext/curl/config.m4
View File

@@ -23,8 +23,6 @@ if test "$PHP_CURL" != "no"; then
esac
if test "$CURL_SSL" = yes; then
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $CURL_CFLAGS"
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $CURL_LIBS"
@@ -48,14 +46,17 @@ int main(int argc, char *argv[])
]])],[
AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
AC_CHECK_HEADERS([openssl/crypto.h])
PKG_CHECK_MODULES([OPENSSL], [openssl], [
PHP_EVAL_LIBLINE($OPENSSL_LIBS, CURL_SHARED_LIBADD)
PHP_EVAL_INCLINE($OPENSSL_CFLAGS)
AC_CHECK_HEADERS([openssl/crypto.h])
], [])
], [
AC_MSG_RESULT([no])
], [
AC_MSG_RESULT([no])
])
CFLAGS="$save_CFLAGS"
LDFLAGS="$save_LDFLAGS"
else
AC_MSG_RESULT([no])