From: Michael Wallner <mike@php.net>
Date: Tue, 4 Apr 2017 09:53:08 +0000 (+0200)
Subject: curl: fix gnutls include
X-Git-Tag: RELEASE_3_1_1_RC1~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=cb4b67381dd7bc1f9c8bc1c65729ed0e694512ae;p=m6w6%2Fext-http

curl: fix gnutls include
---

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 <openssl/ssl.h>
 #endif
 #if PHP_HTTP_HAVE_LIBCURL_GNUTLS
-#	include <gnutls.h>
+#	include <gnutls/gnutls.h>
 #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