com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/opcache/ZendAccelerator.c ext/o
pcache/ZendAccelerator.h ext/opcache/zend_accelerator_m odule.c ext/openssl/openssl.c ext/openssl/xp_ssl.c ext/standard/file.c

From: Date: Fri, 21 Feb 2014 16:45:04 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/opcache/ZendAccelerator.c ext/o
pcache/ZendAccelerator.h ext/opcache/zend_accelerator_m odule.c ext/openssl/openssl.c ext/openssl/xp_ssl.c ext/standard/file.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76171@lists.php.net to get a copy of this message
Commit: 14af491490f5fbcd49c5390d63a93fe65e0060ad Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 17:45:04 +0100 Parents: f629a3b84df124472e67749e3658a2caf264aaea bb9b9d7d2951ee206bcfa632515fd4819cb46806 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=14af491490f5fbcd49c5390d63a93fe65e0060ad Log: Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64 * origin/str_size_and_int64_56_backport: after merge fix C89 compat Added information about interned strings usage Updated opcache version Added function opcache_is_script_cached(). (Danack) Improve OpenSSL compile flag compatibility, minor updates Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests Improve server forward secrecy, refactor client SNI Add 'honor_cipher_order' server context option Add 'capture_session_meta' context option Disable TLS compression by default in both clients and servers Release ssl buffers Add openssl_get_cert_locations() function Explicitly set cert verify depth if not specified Strengthen default cipher list Conflicts: ext/openssl/xp_ssl.c Changed paths: MM ext/opcache/ZendAccelerator.c MM ext/opcache/ZendAccelerator.h MM ext/opcache/zend_accelerator_module.c MM ext/openssl/openssl.c MM ext/openssl/xp_ssl.c MM ext/standard/file.c Diff: diff --cc ext/openssl/xp_ssl.c index 52c174f,61eec4f..2c4dfee --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@@ -403,11 -422,9 +422,9 @@@ static inline int php_openssl_setup_cry #if OPENSSL_VERSION_NUMBER >= 0x0090806fL { - zval **val; - if (stream->context && SUCCESS == php_stream_context_get_option( stream->context, "ssl", "no_ticket", &val) && - zend_is_true(*val) + zend_is_true(*val TSRMLS_CC) ) { SSL_CTX_set_options(sslsock->ctx, SSL_OP_NO_TICKET); } @@@ -578,8 -802,20 +802,20 @@@ static inline int php_openssl_enable_cr if (SUCCESS == php_stream_context_get_option( stream->context, "ssl", + "capture_session_meta", &val) && + zend_is_true(*val)) { + zval *meta_arr = php_capture_ssl_session_meta(sslsock->ssl_handle); + php_stream_context_set_option(stream->context, + "ssl", "session_meta", + meta_arr); + zval_dtor(meta_arr); + efree(meta_arr); + } + + if (SUCCESS == php_stream_context_get_option( + stream->context, "ssl", "capture_peer_cert", &val) && - zend_is_true(*val)) { + zend_is_true(*val TSRMLS_CC)) { MAKE_STD_ZVAL(zcert); ZVAL_RESOURCE(zcert, zend_list_insert(peer_cert, php_openssl_get_x509_list_id() TSRMLS_CC));

« previous php.cvs (#76171) next »