From cb4b67381dd7bc1f9c8bc1c65729ed0e694512ae Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 4 Apr 2017 11:53:08 +0200 Subject: [PATCH 1/1] curl: fix gnutls include --- autoconf/pecl/libcurl.m4 | 2 +- src/php_http_client_curl.c | 2 +- travis/pecl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autoconf/pecl/libcurl.m4 b/autoconf/pecl/libcurl.m4 index 73ea259..fce6437 100644 --- a/autoconf/pecl/libcurl.m4 +++ b/autoconf/pecl/libcurl.m4 @@ -88,7 +88,7 @@ AC_DEFUN([PECL_HAVE_LIBCURL_SSL], [dnl AC_REQUIRE([PECL_HAVE_LIBCURL_CA])dnl PECL_HAVE_LIBCURL_FEATURE([SSL], [ PECL_HAVE_LIBCURL_SSLLIB([OpenSSL], [openssl/ssl.h openssl/crypto.h], [ssl crypto]) - PECL_HAVE_LIBCURL_SSLLIB([GnuTLS], [gnutls.h gcrypt.h], [gnutls gcrypt]) + PECL_HAVE_LIBCURL_SSLLIB([GnuTLS], [gnutls/gnutls.h gcrypt.h], [gnutls gcrypt]) PECL_HAVE_LIBCURL_SSLLIB([NSS]) PECL_HAVE_LIBCURL_SSLLIB([SecureTransport]) PECL_HAVE_LIBCURL_SSLLIB([GSKit]) diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c index e513211..f286324 100644 --- a/src/php_http_client_curl.c +++ b/src/php_http_client_curl.c @@ -21,7 +21,7 @@ # include #endif #if PHP_HTTP_HAVE_LIBCURL_GNUTLS -# include +# include #endif typedef struct php_http_client_curl_handler { diff --git a/travis/pecl b/travis/pecl index 90af692..79de9c8 160000 --- a/travis/pecl +++ b/travis/pecl @@ -1 +1 @@ -Subproject commit 90af692cb807f63c4d4e943ff4699dc9637728fb +Subproject commit 79de9c8e52f16a2e06324683cf4c00c91df1b6c1 -- 2.30.2