summaryrefslogtreecommitdiffstats
path: root/php-bug68074.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-11-02 08:01:18 +0100
committerRemi Collet <fedora@famillecollet.com>2014-11-02 08:01:18 +0100
commite8116421da4167f0014cbd5c2b9d4ded8881eddf (patch)
tree83b281f9aa131b32a9266671a5096c5b4d0de28c /php-bug68074.patch
parenta4a5ee68da16b7bcbf0f475ee6e11ba4d08fd920 (diff)
- update to 5.6.3RC1
- new version of systzdata patch, fix case sensitivity - ignore Factory in date tests - disable opcache.fast_shutdown in default config - add php56-cgi command in base system
Diffstat (limited to 'php-bug68074.patch')
-rw-r--r--php-bug68074.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/php-bug68074.patch b/php-bug68074.patch
deleted file mode 100644
index 04451c1..0000000
--- a/php-bug68074.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 0d776ef87b7b0c1e970c424cc5dcdf4cd6f500ac Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Wed, 24 Sep 2014 10:34:55 +0200
-Subject: [PATCH] Fix bug #68074 Allow to use system cipher list instead of
- hardcoded value
-
----
- ext/openssl/config0.m4 | 6 ++++++
- ext/openssl/xp_ssl.c | 9 ++++++---
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
-index a97114f..701e488 100644
---- a/ext/openssl/config0.m4
-+++ b/ext/openssl/config0.m4
-@@ -8,6 +8,9 @@ PHP_ARG_WITH(openssl, for OpenSSL support,
- PHP_ARG_WITH(kerberos, for Kerberos support,
- [ --with-kerberos[=DIR] OPENSSL: Include Kerberos support], no, no)
-
-+PHP_ARG_WITH(system-ciphers, whether to use system default cipher list instead of hardcoded value,
-+[ --with-system-ciphers OPENSSL: Use system default cipher list instead of hardcoded value], no, no)
-+
- if test "$PHP_OPENSSL" != "no"; then
- PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
- PHP_SUBST(OPENSSL_SHARED_LIBADD)
-@@ -25,4 +28,7 @@ if test "$PHP_OPENSSL" != "no"; then
- ], [
- AC_MSG_ERROR([OpenSSL check failed. Please check config.log for more information.])
- ])
-+ if test "$PHP_SYSTEM_CIPHERS" != "no"; then
-+ AC_DEFINE(USE_OPENSSL_SYSTEM_CIPHERS,1,[ Use system default cipher list instead of hardcoded value ])
-+ fi
- fi
-diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
-index de9e991..2f81dc7 100644
---- a/ext/openssl/xp_ssl.c
-+++ b/ext/openssl/xp_ssl.c
-@@ -1476,13 +1476,16 @@ int php_openssl_setup_crypto(php_stream *stream,
- }
-
- GET_VER_OPT_STRING("ciphers", cipherlist);
-+#ifndef USE_OPENSSL_SYSTEM_CIPHERS
- if (!cipherlist) {
- cipherlist = OPENSSL_DEFAULT_STREAM_CIPHERS;
- }
-- if (SSL_CTX_set_cipher_list(sslsock->ctx, cipherlist) != 1) {
-- return FAILURE;
-+#endif
-+ if (cipherlist) {
-+ if (SSL_CTX_set_cipher_list(sslsock->ctx, cipherlist) != 1) {
-+ return FAILURE;
-+ }
- }
--
- if (FAILURE == set_local_cert(sslsock->ctx, stream TSRMLS_CC)) {
- return FAILURE;
- }
---
-2.1.0
-