date:20090706

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring/tests mb_convert_kana.phpt mb_decode_numericentity.phpt mb_encode_numericentity.phpt mb_ereg3.phpt mb_ereg4.phpt mb_ereg_search.phpt mb_ereg_search_pos.ph

2009-07-06 Thread Felipe Pena

felipe  Tue Jul  7 01:17:46 2009 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mbstring/tests mb_convert_kana.phpt 
mb_decode_numericentity.phpt 
mb_encode_numericentity.phpt 
mb_ereg3.phpt mb_ereg4.phpt 
mb_ereg_search.phpt 
mb_ereg_search_pos.phpt 
mb_ereg_search_regs.phpt mb_eregi.phpt 
mb_eregi_invalid_arguments.phpt 
mb_eregi_replace.phpt 
  Log:
  - MFH: New tests (WurzbrugUG testfest)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_convert_kana.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_convert_kana.phpt
+++ php-src/ext/mbstring/tests/mb_convert_kana.phpt
--TEST--
Testing mb_convert_kana() function
--SKIPIF--

--FILE--
 ' . mb_convert_kana($zenKakuA, 'AZKH', 'utf-8');
echo "\n";
echo $zenKakuB . ' => ' . mb_convert_kana($zenKakuB, 'azkh', 'utf-8');
echo "\n";
echo $zenKakuC . ' => ' . mb_convert_kana($zenKakuC, 'azkh', 'utf-8');
echo "\n";
echo $zenKakuD . ' => ' . mb_convert_kana($zenKakuD, 'azkh', 'utf-8');
echo "\n";
echo $zenKakuE . ' => ' . mb_convert_kana($zenKakuE, 'azkh', 'utf-8');
echo "\n";
echo $zenKakuF . ' => ' . mb_convert_kana($zenKakuF, 'azkh', 'utf-8');
echo "\n";
echo "\n";
echo $hanKakuA . ' => ' . mb_convert_kana($hanKakuA, 'AZKH', 'utf-8');
echo "\n";
echo $hanKakuB . ' => ' . mb_convert_kana($hanKakuB, 'AZKH', 'utf-8');
echo "\n";
echo $hanKakuC . ' => ' . mb_convert_kana($hanKakuC, 'AZKH', 'utf-8');
echo "\n";
echo $hanKakuD . ' => ' . mb_convert_kana($hanKakuD, 'AZKH', 'utf-8');
?>
--EXPECT--
ã¡ã¢ã£ã¤ã¥ã¦ã§ã¨ã©ãªã«ã¬ãã®ã¯ => 
ã¡ã¢ã£ã¤ã¥ã¦ã§ã¨ã©ãªã«ã¬ãã®ã¯
ã°ã±ã²ã³ã´ãµã¶ã·ã¸ã¹ãºã»ã¼ã½ã¾ã¿ => 
ï½¸ï¾ï½¹ï½¹ï¾ï½ºï½ºï¾ï½»ï½»ï¾ï½¼ï½¼ï¾ï½½ï½½ï¾ï½¾ï½¾ï¾ï½¿ï½¿ï¾ï¾
ãããããããããããããããã => 
ï¾ï¾ï¾ï¾ï¾ï½¯ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾
ãããããããããããããããã => 
ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾
ã ã¡ã¢ã£ã¤ã¥ã¦ã§ã¨ã©ãªã«ã¬ãã®ã¯ => 
ï¾ï¾ï¾ï½¬ï¾ï½ï¾ï½®ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾
ã°ã±ã²ã³ã´ãµã¶ã·ã¸ã¹ãºã»ã¼ã½ã¾ => 
ï½²ï½´ï½¦ï¾ï½³ï¾ãµã¶ã·ã¸ã¹ãºï½¥ï½°ã½ã¾

ï½ ï½¡ï½¢ï½£ï½¤ï½¥ï½¦ï½§ï½¨ï½©ï½ªï½«ï½¬ï½ï½®ï½¯ => 
ï½ ããããã»ã²ã¡ã£ã¥ã§ã©ã£ã¥ã§ã
ï½°ï½±ï½²ï½³ï½´ï½µï½¶ï½·ï½¸ï½¹ï½ºï½»ï½¼ï½½ï½¾ï½¿ => 
ã¼ã¢ã¤ã¦ã¨ãªã«ãã¯ã±ã³ãµã·ã¹ã»ã½
ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ => 
ã¿ããããããããããããããã
ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ => 
ãã ã¡ã¢ã¤ã¦ã¨ã©ãªã«ã¬ãã¯ã³ãã

--CREDITS--
Jason Easter 
PHPUG WÃ¼rzburg 
Testfest 2009 2009-06-20

http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_decode_numericentity.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_decode_numericentity.phpt
+++ php-src/ext/mbstring/tests/mb_decode_numericentity.phpt
--TEST--
Test mb_decode_numericentity() function : Convert HTML-Entities to UTF-8
--SKIPIF--

--FILE--

--EXPECT--
Â¡Â¢Â£Â¤Â¥Â¦Â§Â¨Â©ÂªÂ«Â¬ÂÂ®Â¯Â°Â±Â²Â³Â´ÂµÂ¶Â·Â¸Â¹ÂºÂ»Â¼Â½Â¾Â¿ÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃ Ã¡Ã¢Ã£Ã¤Ã¥Ã¦Ã§Ã¨Ã©ÃªÃ«Ã¬ÃÃ®Ã¯Ã°Ã±Ã²Ã³Ã´ÃµÃ¶Ã·Ã¸Ã¹ÃºÃ»Ã¼Ã½Ã¾Ã¿
ÆÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ Î¡Î£Î¤Î¥Î¦Î§Î¨Î©Î±Î²Î³Î´ÎµÎ¶Î·Î¸Î¹ÎºÎ»Î¼Î½Î¾Î¿ÏÏÏÏÏÏÏÏÏÏÏÏÏâ¢â¦â²â³â¾âââââ¢âµââââââµâââââââââââââââââââââ â§â¨â©âªâ«â´â¼âââ â¡â¤â¥ââââââââ¥ââââââ©âªââ â£â¥â¦
aÅbÅcÅ dÅ¡eâ¬fg

http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_encode_numericentity.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_encode_numericentity.phpt
+++ php-src/ext/mbstring/tests/mb_encode_numericentity.phpt
--TEST--
Test mb_encode_numericentity() function : Convert UTF-8 to HTML-Entities
--SKIPIF--

--FILE--

--EXPECTF--
¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ
ƒΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρςστυφχψωϑϒϖ•…′″‾⁄℘ℑℜ™ℵ←↑→↓↔↵⇐⇑⇒⇓⇔∀∂∃∅∇∈∉∋∏∑−∗√∝∞∠∧∨∩∪∫∴∼≅≈≠≡≤≥⊂⊃⊄⊆⊇⊕⊗⊥⋅⌈⌉⌊⌋〈〉◊♠♣♥♦
aŒbœcŠdše€fg

http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg3.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_ereg3.phpt
+++ php-src/ext/mbstring/tests/mb_ereg3.phpt
--TEST--
mb_ereg() returning matches
--SKIPIF--

--FILE--

--EXPECTF-- 
int(-1)
int(-1)
array(1) {
  [0]=>
  string(2) "-1"
}
int(-1)
int(-1)
array(1) {
  [0]=>
  string(2) "-1"
}

Warning: mbereg_search_init() expects parameter 3 to be 
%binary_string_optional%, array given in %s on line %d
int(-1)
int(-1)
array(1) {
  [0]=>
  string(2) "-1"
}
Done

http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg4.phpt?view=mar

[PHP-CVS] cvs: php-src /ext/mbstring/tests mb_convert_kana.phpt mb_decode_numericentity.phpt mb_encode_numericentity.phpt mb_ereg3.phpt mb_ereg4.phpt mb_ereg_search.phpt mb_ereg_search_pos.phpt mb_ere

2009-07-06 Thread Felipe Pena

felipe  Tue Jul  7 01:15:12 2009 UTC

  Added files: 
/php-src/ext/mbstring/tests mb_convert_kana.phpt 
mb_decode_numericentity.phpt 
mb_encode_numericentity.phpt 
mb_ereg3.phpt mb_ereg4.phpt 
mb_ereg_search.phpt 
mb_ereg_search_pos.phpt 
mb_ereg_search_regs.phpt mb_eregi.phpt 
mb_eregi_invalid_arguments.phpt 
mb_eregi_replace.phpt 
  Log:
  - New tests (WurzbrugUG testfest)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_convert_kana.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_convert_kana.phpt
+++ php-src/ext/mbstring/tests/mb_convert_kana.phpt
--TEST--
Testing mb_convert_kana() function
--SKIPIF--

--FILE--
 ' . mb_convert_kana($zenKakuA, 'AZKH', 'utf-8');
echo "\n";
echo $zenKakuB . ' => ' . mb_convert_kana($zenKakuB, 'azkh', 'utf-8');
echo "\n";
echo $zenKakuC . ' => ' . mb_convert_kana($zenKakuC, 'azkh', 'utf-8');
echo "\n";
echo $zenKakuD . ' => ' . mb_convert_kana($zenKakuD, 'azkh', 'utf-8');
echo "\n";
echo $zenKakuE . ' => ' . mb_convert_kana($zenKakuE, 'azkh', 'utf-8');
echo "\n";
echo $zenKakuF . ' => ' . mb_convert_kana($zenKakuF, 'azkh', 'utf-8');
echo "\n";
echo "\n";
echo $hanKakuA . ' => ' . mb_convert_kana($hanKakuA, 'AZKH', 'utf-8');
echo "\n";
echo $hanKakuB . ' => ' . mb_convert_kana($hanKakuB, 'AZKH', 'utf-8');
echo "\n";
echo $hanKakuC . ' => ' . mb_convert_kana($hanKakuC, 'AZKH', 'utf-8');
echo "\n";
echo $hanKakuD . ' => ' . mb_convert_kana($hanKakuD, 'AZKH', 'utf-8');
?>
--EXPECT--
ã¡ã¢ã£ã¤ã¥ã¦ã§ã¨ã©ãªã«ã¬ãã®ã¯ => 
ã¡ã¢ã£ã¤ã¥ã¦ã§ã¨ã©ãªã«ã¬ãã®ã¯
ã°ã±ã²ã³ã´ãµã¶ã·ã¸ã¹ãºã»ã¼ã½ã¾ã¿ => 
ï½¸ï¾ï½¹ï½¹ï¾ï½ºï½ºï¾ï½»ï½»ï¾ï½¼ï½¼ï¾ï½½ï½½ï¾ï½¾ï½¾ï¾ï½¿ï½¿ï¾ï¾
ãããããããããããããããã => 
ï¾ï¾ï¾ï¾ï¾ï½¯ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾
ãããããããããããããããã => 
ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾
ã ã¡ã¢ã£ã¤ã¥ã¦ã§ã¨ã©ãªã«ã¬ãã®ã¯ => 
ï¾ï¾ï¾ï½¬ï¾ï½ï¾ï½®ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾
ã°ã±ã²ã³ã´ãµã¶ã·ã¸ã¹ãºã»ã¼ã½ã¾ => 
ï½²ï½´ï½¦ï¾ï½³ï¾ãµã¶ã·ã¸ã¹ãºï½¥ï½°ã½ã¾

ï½ ï½¡ï½¢ï½£ï½¤ï½¥ï½¦ï½§ï½¨ï½©ï½ªï½«ï½¬ï½ï½®ï½¯ => 
ï½ ããããã»ã²ã¡ã£ã¥ã§ã©ã£ã¥ã§ã
ï½°ï½±ï½²ï½³ï½´ï½µï½¶ï½·ï½¸ï½¹ï½ºï½»ï½¼ï½½ï½¾ï½¿ => 
ã¼ã¢ã¤ã¦ã¨ãªã«ãã¯ã±ã³ãµã·ã¹ã»ã½
ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ => 
ã¿ããããããããããããããã
ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ï¾ => 
ãã ã¡ã¢ã¤ã¦ã¨ã©ãªã«ã¬ãã¯ã³ãã

--CREDITS--
Jason Easter 
PHPUG WÃ¼rzburg 
Testfest 2009 2009-06-20

http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_decode_numericentity.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_decode_numericentity.phpt
+++ php-src/ext/mbstring/tests/mb_decode_numericentity.phpt
--TEST--
Test mb_decode_numericentity() function : Convert HTML-Entities to UTF-8
--SKIPIF--

--FILE--

--EXPECT--
Â¡Â¢Â£Â¤Â¥Â¦Â§Â¨Â©ÂªÂ«Â¬ÂÂ®Â¯Â°Â±Â²Â³Â´ÂµÂ¶Â·Â¸Â¹ÂºÂ»Â¼Â½Â¾Â¿ÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃ Ã¡Ã¢Ã£Ã¤Ã¥Ã¦Ã§Ã¨Ã©ÃªÃ«Ã¬ÃÃ®Ã¯Ã°Ã±Ã²Ã³Ã´ÃµÃ¶Ã·Ã¸Ã¹ÃºÃ»Ã¼Ã½Ã¾Ã¿
ÆÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ Î¡Î£Î¤Î¥Î¦Î§Î¨Î©Î±Î²Î³Î´ÎµÎ¶Î·Î¸Î¹ÎºÎ»Î¼Î½Î¾Î¿ÏÏÏÏÏÏÏÏÏÏÏÏÏâ¢â¦â²â³â¾âââââ¢âµââââââµâââââââââââââââââââââ â§â¨â©âªâ«â´â¼âââ â¡â¤â¥ââââââââ¥ââââââ©âªââ â£â¥â¦
aÅbÅcÅ dÅ¡eâ¬fg

http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_encode_numericentity.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_encode_numericentity.phpt
+++ php-src/ext/mbstring/tests/mb_encode_numericentity.phpt
--TEST--
Test mb_encode_numericentity() function : Convert UTF-8 to HTML-Entities
--SKIPIF--

--FILE--

--EXPECTF--
¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ
ƒΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρςστυφχψωϑϒϖ•…′″‾⁄℘ℑℜ™ℵ←↑→↓↔↵⇐⇑⇒⇓⇔∀∂∃∅∇∈∉∋∏∑−∗√∝∞∠∧∨∩∪∫∴∼≅≈≠≡≤≥⊂⊃⊄⊆⊇⊕⊗⊥⋅⌈⌉⌊⌋〈〉◊♠♣♥♦
aŒbœcŠdše€fg

http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg3.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_ereg3.phpt
+++ php-src/ext/mbstring/tests/mb_ereg3.phpt
--TEST--
mb_ereg() returning matches
--SKIPIF--

--FILE--

--EXPECTF-- 
int(-1)
int(-1)
array(1) {
  [0]=>
  string(2) "-1"
}
int(-1)
int(-1)
array(1) {
  [0]=>
  string(2) "-1"
}

Warning: mbereg_search_init() expects parameter 3 to be 
%binary_string_optional%, array given in %s on line %d
int(-1)
int(-1)
array(1) {
  [0]=>
  string(2) "-1"
}
Done

http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg4.phpt?view=markup&rev=1.1
Index: php

[PHP-CVS] cvs: php-src /ext/filter logical_filters.c /ext/filter/tests 016.phpt

2009-07-06 Thread Ilia Alshanetsky

iliaa   Tue Jul  7 00:44:26 2009 UTC

  Modified files:  
/php-src/ext/filter logical_filters.c 
/php-src/ext/filter/tests   016.phpt 
  Log:
  
  MFB: Fixed bug #48808 (FILTER_VALIDATE_EMAIL allows some invalid e-mail
  syntaxes)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.40&r2=1.41&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.40 
php-src/ext/filter/logical_filters.c:1.41
--- php-src/ext/filter/logical_filters.c:1.40   Sun Jul  5 16:08:15 2009
+++ php-src/ext/filter/logical_filters.cTue Jul  7 00:44:26 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: logical_filters.c,v 1.40 2009/07/05 16:08:15 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.41 2009/07/07 00:44:26 iliaa Exp $ */
 
 #include "php_filter.h"
 #include "filter_private.h"
@@ -476,7 +476,7 @@
 void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 {
/* From 
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
-   const char regexp[] = 
"/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z\\-]*))$/D";
+   const char regexp[] = 
"/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([A-Za-z0-9_][A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*(\\.[A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z]+))$/D";
 
pcre   *re = NULL;
pcre_extra *pcre_extra = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/016.phpt?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/filter/tests/016.phpt
diff -u php-src/ext/filter/tests/016.phpt:1.10 
php-src/ext/filter/tests/016.phpt:1.11
--- php-src/ext/filter/tests/016.phpt:1.10  Sun Jul  5 16:08:15 2009
+++ php-src/ext/filter/tests/016.phpt   Tue Jul  7 00:44:26 2009
@@ -15,7 +15,11 @@
 '[]()/@example.com',   
 'qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net',
 'e.x.a.m.p.l...@example.com',
-'firstname.lastn...@employee.2something.com'
+'firstname.lastn...@employee.2something.com',
+'-...@foo.com',
+'f...@-.com',
+'f...@bar.123',
+'f...@bar.-'
 );
 foreach ($values as $value) {
var_dump(filter_var($value, FILTER_VALIDATE_EMAIL));
@@ -35,4 +39,8 @@
 string(57) "qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net"
 string(26) "e.x.a.m.p.l...@example.com"
 string(42) "firstname.lastn...@employee.2something.com"
-Done
\ No newline at end of file
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+Done



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/filter logical_filters.c /ext/filter/tests 016.phpt

2009-07-06 Thread Ilia Alshanetsky

iliaa   Tue Jul  7 00:44:20 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/filter logical_filters.c 
/php-src/ext/filter/tests   016.phpt 
  Log:
  
  MFB: Fixed bug #48808 (FILTER_VALIDATE_EMAIL allows some invalid e-mail
  syntaxes)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.22.2.13&r2=1.1.2.22.2.14&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.22.2.13 
php-src/ext/filter/logical_filters.c:1.1.2.22.2.14
--- php-src/ext/filter/logical_filters.c:1.1.2.22.2.13  Sun Jul  5 16:08:05 2009
+++ php-src/ext/filter/logical_filters.cTue Jul  7 00:44:20 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: logical_filters.c,v 1.1.2.22.2.13 2009/07/05 16:08:05 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.22.2.14 2009/07/07 00:44:20 iliaa Exp $ */
 
 #include "php_filter.h"
 #include "filter_private.h"
@@ -472,7 +472,7 @@
 void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 {
/* From 
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
-   const char regexp[] = 
"/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z\\-]*))$/D";
+   const char regexp[] = 
"/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([A-Za-z0-9_][A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*(\\.[A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z]+))$/D";
 
pcre   *re = NULL;
pcre_extra *pcre_extra = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/016.phpt?r1=1.4.2.4.2.2&r2=1.4.2.4.2.3&diff_format=u
Index: php-src/ext/filter/tests/016.phpt
diff -u php-src/ext/filter/tests/016.phpt:1.4.2.4.2.2 
php-src/ext/filter/tests/016.phpt:1.4.2.4.2.3
--- php-src/ext/filter/tests/016.phpt:1.4.2.4.2.2   Sun Jul  5 16:08:05 2009
+++ php-src/ext/filter/tests/016.phpt   Tue Jul  7 00:44:20 2009
@@ -15,7 +15,11 @@
 '[]()/@example.com',   
 'qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net',
 'e.x.a.m.p.l...@example.com',
-'firstname.lastn...@employee.2something.com'
+'firstname.lastn...@employee.2something.com',
+'-...@foo.com',
+'f...@-.com',
+'f...@bar.123',
+'f...@bar.-'
 );
 foreach ($values as $value) {
var_dump(filter_var($value, FILTER_VALIDATE_EMAIL));
@@ -35,4 +39,8 @@
 string(57) "qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net"
 string(26) "e.x.a.m.p.l...@example.com"
 string(42) "firstname.lastn...@employee.2something.com"
-Done
\ No newline at end of file
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+Done



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter logical_filters.c /ext/filter/tests 016.phpt

2009-07-06 Thread Ilia Alshanetsky

iliaa   Tue Jul  7 00:44:07 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/filter logical_filters.c 
/php-src/ext/filter/tests   016.phpt 
  Log:
  
  Fixed bug #48808 (FILTER_VALIDATE_EMAIL allows some invalid e-mail syntaxes)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.35&r2=1.1.2.36&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.35 
php-src/ext/filter/logical_filters.c:1.1.2.36
--- php-src/ext/filter/logical_filters.c:1.1.2.35   Sun Jul  5 16:07:24 2009
+++ php-src/ext/filter/logical_filters.cTue Jul  7 00:44:07 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: logical_filters.c,v 1.1.2.35 2009/07/05 16:07:24 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.36 2009/07/07 00:44:07 iliaa Exp $ */
 
 #include "php_filter.h"
 #include "filter_private.h"
@@ -472,7 +472,7 @@
 void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 {
/* From 
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
-   const char regexp[] = 
"/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z\\-]*))$/D";
+   const char regexp[] = 
"/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([A-Za-z0-9_][A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*(\\.[A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z]+))$/D";
 
pcre   *re = NULL;
pcre_extra *pcre_extra = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/016.phpt?r1=1.4.2.6&r2=1.4.2.7&diff_format=u
Index: php-src/ext/filter/tests/016.phpt
diff -u php-src/ext/filter/tests/016.phpt:1.4.2.6 
php-src/ext/filter/tests/016.phpt:1.4.2.7
--- php-src/ext/filter/tests/016.phpt:1.4.2.6   Sun Jul  5 16:07:23 2009
+++ php-src/ext/filter/tests/016.phpt   Tue Jul  7 00:44:07 2009
@@ -15,7 +15,11 @@
 '[]()/@example.com',   
 'qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net',
 'e.x.a.m.p.l...@example.com',
-'firstname.lastn...@employee.2something.com'
+'firstname.lastn...@employee.2something.com',
+'-...@foo.com',
+'f...@-.com',
+'f...@bar.123',
+'f...@bar.-'
 );
 foreach ($values as $value) {
var_dump(filter_var($value, FILTER_VALIDATE_EMAIL));
@@ -35,4 +39,8 @@
 string(57) "qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net"
 string(26) "e.x.a.m.p.l...@example.com"
 string(42) "firstname.lastn...@employee.2something.com"
-Done
\ No newline at end of file
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+Done



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/idn idn.c

2009-07-06 Thread Stanislav Malyshev

stasMon Jul  6 23:48:27 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/intl/idn   idn.c 
  Log:
  fix protos
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/idn/idn.c?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/intl/idn/idn.c
diff -u php-src/ext/intl/idn/idn.c:1.1.2.2 php-src/ext/intl/idn/idn.c:1.1.2.3
--- php-src/ext/intl/idn/idn.c:1.1.2.2  Sun May 10 13:26:38 2009
+++ php-src/ext/intl/idn/idn.c  Mon Jul  6 23:48:27 2009
@@ -15,7 +15,7 @@
| Author: Pierre A. Joye   |
+--+
  */
-/* $Id: idn.c,v 1.1.2.2 2009/05/10 13:26:38 bjori Exp $ */
+/* $Id: idn.c,v 1.1.2.3 2009/07/06 23:48:27 stas Exp $ */
 
 /* {{{ includes */
 #ifdef HAVE_CONFIG_H
@@ -67,7 +67,7 @@
UChar converted[MAXPATHLEN];
int32_t   converted_ret_len;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", (char 
**)&domain, &domain_len, &option, &status) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", (char 
**)&domain, &domain_len, &option) == FAILURE) {
return;
}
 
@@ -121,8 +121,8 @@
RETURN_STRINGL(((char *)converted_utf8), converted_utf8_len, 0);
 }
 
-/* {{{ proto int idn_to_ascii(string domain[, int options [, int status]])
-   Converts a UTF-8 domain to ASCII, as defined in the IDNA RFC */
+/* {{{ proto int idn_to_ascii(string domain[, int options])
+   Converts an Unicode domain to ASCII representation, as defined in the IDNA 
RFC */
 PHP_FUNCTION(idn_to_ascii)
 {
php_intl_idn_to(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTL_IDN_TO_ASCII);
@@ -130,8 +130,8 @@
 /* }}} */
 
 
-/* {{{ proto int idn_to_utf8(string domain[, int options[, int status]])
-   Converts a UTF-8 domain to ASCII, as defined in the IDNA RFC */
+/* {{{ proto int idn_to_utf8(string domain[, int options])
+   Converts an ASCII representation of the domain to Unicode (UTF-8), as 
defined in the IDNA RFC */
 PHP_FUNCTION(idn_to_utf8)
 {
php_intl_idn_to(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTL_IDN_TO_UTF8);



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

[PHP-CVS] cvs: php-src /ext/intl/idn idn.c

2009-07-06 Thread Stanislav Malyshev

stasMon Jul  6 23:48:10 2009 UTC

  Modified files:  
/php-src/ext/intl/idn   idn.c 
  Log:
  fix args
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/idn/idn.c?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/intl/idn/idn.c
diff -u php-src/ext/intl/idn/idn.c:1.2 php-src/ext/intl/idn/idn.c:1.3
--- php-src/ext/intl/idn/idn.c:1.2  Mon Jul  6 23:44:16 2009
+++ php-src/ext/intl/idn/idn.c  Mon Jul  6 23:48:10 2009
@@ -15,7 +15,7 @@
| Author: Pierre A. Joye   |
+--+
  */
-/* $Id: idn.c,v 1.2 2009/07/06 23:44:16 stas Exp $ */
+/* $Id: idn.c,v 1.3 2009/07/06 23:48:10 stas Exp $ */
 
 /* {{{ includes */
 #ifdef HAVE_CONFIG_H
@@ -64,7 +64,7 @@
UChar converted[MAXPATHLEN];
int32_t   converted_ret_len;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "u|l", (char 
**)&domain, &domain_len, &option, &status) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "u|l", (char 
**)&domain, &domain_len, &option) == FAILURE) {
return;
}
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2009-07-06 Thread Pierre-Alain Joye

pajoye  Mon Jul  6 23:47:17 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  - forgot to add the author of the initial patch
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.665&r2=1.2027.2.547.2.965.2.666&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.665 
php-src/NEWS:1.2027.2.547.2.965.2.666
--- php-src/NEWS:1.2027.2.547.2.965.2.665   Mon Jul  6 23:38:03 2009
+++ php-src/NEWSMon Jul  6 23:47:16 2009
@@ -14,7 +14,8 @@
   components). (Ilia)
 - Fixed bug #48681 (openssl signature verification for tar archives broken).
   (Greg)
-- Fixed #48116 (Fixed build with Openssl 1.0). (Pierre)
+- Fixed #48116 (Fixed build with Openssl 1.0). (Pierre, 
+  Al dot Smith at aeschi dot ch dot eu dot org)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
 - Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo). 
   (Kalle, Rick Yorgason)



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

[PHP-CVS] cvs: php-src /ext/intl config.m4 config.w32 intl_error.c php_intl.c php_intl.h /ext/intl/idn idn.c idn.h /ext/intl/tests idn.phpt

2009-07-06 Thread Stanislav Malyshev

stasMon Jul  6 23:44:16 2009 UTC

  Modified files:  
/php-src/ext/intl   config.m4 config.w32 intl_error.c php_intl.c 
php_intl.h 
/php-src/ext/intl/idn   idn.c idn.h 
/php-src/ext/intl/tests idn.phpt 
  Log:
  - merge errors support
  - merge IDN
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/intl/config.m4?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/intl/config.m4
diff -u php-src/ext/intl/config.m4:1.3 php-src/ext/intl/config.m4:1.4
--- php-src/ext/intl/config.m4:1.3  Mon Jul 21 08:38:39 2008
+++ php-src/ext/intl/config.m4  Mon Jul  6 23:44:16 2009
@@ -45,7 +45,8 @@
 msgformat/msgformat_helpers.cpp \
 msgformat/msgformat_parse.c \
 grapheme/grapheme_string.c \
-grapheme/grapheme_util.c,$ext_shared,,$ICU_INCS)
+grapheme/grapheme_util.c \
+idn/idn.c,$ext_shared,,$ICU_INCS)
 
   PHP_ADD_BUILD_DIR([$ext_builddir/collator])
   PHP_ADD_BUILD_DIR([$ext_builddir/common])
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/config.w32?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/intl/config.w32
diff -u php-src/ext/intl/config.w32:1.2 php-src/ext/intl/config.w32:1.3
--- php-src/ext/intl/config.w32:1.2 Mon Jul  7 23:42:29 2008
+++ php-src/ext/intl/config.w32 Mon Jul  6 23:44:16 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2008/07/07 23:42:29 stas Exp $
+// $Id: config.w32,v 1.3 2009/07/06 23:44:16 stas Exp $
 // vim:ft=javascript
 
 ARG_ENABLE("intl", "Enable internationalization support", "no");
@@ -55,6 +55,9 @@
ADD_SOURCES(configure_module_dirname + "/grapheme", "\
grapheme_string.c grapheme_util.c  \
 ", "intl");
+   ADD_SOURCES(configure_module_dirname + "/idn", "\
+   idn.c  \
+", "intl");
ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib icule.lib 
iculx.lib");
// if int32_t and uint32_t types are made available in PHP, 
uncomment next line
// ADD_FLAG("CFLAGS_INTL", "/D U_HAVE_INT32_T /D 
U_HAVE_UINT32_T");
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_error.c?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/intl/intl_error.c
diff -u php-src/ext/intl/intl_error.c:1.5 php-src/ext/intl/intl_error.c:1.6
--- php-src/ext/intl/intl_error.c:1.5   Sun May 10 21:01:38 2009
+++ php-src/ext/intl/intl_error.c   Mon Jul  6 23:44:16 2009
@@ -103,6 +103,9 @@
if( !msg )
return;
 
+   if(!err && INTL_G(error_level)) {
+   php_error_docref(NULL TSRMLS_CC, INTL_G(error_level), "%s", 
msg);   
+   }
if( !err && !( err = intl_g_error_get( TSRMLS_C ) ) )
return;
 
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/php_intl.c?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/intl/php_intl.c
diff -u php-src/ext/intl/php_intl.c:1.9 php-src/ext/intl/php_intl.c:1.10
--- php-src/ext/intl/php_intl.c:1.9 Tue Mar 10 23:39:22 2009
+++ php-src/ext/intl/php_intl.c Mon Jul  6 23:44:16 2009
@@ -53,6 +53,9 @@
 #include "locale/locale.h"
 #include "locale/locale_class.h"
 #include "locale/locale_methods.h"
+
+#include "idn/idn.h"
+
 #include 
 #include "php_ini.h"
 
@@ -284,6 +287,18 @@
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_get_locale, 0, 0, 1)
ZEND_ARG_INFO(0, mf)
 ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_idn_to_ascii, 0, 0, 1)
+   ZEND_ARG_INFO(0, domain)
+   ZEND_ARG_INFO(0, option)
+   ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_idn_to_utf8, 0, 0, 1)
+   ZEND_ARG_INFO(0, domain)
+   ZEND_ARG_INFO(0, option)
+   ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
 /* }}} */
 
 /* {{{ intl_functions[]
@@ -329,9 +344,9 @@
PHP_FE( normalizer_is_normalized, normalizer_args )
 
/* Locale functions */
-   PHP_NAMED_FE( locale_get_default, zif_locale_get_default, locale_0_args)
+/* PHP_NAMED_FE( locale_get_default, zif_locale_get_default, locale_0_args)
PHP_NAMED_FE( locale_set_default, zif_locale_set_default, locale_1_arg )
-   PHP_FE( locale_get_primary_language, locale_1_arg )
+*/ PHP_FE( locale_get_primary_language, locale_1_arg )
PHP_FE( locale_get_script, locale_1_arg )
PHP_FE( locale_get_region, locale_1_arg )
PHP_FE( locale_get_keywords, locale_1_arg )
@@ -371,6 +386,11 @@
PHP_FE( grapheme_stristr, grapheme_strstr_args )
PHP_FE( grapheme_extract, grapheme_extract_args )
 
+   /* IDN functions */
+   PHP_FE(idn_to_ascii, arginfo_idn_to_ascii)
+   PHP_FALIAS(idn_to_utf8, idn_to_unicode, arginfo_idn_to_ascii)
+   PHP_FE(idn_to_unicode, arginfo_idn_to_ascii)
+
/* common functions */
PHP_FE( intl_get_error_code, intl_0_args )
PHP_FE( intl_get_error_message, intl_0_args )
@@ -384,7 +404,7 @@
 /* {{{ INI Settings */
 PHP_INI_BEGIN()
 STD_PHP_INI_ENTRY(LOCALE_INI_NAME,

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2009-07-06 Thread Pierre-Alain Joye

pajoye  Mon Jul  6 23:38:03 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  - #48116
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.664&r2=1.2027.2.547.2.965.2.665&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.664 
php-src/NEWS:1.2027.2.547.2.965.2.665
--- php-src/NEWS:1.2027.2.547.2.965.2.664   Mon Jul  6 17:48:02 2009
+++ php-src/NEWSMon Jul  6 23:38:03 2009
@@ -14,6 +14,7 @@
   components). (Ilia)
 - Fixed bug #48681 (openssl signature verification for tar archives broken).
   (Greg)
+- Fixed #48116 (Fixed build with Openssl 1.0). (Pierre)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
 - Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo). 
   (Kalle, Rick Yorgason)



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

[PHP-CVS] cvs: php-src /ext/openssl openssl.c

2009-07-06 Thread Pierre-Alain Joye

pajoye  Mon Jul  6 23:36:56 2009 UTC

  Modified files:  
/php-src/ext/opensslopenssl.c 
  Log:
  - #48116, fix build with openssl 1.0
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.181&r2=1.182&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.181 php-src/ext/openssl/openssl.c:1.182
--- php-src/ext/openssl/openssl.c:1.181 Mon Apr 20 09:43:45 2009
+++ php-src/ext/openssl/openssl.c   Mon Jul  6 23:36:56 2009
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: openssl.c,v 1.181 2009/04/20 09:43:45 mkoppanen Exp $ */
+/* $Id: openssl.c,v 1.182 2009/07/06 23:36:56 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -484,8 +484,13 @@
 static char default_ssl_conf_filename[MAXPATHLEN];
 
 struct php_x509_request { /* {{{ */
-   LHASH * global_config;  /* Global SSL config */
-   LHASH * req_config; /* SSL config for this request */
+#if OPENSSL_VERSION_NUMBER >= 0x1002L
+   LHASH_OF(CONF_VALUE) * global_config;   /* Global SSL config */
+   LHASH_OF(CONF_VALUE) * req_config;  /* SSL config for this 
request */
+#else
+   LHASH * global_config;  /* Global SSL config */
+   LHASH * req_config; /* SSL config for this request */
+#endif
const EVP_MD * md_alg;
const EVP_MD * digest;
char* section_name,
@@ -674,7 +679,11 @@
 }
 /* }}} */
 
+#if OPENSSL_VERSION_NUMBER >= 0x1002L
+static inline int php_openssl_config_check_syntax(const char * section_label, 
const char * config_filename, const char * section, LHASH_OF(CONF_VALUE) * 
config TSRMLS_DC) /* {{{ */
+#else
 static inline int php_openssl_config_check_syntax(const char * section_label, 
const char * config_filename, const char * section, LHASH * config TSRMLS_DC) 
/* {{{ */
+#endif
 {
X509V3_CTX ctx;

@@ -1177,8 +1186,7 @@
if (in == NULL) {
return NULL;
}
-
-   cert = (X509 *) PEM_ASN1_read_bio((char *(*)())d2i_X509, 
PEM_STRING_X509, in, NULL, NULL, NULL);
+   cert = (X509 *) PEM_ASN1_read_bio((d2i_of_void *)d2i_X509, 
PEM_STRING_X509, in, NULL, NULL, NULL);
BIO_free(in);
}
if (cert && makeresource && resourceval) {
@@ -2931,8 +2939,7 @@
case EVP_PKEY_RSA:
case EVP_PKEY_RSA2:
assert(pkey->pkey.rsa != NULL);
-
-   if (NULL == pkey->pkey.rsa->p || NULL == 
pkey->pkey.rsa->q) {
+   if (pkey->pkey.rsa != NULL && (NULL == 
pkey->pkey.rsa->p || NULL == pkey->pkey.rsa->q)) {
return 0;
}
break;



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/tests idn.phpt

2009-07-06 Thread Stanislav Malyshev

stasMon Jul  6 23:28:16 2009 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/intl/tests idn.phpt 
  Log:
  add test
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/tests/idn.phpt?view=markup&rev=1.1
Index: php-src/ext/intl/tests/idn.phpt
+++ php-src/ext/intl/tests/idn.phpt



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl openssl.c

2009-07-06 Thread Pierre-Alain Joye

pajoye  Mon Jul  6 23:26:23 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/opensslopenssl.c 
  Log:
  - #48116, restore 0.x compability, thx config.cache.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.30&r2=1.98.2.5.2.41.2.31&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.30 
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.31
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.30Mon Jul  6 23:02:18 2009
+++ php-src/ext/openssl/openssl.c   Mon Jul  6 23:26:23 2009
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.30 2009/07/06 23:02:18 pajoye Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.31 2009/07/06 23:26:23 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -502,8 +502,13 @@
 static char default_ssl_conf_filename[MAXPATHLEN];
 
 struct php_x509_request { /* {{{ */
+#if OPENSSL_VERSION_NUMBER >= 0x1002L
LHASH_OF(CONF_VALUE) * global_config;   /* Global SSL config */
LHASH_OF(CONF_VALUE) * req_config;  /* SSL config for this 
request */
+#else
+   LHASH * global_config;  /* Global SSL config */
+   LHASH * req_config; /* SSL config for this request */
+#endif
const EVP_MD * md_alg;
const EVP_MD * digest;
char* section_name,
@@ -680,7 +685,11 @@
 }
 /* }}} */
 
-static inline int php_openssl_config_check_syntax(const char * section_label, 
const char * config_filename,const char * section, LHASH_OF(CONF_VALUE) * 
config TSRMLS_DC) /* {{{ */
+#if OPENSSL_VERSION_NUMBER >= 0x1002L
+static inline int php_openssl_config_check_syntax(const char * section_label, 
const char * config_filename, const char * section, LHASH_OF(CONF_VALUE) * 
config TSRMLS_DC) /* {{{ */
+#else
+static inline int php_openssl_config_check_syntax(const char * section_label, 
const char * config_filename, const char * section, LHASH * config TSRMLS_DC) 
/* {{{ */
+#endif
 {
X509V3_CTX ctx;




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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl openssl.c

2009-07-06 Thread Pierre-Alain Joye

pajoye  Mon Jul  6 23:02:19 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/opensslopenssl.c 
  Log:
  - #48116, fix build against openssl 1.0
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.29&r2=1.98.2.5.2.41.2.30&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.29 
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.30
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.29Mon Apr 20 09:44:29 2009
+++ php-src/ext/openssl/openssl.c   Mon Jul  6 23:02:18 2009
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.29 2009/04/20 09:44:29 mkoppanen Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.30 2009/07/06 23:02:18 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -502,8 +502,8 @@
 static char default_ssl_conf_filename[MAXPATHLEN];
 
 struct php_x509_request { /* {{{ */
-   LHASH * global_config;  /* Global SSL config */
-   LHASH * req_config; /* SSL config for this request */
+   LHASH_OF(CONF_VALUE) * global_config;   /* Global SSL config */
+   LHASH_OF(CONF_VALUE) * req_config;  /* SSL config for this 
request */
const EVP_MD * md_alg;
const EVP_MD * digest;
char* section_name,
@@ -680,7 +680,7 @@
 }
 /* }}} */
 
-static inline int php_openssl_config_check_syntax(const char * section_label, 
const char * config_filename,const char * section, LHASH * config 
TSRMLS_DC) /* {{{ */
+static inline int php_openssl_config_check_syntax(const char * section_label, 
const char * config_filename,const char * section, LHASH_OF(CONF_VALUE) * 
config TSRMLS_DC) /* {{{ */
 {
X509V3_CTX ctx;

@@ -1158,7 +1158,7 @@
if (in == NULL) {
return NULL;
}
-   cert = (X509 *) PEM_ASN1_read_bio((char *(*)())d2i_X509, 
PEM_STRING_X509, in, NULL, NULL, NULL);
+   cert = (X509 *) PEM_ASN1_read_bio((d2i_of_void *)d2i_X509, 
PEM_STRING_X509, in, NULL, NULL, NULL);
BIO_free(in);
}
 
@@ -2787,8 +2787,7 @@
case EVP_PKEY_RSA:
case EVP_PKEY_RSA2:
assert(pkey->pkey.rsa != NULL);
-
-   if (NULL == pkey->pkey.rsa->p || NULL == 
pkey->pkey.rsa->q) {
+   if (pkey->pkey.rsa != NULL && (NULL == 
pkey->pkey.rsa->p || NULL == pkey->pkey.rsa->q)) {
return 0;
}
break;



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

[PHP-CVS] cvs: phpruntests /QA/tests quicktester.inc /QA/tests/lang 015.inc 016.inc 023-1.inc 023-2.inc bug24054.phpt bug38579.inc inc.inc inc_throw.inc /QA/tests/output ob_011.diff ob_011.exp ob_01

2009-07-06 Thread Zoe Slattery

zoe Mon Jul  6 21:02:48 2009 UTC

  Added files: 
/phpruntests/QA/tests/lang  015.inc 023-1.inc bug38579.inc inc.inc 
inc_throw.inc 016.inc 023-2.inc 
/phpruntests/QA/tests/security  open_basedir.inc 
/phpruntests/QA/tests/outputob_011.out ob_011.php ob_011.exp 
ob_011.diff 
/phpruntests/QA/tests   quicktester.inc 

  Modified files:  
/phpruntests/QA/tests/lang  bug24054.phpt 
  Log:
  building test suite
  http://cvs.php.net/viewvc.cgi/phpruntests/QA/tests/lang/bug24054.phpt?r1=1.1&r2=1.2&diff_format=u
Index: phpruntests/QA/tests/lang/bug24054.phpt
diff -u phpruntests/QA/tests/lang/bug24054.phpt:1.1 
phpruntests/QA/tests/lang/bug24054.phpt:1.2
--- phpruntests/QA/tests/lang/bug24054.phpt:1.1 Mon Jul  6 20:04:53 2009
+++ phpruntests/QA/tests/lang/bug24054.phpt Mon Jul  6 21:02:47 2009
@@ -1,7 +1,7 @@
 --TEST--
 Bug #24054 (Assignment operator *= broken)
 --FILE--
-http://cvs.php.net/viewvc.cgi/phpruntests/QA/tests/lang/015.inc?view=markup&rev=1.1
Index: phpruntests/QA/tests/lang/015.inc
+++ phpruntests/QA/tests/lang/015.inc


http://cvs.php.net/viewvc.cgi/phpruntests/QA/tests/lang/023-1.inc?view=markup&rev=1.1
Index: phpruntests/QA/tests/lang/023-1.inc
+++ phpruntests/QA/tests/lang/023-1.inc




*** Testing assignments and variable aliasing: ***

This should read "blah": \n"; ?>
This should read "this is nifty": \n"; ?>
*

*** Testing integer operators ***

Correct result - 8:  
Correct result - 8:  
Correct result - 2:  
Correct result - -2:  
Correct result - 15:  
Correct result - 15:  
Correct result - 2:  
Correct result - 3:  
*

*** Testing real operators ***

Correct result - 8:  
Correct result - 8:  
Correct result - 2:  
Correct result - -2:  
Correct result - 15:  
Correct result - 15:  
Correct result - 2:  
Correct result - 3:  
*

*** Testing if/elseif/else control ***

\n";
} elseif ($a == "5") {
echo "This "." works\n";
$a = 6;
if ("andi" == ($test = "andi")) {
echo "this_still_works\n";
} elseif (1) {
echo "should_not_print\n";
} else {
echo "should_not_print\n";
}
if (44 == 43) {
echo "should_not_print\n";
} else {
echo "should_print\n";
}
} elseif ($a == 6) {
echo "this "."broken\n";
if (0) {
echo "this_should_not_print\n";
} else {
echo "TestingDanglingElse_This_Should_not_print\n";
}
} else {
echo "This "."does "." not"." work\n";
}
?>


*** Seriously nested if's test ***
** spelling correction by kluzz **
\n";
if (0) { /* this code is not supposed to be executed */
  echo "hmm, this shouldn't be displayed #1\n";
  $j++;
  if (1) {
$i 
+=
 $j;
if (0) {
  $j = ++$i;
  if (1) {
$j *= $i;
echo "damn, this shouldn't be displayed\n";
  } else {
$j /= $i;
++$j;
echo "this shouldn't be displayed either\n";
  }
} elseif (1) {
  $i++; $j++;
  echo "this isn't supposed to be displayed\n";
}
  } elseif (0) {
$i++;
echo "this definitely shouldn't be displayed\n";
  } else {
--$j;
echo "and this too shouldn't be displayed\n";
while ($j>0) {
  $j--;
}
  }
} elseif (2-2) {  /* as long as 2-2==0, this isn't supposed to be executed 
either */
  $i = ++$j;
  echo "hmm, this shouldn't be displayed #2\n";
  if (1) { 
$j = ++$i;
if (0) {
  $j = $i*2+$j*($i++);
  if (1) {
$i++;
echo "damn, this shouldn't be displayed\n";
  } else {
$j++;
echo "this shouldn't be displayed either\n";
  }
} else if (1) {
  ++$j;
  echo "this isn't supposed to be displayed\n";
}
  } elseif (0) {
$j++;
echo "this definitely shouldn't be displayed\n";
  } else {
$i++;
echo "and this too shouldn't be displayed\n";
  }
} else {
  $j=$i++;  /* this should set $i to 1, but shouldn't change $j (it's assigned 
$i's previous values, zero) */
  echo "this should be displayed. should be:  \$i=1, \$j=0.  is:  \$i=$i, 
\$j=$j\n";
  if (1) {
$j += ++$i;  /* ++$i --> $i==2,  $j += 2 --> $j==2 */
if (0) {
  $j += 40;
  if (1) {
$i += 50;
echo "damn, this shouldn't be displayed\n";
  } else {
$j += 20;
echo "this shouldn't be displayed either\n";
  }
} else if (1) {
  $j *= $i;  /* $j *= 2  --> $j == 4 */
  echo "this is supposed to be displayed. should be:  \$i=2, \$j=4.  is:  
\$i=$i, \$j=$j\n";
  echo "3 loop iterations should follow:\n";
  while ($i<=$j) {
echo $i++." $j\n";
  }
}
  } elseif (0) {
echo "this definitely shouldn't be displayed\n";
  } else {
echo "and this

[PHP-CVS] cvs: phpruntests /QA/tests/classes autoload_derived.p5c autoload_implements.p5c autoload_interface.p5c autoload_root.p5c constants_basic_003.inc interface_optional_arg_003.inc

2009-07-06 Thread Zoe Slattery

zoe Mon Jul  6 21:01:53 2009 UTC

  Added files: 
/phpruntests/QA/tests/classes   autoload_interface.p5c 
interface_optional_arg_003.inc 
autoload_implements.p5c 
autoload_root.p5c 
constants_basic_003.inc 
autoload_derived.p5c 
  Log:
  building test suite
  

http://cvs.php.net/viewvc.cgi/phpruntests/QA/tests/classes/autoload_interface.p5c?view=markup&rev=1.1
Index: phpruntests/QA/tests/classes/autoload_interface.p5c
+++ phpruntests/QA/tests/classes/autoload_interface.p5c

http://cvs.php.net/viewvc.cgi/phpruntests/QA/tests/classes/interface_optional_arg_003.inc?view=markup&rev=1.1
Index: phpruntests/QA/tests/classes/interface_optional_arg_003.inc
+++ phpruntests/QA/tests/classes/interface_optional_arg_003.inc
http://cvs.php.net/viewvc.cgi/phpruntests/QA/tests/classes/autoload_implements.p5c?view=markup&rev=1.1
Index: phpruntests/QA/tests/classes/autoload_implements.p5c
+++ phpruntests/QA/tests/classes/autoload_implements.p5c

http://cvs.php.net/viewvc.cgi/phpruntests/QA/tests/classes/autoload_root.p5c?view=markup&rev=1.1
Index: phpruntests/QA/tests/classes/autoload_root.p5c
+++ phpruntests/QA/tests/classes/autoload_root.p5c

http://cvs.php.net/viewvc.cgi/phpruntests/QA/tests/classes/constants_basic_003.inc?view=markup&rev=1.1
Index: phpruntests/QA/tests/classes/constants_basic_003.inc
+++ phpruntests/QA/tests/classes/constants_basic_003.inc

http://cvs.php.net/viewvc.cgi/phpruntests/QA/tests/classes/autoload_derived.p5c?view=markup&rev=1.1
Index: phpruntests/QA/tests/classes/autoload_derived.p5c
+++ phpruntests/QA/tests/classes/autoload_derived.p5c



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

[PHP-CVS] cvs: phpruntests /QA/sapi/cli/tests 001.phpt 002-win32.phpt 002.phpt 003-2.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010-2.phpt 010.phpt 011.phpt 012.phpt 013.phpt

2009-07-06 Thread Zoe Slattery

zoe Mon Jul  6 21:01:02 2009 UTC

  Added files: 
/phpruntests/QA/sapi/cli/tests  002-win32.phpt skipif.inc 009.phpt 
003-2.phpt 019.phpt 007.phpt 
017.phpt 005.phpt 015.phpt 003.phpt 
013.phpt 001.phpt 011.phpt 021.phpt 
bug44564.phpt 008.phpt 018.phpt 
022.inc 006.phpt 016.phpt 010-2.phpt 
004.phpt 014.phpt 002.phpt 012.phpt 
022.phpt 010.phpt 020.phpt 
  Log:
  building test suite
  
http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cli/tests/002-win32.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cli/tests/002-win32.phpt
+++ phpruntests/QA/sapi/cli/tests/002-win32.phpt
--TEST--
running code with -r
--SKIPIF--

--FILE--

--EXPECTF-- 
string(18) "string(5) "hello"
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cli/tests/skipif.inc?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cli/tests/skipif.inc
+++ phpruntests/QA/sapi/cli/tests/skipif.inc


http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cli/tests/009.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cli/tests/009.phpt
+++ phpruntests/QA/sapi/cli/tests/009.phpt
--TEST--
using invalid combinations of cmdline options
--SKIPIF--

--FILE--

--EXPECTF-- 
Either execute direct code, process stdin or use a file.
NULL
Either execute direct code, process stdin or use a file.
NULL
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cli/tests/003-2.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cli/tests/003-2.phpt
+++ phpruntests/QA/sapi/cli/tests/003-2.phpt
--TEST--
defining INI options with -d (as 2nd arg)
--SKIPIF--

--FILE--

===DONE===
--EXPECTF-- 
string(16) "string(3) "111"
"
string(16) "string(3) "500"
"
===DONE===

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cli/tests/019.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cli/tests/019.phpt
+++ phpruntests/QA/sapi/cli/tests/019.phpt
--TEST--
CLI php -i 
--SKIPIF--

--FILE--

--EXPECTF-- 
phpinfo()
PHP Version => %s
%a
PHP License
This program is free software; you can redistribute it and/or modify
it under the terms of the PHP License as published by the PHP Group
and included in the distribution in the file:  LICENSE

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

If you did not receive a copy of the PHP license, or have any
questions about PHP licensing, please contact lice...@php.net.

Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cli/tests/007.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cli/tests/007.phpt
+++ phpruntests/QA/sapi/cli/tests/007.phpt
--TEST--
strip comments and whitespace with -w
--SKIPIF--

--FILE--

';

file_put_contents($filename, $code);

var_dump(`$php -n -w "$filename"`);
var_dump(`$php -n -w "wrong"`);
var_dump(`echo "" | $php -n -w`);

@unlink($filename);

echo "Done\n";
?>
--EXPECTF-- 
string(81) "

"
Could not open input file: wrong
NULL
string(43) "
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cli/tests/017.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cli/tests/017.phpt
+++ phpruntests/QA/sapi/cli/tests/017.phpt
--TEST--
CLI -a and libedit 
--SKIPIF--

--FILE--
 $code) {
echo "\n--\nSnippet no. $key:\n--\n";
$code = escapeshellarg($code);
echo `echo $code | "$php" -a`, "\n";
}

echo "\nDone\n";
?>
--EXPECTF--
--
Snippet no. 1:
--
Interactive shell

Hello world


--
Snippet no. 2:
--
Interactive shell

multine
single
quote


--
Snippet no. 3:
--
Interactive shell

Here
comes
the
doc


--
Snippet no. 4:
--
Interactive shell

Done


--
Snippet no. 5:
--
Interactive shell


Parse error: syntax error, unexpected ')' in php shell code on line 1


Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cli/tests/005.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cli/tests/005.phpt
+++ phpruntests/QA/sapi/cli/tests/005.phpt
--TEST--
show information about class
--SKIPIF--

--FILE--

--EXPECTF-- 
string(40) "Exception: Class unknown does not exist
"
string(183) "Class [  class stdClass ] {

  - Constants [0] {
  }

  - Static properties [0] {
  }

  - Static methods [0] {
  }

  - Properties [0] {
  }

  - Methods [0] {
  }
}

"
string(1355) "Class [  class Exception ] {

  - Constants [0] {
  }

  - Static properties [0] {
  }

  - Static methods [0] {
  }

  - Properties [7] {
Property [  protected $message ]
Property [  private $string ]
Property [  protected $code ]
Property [  protected $file ]
Property [  protected $line ]
Property [  private $t

[PHP-CVS] cvs: phpruntests /QA/sapi/cgi/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.diff 006.exp 006.out 006.php 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt include.inc skipif.inc

2009-07-06 Thread Zoe Slattery

zoe Mon Jul  6 21:00:37 2009 UTC

  Added files: 
/phpruntests/QA/sapi/cgi/tests  009.phpt 008.phpt 007.phpt 006.out 
006.phpt 005.phpt include.inc 
004.phpt 003.phpt 002.phpt 001.phpt 
011.phpt 010.phpt 006.diff 006.php 
006.exp skipif.inc 
  Log:
  compare test failures
  
http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/009.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/009.phpt
+++ phpruntests/QA/sapi/cgi/tests/009.phpt
--TEST--
path info request without exported PATH_INFO
--SKIPIF--

--FILE--
');

echo (`$php -n $f`);

echo "Done\n";

@unlink($f);
?>
--EXPECTF--
X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

string(%d) "%s/x"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/008.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/008.phpt
+++ phpruntests/QA/sapi/cgi/tests/008.phpt
--TEST--
syntax highlighting
--SKIPIF--

--FILE--

';

file_put_contents($filename, $code);

var_dump(`"$php" -n -s "$filename"`);
var_dump(`"$php" -n -s "unknown"`);

@unlink($filename);

echo "Done\n";
?>
--EXPECTF-- 
string(%d) "X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r


$o = new teststyle="color: #007700">;?>/>

"
string(%d) "Status: 404 Not Found
X-Powered-By: PHP/%s
Content-type: text/html%r; charset=.*|%r

No input file specified.
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/007.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/007.phpt
+++ phpruntests/QA/sapi/cgi/tests/007.phpt
--TEST--
invalid arguments and error messages
--SKIPIF--

--FILE--

===DONE===
--EXPECTF-- 
string(25) "No input file specified.
"
string(31) "No syntax errors detected in -
"
===DONE===

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/006.out?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/006.out
+++ phpruntests/QA/sapi/cgi/tests/006.out
string(82) "No syntax errors detected in 
/mnt/workspace/php53_tmp/sapi/cgi/tests/006.test.php
"
string(25) "No input file specified.
"
string(438) "

( ! 
) Parse error: syntax error, unexpected T_PRIVATE, expecting '{' in 
/mnt/workspace/php53_tmp/sapi/cgi/tests/006.test.php on line 5
Errors parsing /mnt/workspace/php53_tmp/sapi/cgi/tests/006.test.php
"
Done
http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/006.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/006.phpt
+++ phpruntests/QA/sapi/cgi/tests/006.phpt
--TEST--
syntax check
--SKIPIF--

--FILE--

';

file_put_contents($filename, $code);

var_dump(`"$php" -n -l "$filename"`);
var_dump(`"$php" -n -l some.unknown`);

$code = '

';

file_put_contents($filename, $code);

var_dump(`"$php" -l "$filename" 2>/dev/null`);

@unlink($filename);

echo "Done\n";
?>
--EXPECTF-- 
string(%d) "No syntax errors detected in %s006.test.php
"
string(%d) "No input file specified.
"
string(%d) "
Parse error: %s expecting %s{%s in %s006.test.php on line 
5
Errors parsing %s006.test.php
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/005.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/005.phpt
+++ phpruntests/QA/sapi/cgi/tests/005.phpt
--TEST--
using invalid combinations of cmdline options
--SKIPIF--

--FILE--

--EXPECTF-- 
string(51) "No input file specified.
Interactive mode enabled

"
string(51) "No input file specified.
Interactive mode enabled

"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/include.inc?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/include.inc
+++ phpruntests/QA/sapi/cgi/tests/include.inc


http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/004.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/004.phpt
+++ phpruntests/QA/sapi/cgi/tests/004.phpt
--TEST--
execute a file with -f
--SKIPIF--

--FILE--

';

file_put_contents($filename, $code);

var_dump(`$php -n -f "$filename" 2>/dev/null`);
var_dump(`$php -n -f "wrong"`);

@unlink($filename);

echo "Done\n";
?>
--EXPECTF-- 
string(%d) "

Fatal error:  Cannot access private property test::$pri in 
%s004.test.php on line 8
"
string(25) "No input file specified.
"
Done

http://cvs.php.net/viewvc.cgi/phpruntests/QA/sapi/cgi/tests/003.phpt?view=markup&rev=1.1
Index: phpruntests/QA/sapi/cgi/tests/003.phpt
+++ phpruntests/QA/sapi/cgi/tests/003.phpt
--TEST--
strip comments and whitespace with -w
--SKIPIF--

--FILE--

';

file_put_contents($filename, $code);

var_dump(`$php -n -w "$filename"`);
var_dump(`$php -n -w "wrong"`);
var_dump(`echo "" | $php -n -w`);

@unlink($filename);

echo "Done\n";
?>
--EXPECTF-- 
string(%d) "X-Powered-By: PHP/%s
Content-type: t

[PHP-CVS] cvs: phpruntests /QA/results fail_compare.php

2009-07-06 Thread Zoe Slattery

zoe Mon Jul  6 21:00:04 2009 UTC

  Added files: 
/phpruntests/QA/results fail_compare.php 
  Log:
  compare test failures
  

http://cvs.php.net/viewvc.cgi/phpruntests/QA/results/fail_compare.php?view=markup&rev=1.1
Index: phpruntests/QA/results/fail_compare.php
+++ phpruntests/QA/results/fail_compare.php
 $nmy tests fail in phpruntests and do not fail in run-tests\n";

foreach($fail_only_my as $fail) {
echo "$fail \n";
}

$fail_only_rt = array_diff($rtfails, $myfails);
$nrt = count ($fail_only_rt);

echo "\n => $nrt tests fail in run-tests and do not fail in phpruntests\n";

foreach($fail_only_rt as $fail) {
echo "$fail\n";
}
?>



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

[PHP-CVS] cvs: phpruntests /QA/ext/spl/examples/tests dualiterator_001.phpt examples.inc

2009-07-06 Thread Zoe Slattery

zoe Mon Jul  6 20:47:23 2009 UTC

  Added files: 
/phpruntests/QA/ext/spl/examples/tests  examples.inc 
dualiterator_001.phpt 
  Log:
  building test suite
  

http://cvs.php.net/viewvc.cgi/phpruntests/QA/ext/spl/examples/tests/examples.inc?view=markup&rev=1.1
Index: phpruntests/QA/ext/spl/examples/tests/examples.inc
+++ phpruntests/QA/ext/spl/examples/tests/examples.inc
append($path . '/' . strtolower($c) . '.inc');
}
}
}

$classes = array(
);

foreach (new IncludeFiles(dirname(__FILE__). '/..', $classes) as $file)
{
require_once($file);
}

?>
http://cvs.php.net/viewvc.cgi/phpruntests/QA/ext/spl/examples/tests/dualiterator_001.phpt?view=markup&rev=1.1
Index: phpruntests/QA/ext/spl/examples/tests/dualiterator_001.phpt
+++ phpruntests/QA/ext/spl/examples/tests/dualiterator_001.phpt
--TEST--
SPL: DualIterator
--SKIPIF--

--FILE--

===DONE===

--EXPECT--
bool(true)
bool(false)
bool(true)
bool(false)
bool(false)
bool(false)
bool(true)
bool(false)
bool(true)
bool(false)
===DONE===



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

[PHP-CVS] cvs: phpruntests /QA/ext/spl/examples autoload.inc cachingrecursiveiterator.inc callbackfilteriterator.inc dbaarray.inc dbareader.inc directoryfilterdots.inc directorygraphiterator.inc direc

2009-07-06 Thread Zoe Slattery

zoe Mon Jul  6 20:45:03 2009 UTC

  Added files: 
/phpruntests/QA/ext/spl/examplesdirectorytreeiterator.inc 
regexfindfile.inc 
recursivedualiterator.inc 
dualiterator.inc 
callbackfilteriterator.inc 
directorygraphiterator.inc 
dbareader.inc autoload.inc 
findfile.inc searchiterator.inc 
dbaarray.inc directorytree.inc 
recursivecomparedualiterator.inc 
directoryfilterdots.inc 
cachingrecursiveiterator.inc 
keyfilter.inc inigroups.inc 
  Log:
  building test suite
  
http://cvs.php.net/viewvc.cgi/phpruntests/QA/ext/spl/examples/directorytreeiterator.inc?view=markup&rev=1.1
Index: phpruntests/QA/ext/spl/examples/directorytreeiterator.inc
+++ phpruntests/QA/ext/spl/examples/directorytreeiterator.inc
getDepth(); $l++) {
$tree .= $this->getSubIterator($l)->hasNext() ? '| ' : 
'  ';
}
return $tree . ($this->getSubIterator($l)->hasNext() ? '|-' : 
'\-') 
   . $this->getSubIterator($l)->__toString();
}

/** Aggregates the inner iterator
 */ 
function __call($func, $params)
{
return call_user_func_array(array($this->getSubIterator(), 
$func), $params);
}
}

?>
http://cvs.php.net/viewvc.cgi/phpruntests/QA/ext/spl/examples/regexfindfile.inc?view=markup&rev=1.1
Index: phpruntests/QA/ext/spl/examples/regexfindfile.inc
+++ phpruntests/QA/ext/spl/examples/regexfindfile.inc
getSearch(), $this->current());
}
}

?>
http://cvs.php.net/viewvc.cgi/phpruntests/QA/ext/spl/examples/recursivedualiterator.inc?view=markup&rev=1.1
Index: phpruntests/QA/ext/spl/examples/recursivedualiterator.inc
+++ phpruntests/QA/ext/spl/examples/recursivedualiterator.inc
getLHS()->hasChildren() && 
$this->getRHS()->hasChildren();
}

/** @return new RecursiveDualIterator (late binding) for the two inner 
 * iterators current children.
 */
function getChildren()
{
if (empty($this->ref))
{
$this->ref = new ReflectionClass($this);
}
return $this->ref->newInstance(
$this->getLHS()->getChildren(), 
$this->getRHS()->getChildren(), $this->getFlags());
}

/** @return whether both inner iterators are valid, have same 
hasChildren()
 * state and identical current and key values or both are non valid.
 */
function areIdentical()
{
return $this->getLHS()->hasChildren() === 
$this->getRHS()->hasChildren()
&& parent::areIdentical();
}

/** @return whether both inner iterators are valid, have same 
hasChildren()
 * state and equal current and key values or both are invalid.
 */
function areEqual()
{
return $this->getLHS()->hasChildren() === 
$this->getRHS()->hasChildren()
&& parent::areEqual();
}
}

?>

http://cvs.php.net/viewvc.cgi/phpruntests/QA/ext/spl/examples/dualiterator.inc?view=markup&rev=1.1
Index: phpruntests/QA/ext/spl/examples/dualiterator.inc
+++ phpruntests/QA/ext/spl/examples/dualiterator.inc
lhs   = $lhs;
$this->rhs   = $rhs;
$this->flags = $flags;
}

/** @return Left Hand Side Iterator
 */
function getLHS()
{
return $this->lhs;
}

/** @return Right Hand Side Iterator
 */
function getRHS()
{
return $this->rhs;
}

/** @param flags new flags
 */
function setFlags($flags)
{
$this->flags = $flags;
}

/** @return current flags
 */
function getFlags()
{
return $this->flags;
}

/** rewind both inner iterators
 */ 
function rewind()
{
$this->lhs->rewind();
$this->rhs->rewind();   
}

/** @return whether both inner iterators are valid
 */ 
function valid()
{
return $this->lhs->valid() && $this->rhs->valid();  
}

/** @return current value depending on CURRENT_* flags
 */ 
function current()
{
switch($this->flags & 0x0F)
{
default:
case self::CURRE

[PHP-CVS] cvs: phpruntests /src/configuration rtCommandLineOptions.php /src/testcase rtTestOutputWriter.php /src/testrun rtPhpTestRun.php

2009-07-06 Thread Georg Gradwohl

g2  Mon Jul  6 20:35:54 2009 UTC

  Modified files:  
/phpruntests/src/configuration  rtCommandLineOptions.php 
/phpruntests/src/testrunrtPhpTestRun.php 
/phpruntests/src/testcase   rtTestOutputWriter.php 
  Log:
  phpruntests - update outputWriter, adjusted command-line-arguments
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtCommandLineOptions.php?r1=1.8&r2=1.9&diff_format=u
Index: phpruntests/src/configuration/rtCommandLineOptions.php
diff -u phpruntests/src/configuration/rtCommandLineOptions.php:1.8 
phpruntests/src/configuration/rtCommandLineOptions.php:1.9
--- phpruntests/src/configuration/rtCommandLineOptions.php:1.8  Sun Jul  5 
20:51:16 2009
+++ phpruntests/src/configuration/rtCommandLineOptions.php  Mon Jul  6 
20:35:53 2009
@@ -23,7 +23,7 @@
 'm',
 'q',
 'x',
-'v',
+'v', // verbose-mode level 1
 'h',
 );
 
@@ -38,17 +38,17 @@
 'c',
 'd',
 'p',
-'s',
-'o',  //new for output type (list, xml, csv...)
-   'z',  //parallel - run out of obvious letters
-   'g', // flushing report durring test-execution 
+'s',  // save - defines the filename to store the results
+'o',  // output type (list, xml, csv...)
+   'z',  // parallel - run out of obvious letters
 );
 
 /**
  * @var array
  */
 protected $longOptions = array(
-'verbose',
+'vv',  // verbose-mode level 2
+   'vvv',  // verbose-mode level 3
 'help',
 'keep-all',
 'keep-php',
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.20&r2=1.21&diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.20 
phpruntests/src/testrun/rtPhpTestRun.php:1.21
--- phpruntests/src/testrun/rtPhpTestRun.php:1.20   Sun Jul  5 20:51:16 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpMon Jul  6 20:35:54 2009
@@ -63,15 +63,14 @@
}
 }
 
-// check for the cmd-line-option 'g' which defines the 
report-status
+// check for the cmd-line-option 'v' which defines the 
report-status
 $reportStatus = 0;
-if ($runConfiguration->hasCommandLineOption('g')) {
-   
-   $reportStatus = $runConfiguration->getCommandLineOption('g');
-   
-   if (!is_numeric($reportStatus) || $processCount < 0) {
-   $reportStatus = 1;
-   }
+if ($runConfiguration->hasCommandLineOption('v')) {
+   $reportStatus = 1;
+} else if ($runConfiguration->hasCommandLineOption('vv')) {
+   $reportStatus = 2;
+} else if ($runConfiguration->hasCommandLineOption('vvv')) {
+   $reportStatus = 3;
 }

 // create the task-list
@@ -98,9 +97,14 @@
$outputWriter = rtTestOutputWriter::getInstance($type);
$outputWriter->setResultList($resultList);
$outputWriter->printOverview(sizeof($taskList), 
$scheduler->getProcessCount());
+
+   $filename = null;
+   if ($runConfiguration->hasCommandLineOption('s')) {
+   $filename = 
$runConfiguration->getCommandLineOption('s');
+   }

-   if ($runConfiguration->hasCommandLineOption('o')) {
-   $outputWriter->write(); 
+   if ($type || $filename) {
+   $outputWriter->write($filename);
 }
 
 } else {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestOutputWriter.php?r1=1.7&r2=1.8&diff_format=u
Index: phpruntests/src/testcase/rtTestOutputWriter.php
diff -u phpruntests/src/testcase/rtTestOutputWriter.php:1.7 
phpruntests/src/testcase/rtTestOutputWriter.php:1.8
--- phpruntests/src/testcase/rtTestOutputWriter.php:1.7 Sun Jul  5 20:51:16 2009
+++ phpruntests/src/testcase/rtTestOutputWriter.php Mon Jul  6 20:35:54 2009
@@ -70,7 +70,7 @@
 
 
 
-public function write()
+public function write($filename=null)
 {
$this->createOutput();

@@ -80,10 +80,12 @@
mkdir(self::OUTPUT_DIR);
}
 
-   $file = 
self::OUTPUT_DIR.'/results_'.microtime(true).'.'.$this->type;
+   if (is_null($filename)) {
+   $filename = 
self::OUTPUT_DIR.'/results_'.round(microtime(true)).'.'.$this->type;
+   }

-   if (file_put_contents($file, $this->output)) {
-   print "\nThe Test-Results were saved in <$file>\n";
+   if (file_put_contents($filename, $this->output)) {
+   print "\nThe Test-Results were

[PHP-CVS] cvs: phpruntests /QA test

2009-07-06 Thread Zoe Slattery

zoe Mon Jul  6 19:05:31 2009 UTC

  Added files: 
/phpruntests/QA test 
  Log:
  
  



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2009-07-06 Thread Pierre-Alain Joye

pajoye  Mon Jul  6 17:48:03 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  - #48771
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.663&r2=1.2027.2.547.2.965.2.664&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.663 
php-src/NEWS:1.2027.2.547.2.965.2.664
--- php-src/NEWS:1.2027.2.547.2.965.2.663   Sun Jul  5 16:08:05 2009
+++ php-src/NEWSMon Jul  6 17:48:02 2009
@@ -5,6 +5,8 @@
 - Fixed spl_autoload_unregister/spl_autoad_functions wrt. Closures and
   Functors. (Christian Seiler)
 
+- Fixed bug #48771 (rename() between volumes fails and reports no error on 
+  Windows). (Pierre)
 - Fixed bug #48757 (ReflectionFunction::invoke() parameter issues). (Kalle)
 - Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on
   files that have been opened with r+). (Ilia)
@@ -16,7 +18,6 @@
 - Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo). 
   (Kalle, Rick Yorgason)
 
-
 30 Jun 2009, PHP 5.3.0
 - Upgraded bundled PCRE to version 7.9. (Nuno)
 - Upgraded bundled sqlite to version 3.6.15. (Scott)



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

[PHP-CVS] cvs: phpruntests /QA README run-tests.php

2009-07-06 Thread Zoe Slattery

zoe Mon Jul  6 16:17:45 2009 UTC

  Removed files:   
/phpruntests/QA run-tests.php README 
  Log:
  removing ooops
  



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests mysqli_constants_categories.phpt

2009-07-06 Thread Ulf Wendel

uw  Mon Jul  6 15:53:14 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   mysqli_constants_categories.phpt 
  Log:
  MFH. Enabling test as requested by the skipif comment... it does pass when 
slightly modified.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_constants_categories.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_constants_categories.phpt
diff -u php-src/ext/mysqli/tests/mysqli_constants_categories.phpt:1.1.2.2 
php-src/ext/mysqli/tests/mysqli_constants_categories.phpt:1.1.2.3
--- php-src/ext/mysqli/tests/mysqli_constants_categories.phpt:1.1.2.2   Wed Oct 
10 10:13:47 2007
+++ php-src/ext/mysqli/tests/mysqli_constants_categories.phpt   Mon Jul  6 
15:53:14 2009
@@ -4,21 +4,15 @@
 
 --FILE--
  $consts) {
foreach ($consts as $name => $value) {
if (stristr($name, 'mysqli')) {
-   if ('mysqli' !== $group)
+   if ('mysqli' != $group)
printf("found constant '%s' in group '%s'. 
expecting group 'mysqli'\n", $name, $group);
}
}



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

[PHP-CVS] cvs: php-src /ext/mysqli/tests mysqli_constants_categories.phpt

2009-07-06 Thread Ulf Wendel

uw  Mon Jul  6 15:52:48 2009 UTC

  Modified files:  
/php-src/ext/mysqli/tests   mysqli_constants_categories.phpt 
  Log:
  Enabling test as requested by the skipif comment... it does pass when 
slightly modified.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_constants_categories.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_constants_categories.phpt
diff -u php-src/ext/mysqli/tests/mysqli_constants_categories.phpt:1.1 
php-src/ext/mysqli/tests/mysqli_constants_categories.phpt:1.2
--- php-src/ext/mysqli/tests/mysqli_constants_categories.phpt:1.1   Mon Jul 
23 12:38:40 2007
+++ php-src/ext/mysqli/tests/mysqli_constants_categories.phpt   Mon Jul  6 
15:52:48 2009
@@ -4,21 +4,15 @@
 
 --FILE--
  $consts) {
foreach ($consts as $name => $value) {
if (stristr($name, 'mysqli')) {
-   if ('mysqli' !== $group)
+   if ('mysqli' != $group)
printf("found constant '%s' in group '%s'. 
expecting group 'mysqli'\n", $name, $group);
}
}



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests connect.inc mysqli_class_mysqli_driver_reflection.phpt mysqli_class_mysqli_reflection.phpt mysqli_class_mysqli_result_reflection.phpt mysqli_class_mys

2009-07-06 Thread Ulf Wendel

uw  Mon Jul  6 15:45:19 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   connect.inc 
mysqli_class_mysqli_driver_reflection.phpt 
mysqli_class_mysqli_reflection.phpt 
mysqli_class_mysqli_result_reflection.phpt 
mysqli_class_mysqli_stmt_interface.phpt 
mysqli_class_mysqli_warning_reflection.phpt 
mysqli_debug_ini.phpt 
  Log:
  MFH. Fixing mysqlnd version test to run some four previously skipped tests. 
There is no proper way to check the mysqlnd version. The best one can do is 
adapt the tests to what PHP 5.3 and PHP 6.0 return today.
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/connect.inc?r1=1.6.2.1.2.2.2.4&r2=1.6.2.1.2.2.2.5&diff_format=u
Index: php-src/ext/mysqli/tests/connect.inc
diff -u php-src/ext/mysqli/tests/connect.inc:1.6.2.1.2.2.2.4 
php-src/ext/mysqli/tests/connect.inc:1.6.2.1.2.2.2.5
--- php-src/ext/mysqli/tests/connect.inc:1.6.2.1.2.2.2.4Tue Mar 18 
16:57:31 2008
+++ php-src/ext/mysqli/tests/connect.incMon Jul  6 15:45:19 2009
@@ -26,9 +26,28 @@
if (!$IS_MYSQLND) {
$MYSQLND_VERSION = NULL;
} else {
+   /*
+   The formatting of the version reported by 
mysqli_get_client_info()
+   has changed significantly in the past. To get tests working 
properly
+   with PHP 5.3.0 and up, we set everything that looks like prior 
to
+   PHP 5.3.0 to version 5.0.4 = 5 * 1 + 0 * 100 + 4 = 50004.
+   PHP 5.3.0   reports mysqlnd 5.0.5 dev (= 5 * 1 + 0 * 
100 + 5 = 50005.
+   */
if (preg_match('@Revision:\s+(\d+)\s...@ism', 
mysqli_get_client_info(), $matches)) {
-   $MYSQLND_VERSION = (int)$matches[1];
+   /* something prior to PHP 5.3.0 */
+   $MYSQLND_VERSION = 50004;
+   } else if (preg_match('@^mysqlnd (\d+)\.(\d+)\.(\d+)@ism', 
mysqli_get_client_info(), $matches)) {
+   /* formatting schema used by PHP 5.3.0 */
+   $MYSQLND_VERSION = (int)$matches[1] * 1 + 
(int)$matches[2] * 100 + (int)$matches[3];
+   } else if (preg_match('@^mysqlnd/PHP 6.0.0-...@ism', 
mysqli_get_client_info(), $matches)) {
+   /*
+   PHP 6.0 at the time of the first PHP 5.3.0 
release.
+   HEAD and 5.3 have been in sync when 5.3.0 was 
released.
+   It is at least 5.0.5-dev.
+   */
+   $MYSQLND_VERSION = 50005;
} else {
+   /* unknown */
$MYSQLND_VERSION = -1;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt
diff -u 
php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt:1.1.2.3 
php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt:1.1.2.4
--- php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt:1.1.2.3 
Tue Mar 18 16:57:31 2008
+++ php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt Mon Jul 
 6 15:45:19 2009
@@ -15,8 +15,8 @@
 */
 if (!$IS_MYSQLND)
die("skip Test has been written for the latest version of mysqlnd 
only");
-if ($MYSQLND_VERSION < 576)
-   die("skip Test requires mysqlnd Revision 576 or newer");
+if ($MYSQLND_VERSION < 50005)
+   die("skip Test requires mysqlnd Revision 5.0.4 or newer");
 ?>
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
diff -u php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt:1.1.2.3 
php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt:1.1.2.4
--- php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt:1.1.2.3
Tue Mar 18 16:57:31 2008
+++ php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phptMon Jul 
 6 15:45:19 2009
@@ -15,8 +15,8 @@
 */
 if (!$IS_MYSQLND)
die("skip Test has been written for the latest version of mysqlnd 
only");
-if ($MYSQLND_VERSION < 576)
-   die("skip Test requires mysqlnd Revision 576 or newer");
+if ($MYSQLND_VERSION < 50004)
+   die("skip Test requires mysqlnd Revision 5.0.4 or newer");
 
 ?>
 --FILE--
@@ -423,6 +423,22 @@
 Number of Parameters: 0
 Number of Required Parameters: 0
 
+Inspecting method 'poll'
+isFinal: no
+isAbstract: no
+isPublic: yes
+isPrivate: no
+isProtected: no
+isStatic: no
+isConstructor: no
+isDestructor: no
+isInternal: yes
+isUserDef

[PHP-CVS] cvs: php-src /ext/mysqli/tests connect.inc mysqli_class_mysqli_driver_reflection.phpt mysqli_class_mysqli_reflection.phpt mysqli_class_mysqli_result_reflection.phpt mysqli_class_mysqli_stmt_

2009-07-06 Thread Ulf Wendel

uw  Mon Jul  6 15:43:59 2009 UTC

  Modified files:  
/php-src/ext/mysqli/tests   connect.inc 
mysqli_class_mysqli_driver_reflection.phpt 
mysqli_class_mysqli_reflection.phpt 
mysqli_class_mysqli_result_reflection.phpt 
mysqli_class_mysqli_stmt_interface.phpt 
mysqli_class_mysqli_warning_reflection.phpt 
mysqli_debug_ini.phpt 
  Log:
  Fixing mysqlnd version test to run some four previously skipped tests. There 
is no proper way to check the mysqlnd version. The best one can do is adapt the 
tests to what PHP 5.3 and PHP 6.0 return today.
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/connect.inc?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/mysqli/tests/connect.inc
diff -u php-src/ext/mysqli/tests/connect.inc:1.11 
php-src/ext/mysqli/tests/connect.inc:1.12
--- php-src/ext/mysqli/tests/connect.inc:1.11   Fri Oct 12 11:51:22 2007
+++ php-src/ext/mysqli/tests/connect.incMon Jul  6 15:43:59 2009
@@ -26,9 +26,28 @@
if (!$IS_MYSQLND) {
$MYSQLND_VERSION = NULL;
} else {
+   /*
+   The formatting of the version reported by 
mysqli_get_client_info()
+   has changed significantly in the past. To get tests working 
properly
+   with PHP 5.3.0 and up, we set everything that looks like prior 
to
+   PHP 5.3.0 to version 5.0.4 = 5 * 1 + 0 * 100 + 4 = 50004.
+   PHP 5.3.0   reports mysqlnd 5.0.5 dev (= 5 * 1 + 0 * 
100 + 5 = 50005.
+   */
if (preg_match('@Revision:\s+(\d+)\s...@ism', 
mysqli_get_client_info(), $matches)) {
-   $MYSQLND_VERSION = (int)$matches[1];
+   /* something prior to PHP 5.3.0 */
+   $MYSQLND_VERSION = 50004;
+   } else if (preg_match('@^mysqlnd (\d+)\.(\d+)\.(\d+)@ism', 
mysqli_get_client_info(), $matches)) {
+   /* formatting schema used by PHP 5.3.0 */
+   $MYSQLND_VERSION = (int)$matches[1] * 1 + 
(int)$matches[2] * 100 + (int)$matches[3];
+   } else if (preg_match('@^mysqlnd/PHP 6.0.0-...@ism', 
mysqli_get_client_info(), $matches)) {
+   /*
+   PHP 6.0 at the time of the first PHP 5.3.0 
release.
+   HEAD and 5.3 have been in sync when 5.3.0 was 
released.
+   It is at least 5.0.5-dev.
+   */
+   $MYSQLND_VERSION = 50005;
} else {
+   /* unknown */
$MYSQLND_VERSION = -1;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt
diff -u php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt:1.2 
php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt:1.2 
Tue Mar 18 16:58:43 2008
+++ php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt Mon Jul 
 6 15:43:59 2009
@@ -15,8 +15,8 @@
 */
 if (!$IS_MYSQLND)
die("skip Test has been written for the latest version of mysqlnd 
only");
-if ($MYSQLND_VERSION < 576)
-   die("skip Test requires mysqlnd Revision 576 or newer");
+if ($MYSQLND_VERSION < 50005)
+   die("skip Test requires mysqlnd Revision 5.0.4 or newer");
 ?>
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
diff -u php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt:1.3 
php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt:1.4
--- php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt:1.3Tue Mar 
18 16:58:43 2008
+++ php-src/ext/mysqli/tests/mysqli_class_mysqli_reflection.phptMon Jul 
 6 15:43:59 2009
@@ -15,8 +15,8 @@
 */
 if (!$IS_MYSQLND)
die("skip Test has been written for the latest version of mysqlnd 
only");
-if ($MYSQLND_VERSION < 576)
-   die("skip Test requires mysqlnd Revision 576 or newer");
+if ($MYSQLND_VERSION < 50004)
+   die("skip Test requires mysqlnd Revision 5.0.4 or newer");
 
 ?>
 --FILE--
@@ -423,6 +423,22 @@
 Number of Parameters: 0
 Number of Required Parameters: 0
 
+Inspecting method 'poll'
+isFinal: no
+isAbstract: no
+isPublic: yes
+isPrivate: no
+isProtected: no
+isStatic: no
+isConstructor: no
+isDestructor: no
+isInternal: yes
+isUserDefined: no
+returnsReference: no
+Modifiers: 256
+Number of Parameters: 0
+Number of Required Parameters: 0
+
 Inspecting meth

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests 045.phpt mysqli_error_unicode.phpt mysqli_get_client_stats.phpt mysqli_get_warnings.phpt mysqli_query_unicode.phpt mysqli_set_local_infile_handler_bad

2009-07-06 Thread Ulf Wendel

uw  Mon Jul  6 15:08:14 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   045.phpt mysqli_error_unicode.phpt 
mysqli_get_client_stats.phpt 
mysqli_get_warnings.phpt 
mysqli_query_unicode.phpt 

mysqli_set_local_infile_handler_bad_character.phpt 
  Log:
  MFH. Adapting (old) tests to current PHP 6 semantics - s/unicode.semantics 
test/version_compare
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/045.phpt?r1=1.6.2.1.4.2&r2=1.6.2.1.4.3&diff_format=u
Index: php-src/ext/mysqli/tests/045.phpt
diff -u php-src/ext/mysqli/tests/045.phpt:1.6.2.1.4.2 
php-src/ext/mysqli/tests/045.phpt:1.6.2.1.4.3
--- php-src/ext/mysqli/tests/045.phpt:1.6.2.1.4.2   Thu May 28 14:33:42 2009
+++ php-src/ext/mysqli/tests/045.phpt   Mon Jul  6 15:08:13 2009
@@ -31,7 +31,7 @@
mysqli_bind_result($stmt, $c1, $c2);
mysqli_fetch($stmt);
mysqli_stmt_close($stmt);
-   if (ini_get("unicode.semantics") && mysqli_get_server_version($link) < 
5) {
+   if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && 
mysqli_get_server_version($link) < 5) {
/* variables are binary */
settype($c1, "unicode");
settype($c2, "unicode");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_error_unicode.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_error_unicode.phpt
diff -u php-src/ext/mysqli/tests/mysqli_error_unicode.phpt:1.2.2.3 
php-src/ext/mysqli/tests/mysqli_error_unicode.phpt:1.2.2.4
--- php-src/ext/mysqli/tests/mysqli_error_unicode.phpt:1.2.2.3  Thu May 28 
14:33:42 2009
+++ php-src/ext/mysqli/tests/mysqli_error_unicode.phpt  Mon Jul  6 15:08:13 2009
@@ -24,7 +24,7 @@
$host, $user, $db, $port, $socket);
}
 
-   if (!ini_get("unicode.semantics")) {
+   if (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
mysqli_query($link, "set names utf8");
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt?r1=1.2.2.7&r2=1.2.2.8&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.2.2.7 
php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.2.2.8
--- php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.2.2.7   Mon Jul 
 6 14:39:09 2009
+++ php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt   Mon Jul  6 
15:08:13 2009
@@ -118,7 +118,7 @@
mysqli_get_client_stats_assert_eq('result_set_queries', $new_info, 
$info, $test_counter);
 
/* we need to skip this test in unicode - we send set names utf8 during 
mysql_connect */
-   if (!ini_get("unicode.semantics"))
+   if (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1))
mysqli_get_client_stats_assert_eq('non_result_set_queries', 
$new_info, $info, $test_counter);
mysqli_get_client_stats_assert_eq('buffered_sets', $new_info, $info, 
$test_counter);
mysqli_get_client_stats_assert_eq('unbuffered_sets', $new_info, $info, 
$test_counter);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_warnings.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_warnings.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_warnings.phpt:1.2.2.3 
php-src/ext/mysqli/tests/mysqli_get_warnings.phpt:1.2.2.4
--- php-src/ext/mysqli/tests/mysqli_get_warnings.phpt:1.2.2.3   Mon Jul  6 
14:39:09 2009
+++ php-src/ext/mysqli/tests/mysqli_get_warnings.phpt   Mon Jul  6 15:08:13 2009
@@ -129,7 +129,7 @@
$warning = new mysqli_warning($mysqli);
$i = 1;
while ($warning->next() && ('' != ($tmp = $warning->message))) {
-   if (ini_get('unicode.semantics') && !is_unicode($tmp))
+   if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && 
!is_unicode($tmp))
printf("[033a] Warning should have been a unicode 
string, got %s/%s", gettype($tmp), $tmp);
$i++;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_query_unicode.phpt?r1=1.2.2.5&r2=1.2.2.6&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_query_unicode.phpt
diff -u php-src/ext/mysqli/tests/mysqli_query_unicode.phpt:1.2.2.5 
php-src/ext/mysqli/tests/mysqli_query_unicode.phpt:1.2.2.6
--- php-src/ext/mysqli/tests/mysqli_query_unicode.phpt:1.2.2.5  Thu May 28 
15:49:14 2009
+++ php-src/ext/mysqli/tests/mysqli_query_unicode.phpt  Mon Jul  6 15:08:13 2009
@@ -88,7 +88,7 @@
/*
Trying to test what Ramil suggests in 
http://bugs.mysql.com/bug.php?id=29576
However, this won't work, because we're lacking MYSQLI_SET_CHARSET_NAME.
-   if (ini_get("unicode.semantics")) {
+   if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
if (my

[PHP-CVS] cvs: php-src /ext/mysqli/tests 045.phpt mysqli_error_unicode.phpt mysqli_get_client_stats.phpt mysqli_get_warnings.phpt mysqli_query_unicode.phpt mysqli_set_local_infile_handler_bad_characte

2009-07-06 Thread Ulf Wendel

uw  Mon Jul  6 15:07:31 2009 UTC

  Modified files:  
/php-src/ext/mysqli/tests   045.phpt mysqli_error_unicode.phpt 
mysqli_get_client_stats.phpt 
mysqli_get_warnings.phpt 
mysqli_query_unicode.phpt 

mysqli_set_local_infile_handler_bad_character.phpt 
  Log:
  Adapting (old) tests to current PHP 6 semantics - s/unicode.semantics 
test/version_compare
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/045.phpt?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/mysqli/tests/045.phpt
diff -u php-src/ext/mysqli/tests/045.phpt:1.13 
php-src/ext/mysqli/tests/045.phpt:1.14
--- php-src/ext/mysqli/tests/045.phpt:1.13  Thu May 28 14:11:40 2009
+++ php-src/ext/mysqli/tests/045.phpt   Mon Jul  6 15:07:31 2009
@@ -31,7 +31,7 @@
mysqli_bind_result($stmt, $c1, $c2);
mysqli_fetch($stmt);
mysqli_stmt_close($stmt);
-   if (ini_get("unicode.semantics") && mysqli_get_server_version($link) < 
5) {
+   if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && 
mysqli_get_server_version($link) < 5) {
/* variables are binary */
settype($c1, "unicode");
settype($c2, "unicode");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_error_unicode.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_error_unicode.phpt
diff -u php-src/ext/mysqli/tests/mysqli_error_unicode.phpt:1.4 
php-src/ext/mysqli/tests/mysqli_error_unicode.phpt:1.5
--- php-src/ext/mysqli/tests/mysqli_error_unicode.phpt:1.4  Thu May 28 
14:11:40 2009
+++ php-src/ext/mysqli/tests/mysqli_error_unicode.phpt  Mon Jul  6 15:07:31 2009
@@ -24,7 +24,7 @@
$host, $user, $db, $port, $socket);
}
 
-   if (!ini_get("unicode.semantics")) {
+   if (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
mysqli_query($link, "set names utf8");
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.9 
php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.10
--- php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.9   Mon Jul  6 
14:36:52 2009
+++ php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt   Mon Jul  6 
15:07:31 2009
@@ -118,7 +118,7 @@
mysqli_get_client_stats_assert_eq('result_set_queries', $new_info, 
$info, $test_counter);
 
/* we need to skip this test in unicode - we send set names utf8 during 
mysql_connect */
-   if (!ini_get("unicode.semantics"))
+   if (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1))
mysqli_get_client_stats_assert_eq('non_result_set_queries', 
$new_info, $info, $test_counter);
mysqli_get_client_stats_assert_eq('buffered_sets', $new_info, $info, 
$test_counter);
mysqli_get_client_stats_assert_eq('unbuffered_sets', $new_info, $info, 
$test_counter);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_warnings.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_warnings.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_warnings.phpt:1.3 
php-src/ext/mysqli/tests/mysqli_get_warnings.phpt:1.4
--- php-src/ext/mysqli/tests/mysqli_get_warnings.phpt:1.3   Mon Jul  6 
14:36:52 2009
+++ php-src/ext/mysqli/tests/mysqli_get_warnings.phpt   Mon Jul  6 15:07:31 2009
@@ -129,7 +129,7 @@
$warning = new mysqli_warning($mysqli);
$i = 1;
while ($warning->next() && ('' != ($tmp = $warning->message))) {
-   if (ini_get('unicode.semantics') && !is_unicode($tmp))
+   if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && 
!is_unicode($tmp))
printf("[033a] Warning should have been a unicode 
string, got %s/%s", gettype($tmp), $tmp);
$i++;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_query_unicode.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_query_unicode.phpt
diff -u php-src/ext/mysqli/tests/mysqli_query_unicode.phpt:1.6 
php-src/ext/mysqli/tests/mysqli_query_unicode.phpt:1.7
--- php-src/ext/mysqli/tests/mysqli_query_unicode.phpt:1.6  Thu May 28 
15:47:08 2009
+++ php-src/ext/mysqli/tests/mysqli_query_unicode.phpt  Mon Jul  6 15:07:31 2009
@@ -88,7 +88,7 @@
/*
Trying to test what Ramil suggests in 
http://bugs.mysql.com/bug.php?id=29576
However, this won't work, because we're lacking MYSQLI_SET_CHARSET_NAME.
-   if (ini_get("unicode.semantics")) {
+   if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
if (mysqli_get_server_version() > 50002) {
@mysqli_query($link, "DROP USER IF EXISTS 
'ÑÐµÑÑ'@'%'");

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ldap/tests .cvsignore

2009-07-06 Thread Jani Taskinen

janiMon Jul  6 14:10:39 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/ldap/tests .cvsignore 
  Log:
  - Added missing file
  

http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/.cvsignore?view=markup&rev=1.1
Index: php-src/ext/ldap/tests/.cvsignore
+++ php-src/ext/ldap/tests/.cvsignore



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

[PHP-CVS] cvs: phpruntests /src/taskScheduler rtTaskScheduler.php

2009-07-06 Thread Georg Gradwohl

g2  Mon Jul  6 09:20:20 2009 UTC

  Modified files:  
/phpruntests/src/taskScheduler  rtTaskScheduler.php 
  Log:
  phpruntests - minor bugfix
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskScheduler.php?r1=1.4&r2=1.5&diff_format=u
Index: phpruntests/src/taskScheduler/rtTaskScheduler.php
diff -u phpruntests/src/taskScheduler/rtTaskScheduler.php:1.4 
phpruntests/src/taskScheduler/rtTaskScheduler.php:1.5
--- phpruntests/src/taskScheduler/rtTaskScheduler.php:1.4   Sun Jul  5 
20:51:15 2009
+++ phpruntests/src/taskScheduler/rtTaskScheduler.php   Mon Jul  6 09:20:20 2009
@@ -131,7 +131,7 @@
$task->run();
$results = $task->getResult();
rtTestOutputWriter::flushResult($results, 
$this->reportStatus);
-   $this->resultList = array_merge($this->resultList, 
$resultList);
+   $this->resultList = array_merge($this->resultList, 
$results);
}
 
return;



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring/tests mb_convert_kana.phpt mb_decode_numericentity.phpt mb_encode_numericentity.phpt mb_ereg3.phpt mb_ereg4.phpt mb_ereg_search.phpt mb_ereg_search_pos.ph

[PHP-CVS] cvs: php-src /ext/mbstring/tests mb_convert_kana.phpt mb_decode_numericentity.phpt mb_encode_numericentity.phpt mb_ereg3.phpt mb_ereg4.phpt mb_ereg_search.phpt mb_ereg_search_pos.phpt mb_ere

[PHP-CVS] cvs: php-src /ext/filter logical_filters.c /ext/filter/tests 016.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/filter logical_filters.c /ext/filter/tests 016.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter logical_filters.c /ext/filter/tests 016.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/idn idn.c

[PHP-CVS] cvs: php-src /ext/intl/idn idn.c

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

[PHP-CVS] cvs: php-src /ext/intl config.m4 config.w32 intl_error.c php_intl.c php_intl.h /ext/intl/idn idn.c idn.h /ext/intl/tests idn.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

[PHP-CVS] cvs: php-src /ext/openssl openssl.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/tests idn.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl openssl.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl openssl.c

[PHP-CVS] cvs: phpruntests /QA/tests quicktester.inc /QA/tests/lang 015.inc 016.inc 023-1.inc 023-2.inc bug24054.phpt bug38579.inc inc.inc inc_throw.inc /QA/tests/output ob_011.diff ob_011.exp ob_01

[PHP-CVS] cvs: phpruntests /QA/tests/classes autoload_derived.p5c autoload_implements.p5c autoload_interface.p5c autoload_root.p5c constants_basic_003.inc interface_optional_arg_003.inc

[PHP-CVS] cvs: phpruntests /QA/sapi/cli/tests 001.phpt 002-win32.phpt 002.phpt 003-2.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010-2.phpt 010.phpt 011.phpt 012.phpt 013.phpt

[PHP-CVS] cvs: phpruntests /QA/sapi/cgi/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.diff 006.exp 006.out 006.php 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt include.inc skipif.inc

[PHP-CVS] cvs: phpruntests /QA/results fail_compare.php

[PHP-CVS] cvs: phpruntests /QA/ext/spl/examples/tests dualiterator_001.phpt examples.inc

[PHP-CVS] cvs: phpruntests /QA/ext/spl/examples autoload.inc cachingrecursiveiterator.inc callbackfilteriterator.inc dbaarray.inc dbareader.inc directoryfilterdots.inc directorygraphiterator.inc direc

[PHP-CVS] cvs: phpruntests /src/configuration rtCommandLineOptions.php /src/testcase rtTestOutputWriter.php /src/testrun rtPhpTestRun.php

[PHP-CVS] cvs: phpruntests /QA test

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

[PHP-CVS] cvs: phpruntests /QA README run-tests.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests mysqli_constants_categories.phpt

[PHP-CVS] cvs: php-src /ext/mysqli/tests mysqli_constants_categories.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests connect.inc mysqli_class_mysqli_driver_reflection.phpt mysqli_class_mysqli_reflection.phpt mysqli_class_mysqli_result_reflection.phpt mysqli_class_mys

[PHP-CVS] cvs: php-src /ext/mysqli/tests connect.inc mysqli_class_mysqli_driver_reflection.phpt mysqli_class_mysqli_reflection.phpt mysqli_class_mysqli_result_reflection.phpt mysqli_class_mysqli_stmt_

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests 045.phpt mysqli_error_unicode.phpt mysqli_get_client_stats.phpt mysqli_get_warnings.phpt mysqli_query_unicode.phpt mysqli_set_local_infile_handler_bad

[PHP-CVS] cvs: php-src /ext/mysqli/tests 045.phpt mysqli_error_unicode.phpt mysqli_get_client_stats.phpt mysqli_get_warnings.phpt mysqli_query_unicode.phpt mysqli_set_local_infile_handler_bad_characte

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ldap/tests .cvsignore

[PHP-CVS] cvs: phpruntests /src/taskScheduler rtTaskScheduler.php

33 matches

Site Navigation

Mail list logo

Footer information