Commit:    836a2b1131dd007edad24d921dbdf42a8ac10e32
Author:    Lars Strojny <lstro...@php.net>         Thu, 31 Jan 2013 00:32:44 
+0100
Parents:   4a01ddfb5569da1b87dd4cac95c3f709fb607396
Branches:  PHP-5.4

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=836a2b1131dd007edad24d921dbdf42a8ac10e32

Log:
NEWS entry new OpenSSL option [doc]

Changed paths:
  M  NEWS
  M  ext/openssl/xp_ssl.c


Diff:
diff --git a/NEWS b/NEWS
index d3a450e..2fc746e 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,10 @@ PHP                                                          
              NEWS
   . Fixed bug #63916 (PDO::PARAM_INT casts to 32bit int internally even
     on 64bit builds in pdo_sqlite). (srgoogleguy, Lars)
 
+- OpenSSL:
+  . New SSL stream context option to prevent CRIME attack vector. (Daniel 
Lowrey,
+    Lars)
+
 17 Jan 2012, PHP 5.4.11
 
 - Core:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 8b0fe69..0e15238 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -398,7 +398,7 @@ static inline int php_openssl_setup_crypto(php_stream 
*stream,
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
        {
                zval **val;
-               
+
                if (stream->context && SUCCESS == php_stream_context_get_option(
                                        stream->context, "ssl", 
"disable_compression", &val) &&
                                zval_is_true(*val)) {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to