com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/opcac he/ZendAccelerator.c
ext/opcache/ZendAccelerator.h ext/ opcache/zend_accelerator_module.c ext/openssl/xp_ssl .c
| From: | Anatol Belski | Date: | Fri, 21 Feb 2014 12:56:14 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/opcac he/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/ opcache/zend_accelerator_module.c ext/openssl/xp_ssl .c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76175@lists.php.net to get a copy of this message | ||
Commit: 93e8fb39df9d0af18bbaadfd793847ffb3845ce7
Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 13:56:14 +0100
Parents: befb267ddf3d1f80c840e09302116cfec30cb4d2 f51555ca581fb120726ba439fd0a4edcad2ae86a
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=93e8fb39df9d0af18bbaadfd793847ffb3845ce7
Log:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
C89 compat
Added information about interned strings usage
Updated opcache version
Added function opcache_is_script_cached(). (Danack)
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/xp_ssl.c
Diff:
diff --cc ext/opcache/zend_accelerator_module.c
index 4c2d850,53cf205..6ef409a
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module..c
@@@ -438,10 -444,18 +444,18 @@@ void zend_accel_info(ZEND_MODULE_INFO_F
php_info_print_table_row(2, "Cache misses", buf);
snprintf(buf, sizeof(buf), "%ld",
ZCG(accel_directives).memory_consumption-zend_shared_alloc_get_free_memory()-ZSMMG(wasted_shared_memory));
php_info_print_table_row(2, "Used memory", buf);
- snprintf(buf, sizeof(buf), "%ld", zend_shared_alloc_get_free_memory());
+ snprintf(buf, sizeof(buf), "%pd", zend_shared_alloc_get_free_memory());
php_info_print_table_row(2, "Free memory", buf);
- snprintf(buf, sizeof(buf), "%ld", ZSMMG(wasted_shared_memory));
+ snprintf(buf, sizeof(buf), "%pd", ZSMMG(wasted_shared_memory));
php_info_print_table_row(2, "Wasted memory", buf);
+ #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
+ if (ZCSG(interned_strings_start) && ZCSG(interned_strings_end) &&
ZCSG(interned_strings_top)) {
+ snprintf(buf, sizeof(buf), "%ld", ZCSG(interned_strings_top) -
ZCSG(interned_strings_start));
+ php_info_print_table_row(2, "Interned Strings Used memory", buf);
+ snprintf(buf, sizeof(buf), "%ld", ZCSG(interned_strings_end) -
ZCSG(interned_strings_top));
+ php_info_print_table_row(2, "Interned Strings Free memory", buf);
+ }
+ #endif
snprintf(buf, sizeof(buf), "%ld", ZCSG(hash).num_direct_entries);
php_info_print_table_row(2, "Cached scripts", buf);
snprintf(buf, sizeof(buf), "%ld", ZCSG(hash).num_entries);
diff --cc ext/openssl/xp_ssl.c
index a2b955c,660caa7...61eec4f
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@@ -298,7 -298,7 +298,7 @@@ static int php_openssl_sockop_stat(php_
}
--static const SSL_METHOD *php_select_crypto_method(long method_value, int is_client TSRMLS_DC)
++static const SSL_METHOD *php_select_crypto_method(php_int_t method_value, int is_client TSRMLS_DC)
{
if (method_value == STREAM_CRYPTO_METHOD_SSLv2) {
#ifndef OPENSSL_NO_SSL2
@@@ -373,9 -373,12 +373,12 @@@ static inline int php_openssl_setup_cry
TSRMLS_DC)
{
const SSL_METHOD *method;
- long ssl_ctx_options;
- long method_flags;
+ php_int_t ssl_ctx_options;
+ php_int_t method_flags;
zval **val;
+ #ifdef SSL_MODE_RELEASE_BUFFERS
- long mode;
++ php_int_t mode;
+ #endif
if (sslsock->ssl_handle) {
if (sslsock->s.is_blocked) {