[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_hash.c trunk/Zend/zend_hash.c

[Dmitry Stogov]

dmitry   Thu, 01 Dec 2011 13:58:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=320245

Log:
Fixed icorrect key length after updating constant index

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/zend_hash.c
U   php/php-src/trunk/Zend/zend_hash.c

Modified: php/php-src/branches/PHP_5_4/Zend/zend_hash.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_hash.c   2011-12-01 13:30:19 UTC 
(rev 320244)
+++ php/php-src/branches/PHP_5_4/Zend/zend_hash.c   2011-12-01 13:58:29 UTC 
(rev 320245)
@@ -1399,6 +1399,7 @@
p-h = num_index;
} else {
p-h = h;
+   p-nKeyLength = str_length;
if (IS_INTERNED(str_index)) {
p-arKey = str_index;
} else {

Modified: php/php-src/trunk/Zend/zend_hash.c
===
--- php/php-src/trunk/Zend/zend_hash.c  2011-12-01 13:30:19 UTC (rev 320244)
+++ php/php-src/trunk/Zend/zend_hash.c  2011-12-01 13:58:29 UTC (rev 320245)
@@ -1399,6 +1399,7 @@
p-h = num_index;
} else {
p-h = h;
+   p-nKeyLength = str_length;
if (IS_INTERNED(str_index)) {
p-arKey = str_index;
} else {

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/ zend_hash.c

[Felipe Pena]

felipe   Wed, 22 Jun 2011 15:12:47 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=312381

Log:
- Fix ZTS build

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/zend_hash.c

Modified: php/php-src/branches/PHP_5_4/Zend/zend_hash.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_hash.c   2011-06-22 15:00:58 UTC 
(rev 312380)
+++ php/php-src/branches/PHP_5_4/Zend/zend_hash.c   2011-06-22 15:12:47 UTC 
(rev 312381)
@@ -368,6 +368,9 @@
 {
uint nIndex;
Bucket *p;
+#ifdef ZEND_SIGNALS
+   TSRMLS_FETCH();
+#endif

IS_CONSISTENT(ht);
CHECK_INIT(ht);

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