[PHP-CVS] com php-src: Tinker with the wording of the MySQL deprecation news post.: NEWS

[Adam Harvey]

Commit:ec83534d88da4c96777b86d8db7fd20a52ed012e
Author:Adam Harvey  Tue, 11 Dec 2012 09:08:07 +0800
Parents:   b7091aaf0137d97cf4aa4a402ec50b3946d369c0
Branches:  PHP-5.5

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

Log:
Tinker with the wording of the MySQL deprecation news post.

I know that in general NEWS is a very punchy "this is what happened" log, but
Chris e-mailed me off-list to ask if it could be added to avoid any FUD — this
merely brings the NEWS post into line with UPGRADING, the migration guide, and
every other piece of advice we're giving out.

I also forgot to add the RFC URL last night, so added that.

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index ce5f08c..40fab8a 100644
--- a/NEWS
+++ b/NEWS
@@ -166,7 +166,8 @@ PHP 
   NEWS
 - MySQL
   . This extension is now deprecated, and deprecation warnings will be 
generated
 when connections are established to databases via mysql_connect(),
-mysql_pconnect(), or through implicit connection. (Adam)
+mysql_pconnect(), or through implicit connection: use MySQLi or PDO_MySQL
+instead (https://wiki.php.net/rfc/mysql_deprecation). (Adam)
 
 - MySQLi
   . Dropped support for LOAD DATA LOCAL INFILE handlers when using libmysql.


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

[PHP-CVS] com php-src: Fix typo: NEWS

[Johannes Schlüter]

Commit:795e3f1c0fa3a41cd933cc3ab3cd1867bbc7b817
Author:Johannes Schlüter  Mon, 10 Dec 2012 
13:32:08 +0100
Parents:   db6d8e27247429746985cf1c424e73728449922f
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

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

Log:
Fix typo

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 1ec60e3..52b1b82 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,7 @@ PHP   
 NEWS
   . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
 
 - Date:
-  . Fixed bug #63435 (Datetime::format('u') sometimes wrong by 1 microsecon).
+  . Fixed bug #63435 (Datetime::format('u') sometimes wrong by 1 microsecond).
 (Remi)
 
 - Fileinfo:


--
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.4' into PHP-5.5: Zend/zend_compile.c

[Xinchen Hui]

Commit:70b65f310016d3b777da4bd0ceb6f775658c4590
Author:Xinchen Hui  Mon, 10 Dec 2012 20:30:39 
+0800
Parents:   4e7db3ecbc4ae9e24bdb72403867ac5c7c153345 
3d86e6d881a5f425c3b37a85ea7f1eb5acd12b18
Branches:  PHP-5.5

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

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  Zend/zend_compile.c


Diff:



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

[PHP-CVS] com php-src: Fixed bug #63726 (Memleak with static properties and internal/user classes): NEWS Zend/zend_API.c Zend/zend_compile.c Zend/zend_object_handlers.c

[Xinchen Hui]

Commit:3d86e6d881a5f425c3b37a85ea7f1eb5acd12b18
Author:Xinchen Hui  Mon, 10 Dec 2012 20:29:51 
+0800
Parents:   8b8fb649dc8ca29e493f6342b87d1cc8acfb9d03
Branches:  PHP-5.4

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

Log:
Fixed bug #63726 (Memleak with static properties and internal/user classes)

No test scripts provided (will try to find one)

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

Changed paths:
  M  NEWS
  M  Zend/zend_API.c
  M  Zend/zend_compile.c
  M  Zend/zend_object_handlers.c


Diff:
diff --git a/NEWS b/NEWS
index 2023198..29b62a3 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP 
   NEWS
 ?? ??? 2012, PHP 5.4.10
 
 - Core:
+  . Fixed bug #63726 (Memleak with static properties and internal/user
+classes). (Laruence)
   . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
   . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes
 from value). (Pierrick)
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index c3d62c2..6dadd4d 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3708,6 +3708,8 @@ ZEND_API int zend_update_static_property(zend_class_entry 
*scope, const char *na
(*property)->value = value->value;
if (Z_REFCOUNT_P(value) > 0) {
zval_copy_ctor(*property);
+   } else {
+   efree(value);
}
} else {
zval *garbage = *property;
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index f25e7fa..917e0c1 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -,7 +,7 @@ static zend_bool 
do_inherit_property_access_check(HashTable *target_ht, zend_pro
if ((child_info->flags & ZEND_ACC_PPP_MASK) > 
(parent_info->flags & ZEND_ACC_PPP_MASK)) {
zend_error(E_COMPILE_ERROR, "Access level to %s::$%s 
must be %s (as in class %s)%s", ce->name, hash_key->arKey, 
zend_visibility_string(parent_info->flags), parent_ce->name, 
(parent_info->flags&ZEND_ACC_PUBLIC) ? "" : " or weaker");
} else if ((child_info->flags & ZEND_ACC_STATIC) == 0) {
-   
Z_DELREF_P(ce->default_properties_table[parent_info->offset]);
+   
zval_ptr_dtor(&(ce->default_properties_table[parent_info->offset]));
ce->default_properties_table[parent_info->offset] = 
ce->default_properties_table[child_info->offset];
ce->default_properties_table[child_info->offset] = NULL;
child_info->offset = parent_info->offset;
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index d82493a..3374b0b 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -539,6 +539,8 @@ ZEND_API void zend_std_write_property(zval *object, zval 
*member, zval *value, c
(*variable_ptr)->value = value->value;
if (Z_REFCOUNT_P(value) > 0) {
zval_copy_ctor(*variable_ptr);
+   } else {
+   efree(value);
}
zval_dtor(&garbage);
} else {


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

[PHP-CVS] com php-src: Fixed bug #63726 (Memleak with static properties and internal/user classes): NEWS Zend/zend_API.c Zend/zend_object_handlers.c

[Xinchen Hui]

Commit:ad553a7af237818f5d7690e97a03ffe66ec9ab37
Author:Xinchen Hui  Mon, 10 Dec 2012 20:28:27 
+0800
Parents:   db6d8e27247429746985cf1c424e73728449922f
Branches:  PHP-5.3

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

Log:
Fixed bug #63726 (Memleak with static properties and internal/user classes)

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

Changed paths:
  M  NEWS
  M  Zend/zend_API.c
  M  Zend/zend_object_handlers.c


Diff:
diff --git a/NEWS b/NEWS
index 1ec60e3..91306ca 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ PHP 
   NEWS
  ADD NEWS TO 5.3.21 ONLY 
 
 - Zend Engine:
+  . Fixed bug #63726 (Memleak with static properties and internal/user
+classes). (Laruence)
   . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
   . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes 
 from value). (Pierrick)
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index c1b501b..df11bdb 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3472,6 +3472,8 @@ ZEND_API int zend_update_static_property(zend_class_entry 
*scope, char *name, in
(*property)->value = value->value;
if (Z_REFCOUNT_P(value) > 0) {
zval_copy_ctor(*property);
+   } else {
+   efree(value);
}
} else {
zval *garbage = *property;
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index eae47d9..c40a458 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -437,6 +437,8 @@ static void zend_std_write_property(zval *object, zval 
*member, zval *value TSRM
(*variable_ptr)->value = value->value;
if (Z_REFCOUNT_P(value) > 0) {
zval_copy_ctor(*variable_ptr);
+   } else {
+   efree(value);
}
zval_dtor(&garbage);
} else {


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

[PHP-CVS] com php-src: skip 32-bit OS: tests/output/bug63377.phpt

[Xinchen Hui]

Commit:db6d8e27247429746985cf1c424e73728449922f
Author:Xinchen Hui  Mon, 10 Dec 2012 18:47:21 
+0800
Parents:   d86decd7b4ed11305fde0cad9163a1941101cd0b
Branches:  PHP-5.3

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

Log:
skip 32-bit OS

Changed paths:
  M  tests/output/bug63377.phpt


Diff:
diff --git a/tests/output/bug63377.phpt b/tests/output/bug63377.phpt
index e08d9f5..82d4189 100644
--- a/tests/output/bug63377.phpt
+++ b/tests/output/bug63377.phpt
@@ -2,6 +2,10 @@
 Bug #63377 (Segfault on output buffer > 2GB)
 --SKIPF--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Need more that 2G memory: tests/output/bug63377.phpt

[Xinchen Hui]

Commit:fa7e230c76ddbd1d8e9dff0cfb1c998525873733
Author:Xinchen Hui  Mon, 10 Dec 2012 18:28:01 
+0800
Parents:   ff6c9e2726ab724707999ed651d1a414336665f2
Branches:  PHP-5.3

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

Log:
Need more that 2G memory

Changed paths:
  M  tests/output/bug63377.phpt


Diff:
diff --git a/tests/output/bug63377.phpt b/tests/output/bug63377.phpt
index 75e0af9..e08d9f5 100644
--- a/tests/output/bug63377.phpt
+++ b/tests/output/bug63377.phpt
@@ -19,7 +19,7 @@ if (PHP_OS == 'Linux') {
 $infos[$index] = $value;
   }
   $freeMemory = $infos['memfree']+$infos['buffers']+$infos['cached'];
-  if ($freeMemory < 2100*1024*1024) {
+  if ($freeMemory < 3072*1024*1024) {
 die('skip Not enough memory.');
   }
 }
@@ -38,7 +38,7 @@ elseif (PHP_OS == 'FreeBSD') {
   $freeMemory = ($infos['vm.stats.vm.v_inactive_count']*$infos['hw.pagesize'])
 +($infos['vm.stats.vm.v_cache_count']*$infos['hw.pagesize'])
 +($infos['vm.stats.vm.v_free_count']*$infos['hw.pagesize']);
-  if ($freeMemory < 2100*1024*1024) {
+  if ($freeMemory < 3072*1024*1024) {
 die('skip Not enough memory.');
   }
 }


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