[PHP-CVS] com php-src: Merge from GitHub: ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h

2013-07-28 Thread Dmitry Stogov 
Commit:ae5e70afac265e6b113d7995bb10479ee2565aba
Author:Dmitry Stogov dmi...@zend.com Sun, 28 Jul 2013 13:47:13 
+0400
Parents:   bafe0e5399a200cb88685cd32c362e45b27221fb
Branches:  PHP-5.5 master

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

Log:
Merge from GitHub

Changed paths:
  M  ext/opcache/ZendAccelerator.c
  M  ext/opcache/ZendAccelerator.h


Diff:
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index f05798e..76a3320 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2163,7 +2163,9 @@ static void accel_fast_zval_ptr_dtor(zval **zval_ptr)
case IS_CONSTANT_ARRAY: {
TSRMLS_FETCH();
 
+#if ZEND_EXTENSION_API_NO = PHP_5_3_X_API_NO
GC_REMOVE_ZVAL_FROM_BUFFER(zvalue);
+#endif
if (zvalue-value.ht  
(zvalue-value.ht != EG(symbol_table))) {
/* break possible cycles */
Z_TYPE_P(zvalue) = IS_NULL;
@@ -2176,7 +2178,9 @@ static void accel_fast_zval_ptr_dtor(zval **zval_ptr)
{
TSRMLS_FETCH();
 
+#if ZEND_EXTENSION_API_NO = PHP_5_3_X_API_NO
GC_REMOVE_ZVAL_FROM_BUFFER(zvalue);
+#endif
Z_OBJ_HT_P(zvalue)-del_ref(zvalue 
TSRMLS_CC);
}
break;
diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h
index 733e544..5f414f2 100644
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@ -27,7 +27,7 @@
 #endif
 
 #define ACCELERATOR_PRODUCT_NAME   Zend OPcache
-#define ACCELERATOR_VERSION 7.0.2-dev
+#define ACCELERATOR_VERSION 7.0.3-dev
 /* 2 - added Profiler support, on 20010712 */
 /* 3 - added support for Optimizer's encoded-only-files mode */
 /* 4 - works with the new Optimizer, that supports the file format with 
licenses */


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h

2013-07-28 Thread Dmitry Stogov 
Commit:294335761b75d13d374312d9074d1f9270f69267
Author:Dmitry Stogov dmi...@zend.com Sun, 28 Jul 2013 13:50:13 
+0400
Parents:   d4aee1021e6a29f62dcb9c96e945a0fe710c8832 
ae5e70afac265e6b113d7995bb10479ee2565aba
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Merge from GitHub
  Update NEWS
  Fixed bug #65336

Conflicts:
NEWS

Bugs:
https://bugs.php.net/65336

Changed paths:
  MM  ext/opcache/ZendAccelerator.c
  MM  ext/opcache/ZendAccelerator.h


Diff:



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

Re: [PHP-CVS] com php-src: Merge from GitHub: ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h

2013-07-28 Thread Johannes Schlüter 
On Sun, 2013-07-28 at 09:47 +, Dmitry Stogov wrote:
 index 733e544..5f414f2 100644
 --- a/ext/opcache/ZendAccelerator.h
 +++ b/ext/opcache/ZendAccelerator.h
 @@ -27,7 +27,7 @@
  #endif
  
  #define ACCELERATOR_PRODUCT_NAME   Zend OPcache
 -#define ACCELERATOR_VERSION 7.0.2-dev
 +#define ACCELERATOR_VERSION 7.0.3-dev 

Having -dev versions stable branches in git is problematic as we most
likely forget to change that before a release and users get -dev
versions. Can we either remove the -dev or properly define this in
README.RELEASE_PROCESS?

johannes



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