[Pkg-php-commits] [php/debian-sid] Import backported upstream fix for fopen fails on some SSL urls

[Ondřej Surý]

---
 debian/patches/backport-upstream-lp592442.patch |   21 +++++++++++++++++++++
 debian/patches/series                           |    1 +
 2 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/backport-upstream-lp592442.patch

diff --git a/debian/patches/backport-upstream-lp592442.patch b/debian/patches/backport-upstream-lp592442.patch
new file mode 100644
index 0000000..bc9f3f1
--- /dev/null
+++ b/debian/patches/backport-upstream-lp592442.patch
@@ -0,0 +1,21 @@
+--- a/ext/openssl/xp_ssl.c
++++ b/ext/openssl/xp_ssl.c
+@@ -385,6 +385,18 @@ static inline int php_openssl_setup_cryp
+ 	}
+ #endif
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x0090806fL
++	{
++		zval **val;
++
++		if (stream->context && SUCCESS == php_stream_context_get_option(
++								stream->context, "ssl", "no_ticket", &val) &&
++						zval_is_true(*val)) {
++					SSL_CTX_set_options(sslsock->ctx, SSL_OP_NO_TICKET);
++		}
++	}
++#endif
++
+ 	sslsock->ssl_handle = php_SSL_new_from_context(sslsock->ctx, stream TSRMLS_CC);
+ 	if (sslsock->ssl_handle == NULL) {
+ 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create an SSL handle");
diff --git a/debian/patches/series b/debian/patches/series
index ae7687b..76f51d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -55,3 +55,4 @@ configure-as-needed.patch
 lp564920-fix-big-files.patch
 lang-test-use-utf8.patch
 disable_SSLv2_for_openssl_1_0_0.patch
+backport-upstream-lp592442.patch
-- 
1.7.1