[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/bug60169.phpt trunk/Zend/tests/bug60169.phpt

2011-10-30 Thread Xinchen Hui 
laruence Sun, 30 Oct 2011 06:28:24 +

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

Log:
tests for 60169

Changed paths:
A   php/php-src/branches/PHP_5_4/Zend/tests/bug60169.phpt
A   php/php-src/trunk/Zend/tests/bug60169.phpt

Added: php/php-src/branches/PHP_5_4/Zend/tests/bug60169.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug60169.phpt   
(rev 0)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug60169.phpt   2011-10-30 
06:28:24 UTC (rev 318569)
@@ -0,0 +1,12 @@
+--TEST--
+Bug #60169 (Conjunction of ternary and list crashes PHP)
+--XFAIL--
+See Bug #60169, doesn't fixed yet
+--FILE--
+?php
+error_reporting(0);
+$arr  = array(test);
+list($a,$b)= is_array($arr)? $arr : $arr;
+echo ok\n;
+--EXPECT--
+ok


Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/bug60169.phpt
___
Added: svn:executable
   + *

Added: php/php-src/trunk/Zend/tests/bug60169.phpt
===
--- php/php-src/trunk/Zend/tests/bug60169.phpt  (rev 0)
+++ php/php-src/trunk/Zend/tests/bug60169.phpt  2011-10-30 06:28:24 UTC (rev 
318569)
@@ -0,0 +1,12 @@
+--TEST--
+Bug #60169 (Conjunction of ternary and list crashes PHP)
+--XFAIL--
+See Bug #60169, doesn't fixed yet
+--FILE--
+?php
+error_reporting(0);
+$arr  = array(test);
+list($a,$b)= is_array($arr)? $arr : $arr;
+echo ok\n;
+--EXPECT--
+ok


Property changes on: php/php-src/trunk/Zend/tests/bug60169.phpt
___
Added: svn:executable
   + *

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

[PHP-CVS] svn: /php/php-src/trunk/ext/mbstring/libmbfl/filters/ mbfilter_utf8_mobile.c

2011-10-30 Thread Rui Hirokawa 
hirokawa Sun, 30 Oct 2011 08:40:22 +

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

Log:
fixed alias of encoding.

Changed paths:
U   php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c

Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
===
--- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c   
2011-10-30 08:36:18 UTC (rev 318574)
+++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c   
2011-10-30 08:40:22 UTC (rev 318575)
@@ -41,7 +41,7 @@
 extern const unsigned char mblen_table_utf8[];

 static const char *mbfl_encoding_utf8_docomo_aliases[] = {UTF-8-DOCOMO, 
UTF8-DOCOMO, NULL};
-static const char *mbfl_encoding_utf8_kddi_a_aliases[] = {UTF-8-KDDI, 
UTF8-KDDI, NULL};
+static const char *mbfl_encoding_utf8_kddi_a_aliases[] = {NULL};
 static const char *mbfl_encoding_utf8_kddi_b_aliases[] = {UTF-8-Mobile#KDDI, 
UTF-8-KDDI, UTF8-KDDI, NULL};
 static const char *mbfl_encoding_utf8_sb_aliases[] = {UTF-8-SOFTBANK, 
UTF8-SOFTBANK, NULL};


-- 
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/ext/mbstring/libmbfl/filters/ mbfilter_utf8_mobile.c

2011-10-30 Thread Rui Hirokawa 
hirokawa Sun, 30 Oct 2011 08:40:51 +

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

Log:
MFH: fixed alias of encoding.

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c

Modified: 
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
===
--- 
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
2011-10-30 08:40:22 UTC (rev 318575)
+++ 
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
2011-10-30 08:40:51 UTC (rev 318576)
@@ -41,7 +41,7 @@
 extern const unsigned char mblen_table_utf8[];

 static const char *mbfl_encoding_utf8_docomo_aliases[] = {UTF-8-DOCOMO, 
UTF8-DOCOMO, NULL};
-static const char *mbfl_encoding_utf8_kddi_a_aliases[] = {UTF-8-KDDI, 
UTF8-KDDI, NULL};
+static const char *mbfl_encoding_utf8_kddi_a_aliases[] = {NULL};
 static const char *mbfl_encoding_utf8_kddi_b_aliases[] = {UTF-8-Mobile#KDDI, 
UTF-8-KDDI, UTF8-KDDI, NULL};
 static const char *mbfl_encoding_utf8_sb_aliases[] = {UTF-8-SOFTBANK, 
UTF8-SOFTBANK, NULL};


-- 
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/NEWS branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/zend_compile.c

2011-10-30 Thread Xinchen Hui 
laruence Mon, 31 Oct 2011 03:47:11 +

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

Log:
Fixed bug #60174 (Notice when array in method prototype error)
this should also exists in ext/reflection. since the new warning of array to 
string convert is introduced in zend_make_printable_zval which is used in 
ext/reflection too

Bug: https://bugs.php.net/60174 (Analyzed) Notice when array in method 
prototype error
  
Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U   php/php-src/trunk/Zend/zend_compile.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2011-10-30 15:48:19 UTC (rev 318598)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-10-31 03:47:11 UTC (rev 318599)
@@ -13,6 +13,7 @@
 - Core:
   . Fixed bug #60120 (proc_open's streams may hang with stdin/out/err when
 the data exceeds or is equal to 2048 bytes). (Pierre, Pascal Borreli)
+  . Fixed bug #60174 (Notice when array in method prototype error). Laruence

 - Oracle Database extension (OCI8):
   . Increased maxium Oracle error message buffer length for new 11.2.0.3 size

Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-10-30 15:48:19 UTC 
(rev 318598)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-10-31 03:47:11 UTC 
(rev 318599)
@@ -3133,6 +3133,9 @@
*(offset++) = 
'.';
}
*(offset++) = '\'';
+   } else if (Z_TYPE_P(zv) == 
IS_ARRAY) {
+   memcpy(offset, Array, 
5);
+   offset += 5;
} else {

zend_make_printable_zval(zv, zv_copy, use_copy);

REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN(zv_copy));
@@ -3155,7 +3158,7 @@
*(offset++) = ' ';
}
arg_info++;
-   REALLOC_BUF_IF_EXCEED(buf, offset, length, 23);
+   REALLOC_BUF_IF_EXCEED(buf, offset, length, 32);
}
}
*(offset++) = ')';

Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c   2011-10-30 15:48:19 UTC (rev 
318598)
+++ php/php-src/trunk/Zend/zend_compile.c   2011-10-31 03:47:11 UTC (rev 
318599)
@@ -3133,6 +3133,9 @@
*(offset++) = 
'.';
}
*(offset++) = '\'';
+   } else if (Z_TYPE_P(zv) == 
IS_ARRAY) {
+   memcpy(offset, Array, 
5);
+   offset += 5;
} else {

zend_make_printable_zval(zv, zv_copy, use_copy);

REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN(zv_copy));
@@ -3155,7 +3158,7 @@
*(offset++) = ' ';
}
arg_info++;
-   REALLOC_BUF_IF_EXCEED(buf, offset, length, 23);
+   REALLOC_BUF_IF_EXCEED(buf, offset, length, 32);
}
}
*(offset++) = ')';

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