[PHP-CVS] Re: =?utf-8?q?svn:_/php/php-src/_branches/PHP=5F5=5F4/ext/xsl/tests/xsltprocessor=5FregisterPHPFunctions-funcnostring.phpt_branches/PHP=5F5=5F4/ext/xsl/tests/xsltprocessor=5FregisterPHPFunct
Hi Why did you do that? They're different on purpose. I'll revert that, since the tests now fail. chregu On 9/2/11 8:01 PM, Shein Alexey wrote: sheinFri, 02 Sep 2011 18:01:20 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316043 Log: Synchronized fixed tests from 5.3 branch. Changed paths: U php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt U php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt U php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt U php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt Modified: php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt === --- php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 17:56:07 UTC (rev 316042) +++ php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 18:01:20 UTC (rev 316043) @@ -21,10 +21,17 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); +? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %s on line %d + +Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d + +Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d + +Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt === --- php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-02 17:56:07 UTC (rev 316042) +++ php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-02 18:01:20 UTC (rev 316043) @@ -20,10 +20,17 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); +? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Unable to call handler undefinedfunc() in %s on line %d + +Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d + +Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d + +Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt === --- php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 17:56:07 UTC (rev 316042) +++ php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 18:01:20 UTC (rev 316043) @@ -21,10 +21,17 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); +? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %s on line %d + +Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d + +Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d + +Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt === --- php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-02 17:56:07 UTC (rev 316042) +++ php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-02 18:01:20 UTC (rev 316043) @@ -20,10 +20,17 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); +? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Unable to call handler undefinedfunc() in %s on line %d + +Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d + +Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d + +Warning:
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt trunk/
chregu Mon, 05 Sep 2011 08:27:47 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316133 Log: Revert r316043, the tests are different on purpose Changed paths: U php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt U php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt U php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt U php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt Modified: php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt === --- php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-05 08:13:22 UTC (rev 316132) +++ php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-05 08:27:47 UTC (rev 316133) @@ -21,17 +21,10 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); -? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %s on line %d - -Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d - -Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d - -Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt === --- php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-05 08:13:22 UTC (rev 316132) +++ php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-05 08:27:47 UTC (rev 316133) @@ -20,17 +20,10 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); -? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Unable to call handler undefinedfunc() in %s on line %d - -Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d - -Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d - -Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt === --- php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-05 08:13:22 UTC (rev 316132) +++ php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-05 08:27:47 UTC (rev 316133) @@ -21,17 +21,10 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); -? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %s on line %d - -Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d - -Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d - -Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt === --- php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-05 08:13:22 UTC (rev 316132) +++ php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-05 08:27:47 UTC (rev 316133) @@ -20,17 +20,10 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); -? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Unable to call handler undefinedfunc() in %s on line %d - -Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d - -Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d - -Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: =?utf-8?q?svn:_/php/php-src/_branches/PHP=5F5=5F4/ext/xsl/tests/xsltprocessor=5FregisterPHPFunctions-funcnostring.phpt_branches/PHP=5F5=5F4/ext/xsl/tests/xsltprocessor=5FregisterPHPFunct
2011/9/5 Christian Stocker christian.stoc...@liip.ch: Hi Why did you do that? They're different on purpose. I'll revert that, since the tests now fail. I spotted them on gcov.php.net (it's x64 box, see at the bottom http://gcov.php.net/viewer.php?version=PHP_5_4func=system), so I checked them on my x64 ubuntu laptop and they were failing too, that's why I fixed them this way. It seems gcov agrees with me, there's no failing xsl tests now: http://gcov.php.net/viewer.php?version=PHP_5_4func=tests (there are also some troubles with trunk section, it's outdated, maybe because its build is not finished yet after recent downtime, so it needs to be checked further). Now I checked your commit on x86 ubuntu and tests have passed, will check it again on x64-laptop when I got home. chregu On 9/2/11 8:01 PM, Shein Alexey wrote: shein Fri, 02 Sep 2011 18:01:20 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316043 Log: Synchronized fixed tests from 5.3 branch. Changed paths: U php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt U php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt U php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt U php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt Modified: php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt === --- php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 17:56:07 UTC (rev 316042) +++ php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 18:01:20 UTC (rev 316043) @@ -21,10 +21,17 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); +? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %s on line %d + +Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d + +Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d + +Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt === --- php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-02 17:56:07 UTC (rev 316042) +++ php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-02 18:01:20 UTC (rev 316043) @@ -20,10 +20,17 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); +? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Unable to call handler undefinedfunc() in %s on line %d + +Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d + +Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d + +Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt === --- php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 17:56:07 UTC (rev 316042) +++ php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 18:01:20 UTC (rev 316043) @@ -21,10 +21,17 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); +? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %s on line %d + +Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d + +Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d + +Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt === ---
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ basic_functions.c
bjoriMon, 05 Sep 2011 09:27:23 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316134
Log:
Not all submodules have MINIT, but they have MINFO and need to be registered
(cought by tyrael@)
Changed paths:
U php/php-src/trunk/ext/standard/basic_functions.c
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2011-09-05 08:27:47 UTC
(rev 316133)
+++ php/php-src/trunk/ext/standard/basic_functions.c2011-09-05 09:27:23 UTC
(rev 316134)
@@ -3521,8 +3521,11 @@
#define BASIC_MINIT_SUBMODULE(module) \
if (PHP_MINIT(module)(INIT_FUNC_ARGS_PASSTHRU) == SUCCESS) {\
- zend_hash_add_empty_element(basic_submodules, #module,
strlen(#module)); \
+ BASIC_ADD_SUBMODULE($module); \
}
+
+#define BASIC_ADD_SUBMODULE(module) \
+ zend_hash_add_empty_element(basic_submodules, #module,
strlen(#module));
#define BASIC_RINIT_SUBMODULE(module) \
if (zend_hash_exists(basic_submodules, #module, strlen(#module))) { \
@@ -3619,6 +3622,8 @@
register_html_constants(INIT_FUNC_ARGS_PASSTHRU);
register_string_constants(INIT_FUNC_ARGS_PASSTHRU);
+ BASIC_ADD_SUBMODULE(dl)
+ BASIC_ADD_SUBMODULE(mail)
BASIC_MINIT_SUBMODULE(file)
BASIC_MINIT_SUBMODULE(pack)
BASIC_MINIT_SUBMODULE(browscap)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ext/standard/ basic_functions.c
\o/
thanks for fixing!
On Mon, Sep 5, 2011 at 11:27 AM, Hannes Magnusson bj...@php.net wrote:
bjori Mon, 05 Sep 2011 09:27:23 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316134
Log:
Not all submodules have MINIT, but they have MINFO and need to be registered
(cought by tyrael@)
Changed paths:
U php/php-src/trunk/ext/standard/basic_functions.c
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c 2011-09-05 08:27:47
UTC (rev 316133)
+++ php/php-src/trunk/ext/standard/basic_functions.c 2011-09-05 09:27:23
UTC (rev 316134)
@@ -3521,8 +3521,11 @@
#define BASIC_MINIT_SUBMODULE(module) \
if (PHP_MINIT(module)(INIT_FUNC_ARGS_PASSTHRU) == SUCCESS) {\
- zend_hash_add_empty_element(basic_submodules, #module,
strlen(#module)); \
+ BASIC_ADD_SUBMODULE($module); \
}
+
+#define BASIC_ADD_SUBMODULE(module) \
+ zend_hash_add_empty_element(basic_submodules, #module,
strlen(#module));
#define BASIC_RINIT_SUBMODULE(module) \
if (zend_hash_exists(basic_submodules, #module, strlen(#module))) { \
@@ -3619,6 +3622,8 @@
register_html_constants(INIT_FUNC_ARGS_PASSTHRU);
register_string_constants(INIT_FUNC_ARGS_PASSTHRU);
+ BASIC_ADD_SUBMODULE(dl)
+ BASIC_ADD_SUBMODULE(mail)
BASIC_MINIT_SUBMODULE(file)
BASIC_MINIT_SUBMODULE(pack)
BASIC_MINIT_SUBMODULE(browscap)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Ferenc Kovács
@Tyr43l - http://tyrael.hu
--
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/standard/ basic_functions.c
bjoriMon, 05 Sep 2011 09:34:14 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316135
Log:
Interesting typo...
Changed paths:
U php/php-src/trunk/ext/standard/basic_functions.c
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2011-09-05 09:27:23 UTC
(rev 316134)
+++ php/php-src/trunk/ext/standard/basic_functions.c2011-09-05 09:34:14 UTC
(rev 316135)
@@ -3521,7 +3521,7 @@
#define BASIC_MINIT_SUBMODULE(module) \
if (PHP_MINIT(module)(INIT_FUNC_ARGS_PASSTHRU) == SUCCESS) {\
- BASIC_ADD_SUBMODULE($module); \
+ BASIC_ADD_SUBMODULE(module); \
}
#define BASIC_ADD_SUBMODULE(module) \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings.phpt trunk/ext/session/tests/rfc1867_invalid_settings.phpt
Created bug report after discussion on irc (just to make a note here): https://bugs.php.net/bug.php?id=55583 2011/9/4 Ferenc Kovacs tyr...@php.net: Hi, because I think that the tests is at fault here. I checked some other cases, where we validate INI variables(through PHP_INI_MH), and I think that the code is fine. a similar case which generates double warning: tyrael@sanctuary:~$ php -n -d error_reporting=-1 -d display_startup_errors=1 -d zlib.output_compression=1 -d output_handler=1 -r '' PHP Fatal error: PHP Startup: Cannot use both zlib.output_compression and output_handler together!! in Unknown on line 0 Fatal error: PHP Startup: Cannot use both zlib.output_compression and output_handler together!! in Unknown on line 0 this happens consistently with all current branches and even with 5.2, so I think that it is the intended behavior. so changing the test to expect this seemed the logical choice. On Sun, Sep 4, 2011 at 6:10 PM, Alexey Shein con...@gmail.com wrote: Hello, why did you fix the test this way? Why not to fix the code and remove excessive warning? 2011/9/4 Ferenc Kovacs tyr...@php.net: tyrael Sun, 04 Sep 2011 14:28:52 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316109 Log: passing an invalid session.upload_progress.freq always generates an additional startup error Changed paths: U php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings.phpt U php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings.phpt Modified: php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings.phpt === --- php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings.phpt 2011-09-04 14:21:27 UTC (rev 316108) +++ php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings.phpt 2011-09-04 14:28:52 UTC (rev 316109) @@ -9,5 +9,7 @@ var_dump(ini_get(session.upload_progress.freq)); ? --EXPECTF-- +PHP Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s + Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s string(%d) 1% Modified: php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings.phpt === --- php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings.phpt 2011-09-04 14:21:27 UTC (rev 316108) +++ php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings.phpt 2011-09-04 14:28:52 UTC (rev 316109) @@ -9,5 +9,7 @@ var_dump(ini_get(session.upload_progress.freq)); ? --EXPECTF-- +PHP Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s + Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s string(%d) 1% -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Regards, Shein Alexey -- Regards, Shein Alexey -- 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/standard/tests/file/ rename_variation7-win32.phpt
pajoye Mon, 05 Sep 2011 10:13:46 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316138 Log: - fix test Changed paths: U php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation7-win32.phpt Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation7-win32.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation7-win32.phpt 2011-09-05 10:03:16 UTC (rev 316137) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation7-win32.phpt 2011-09-05 10:13:46 UTC (rev 316138) @@ -26,11 +26,11 @@ echo Done\n; ? --EXPECTF-- -Warning: symlink(): Could not fetch file information(error 2) in %s on line %d +Warning: symlink(): Could not fetch file information(error 2) in %srename_variation7-win32.php on line %d -Warning: readlink(): Could not open file (error 2) in %s on line %d +Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link), error 2) in %srename_variation7-win32.php on line %d bool(false) -Warning: readlink(): Could not open file (error 2) in %s on line %d +Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link2), error 2) in %srename_variation7-win32.php on line %d bool(false) Done -- 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/standard/tests/file/ rename_variation7-win32.phpt
pajoye Mon, 05 Sep 2011 10:14:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316139 Log: - fix test Changed paths: U php/php-src/trunk/ext/standard/tests/file/rename_variation7-win32.phpt Modified: php/php-src/trunk/ext/standard/tests/file/rename_variation7-win32.phpt === --- php/php-src/trunk/ext/standard/tests/file/rename_variation7-win32.phpt 2011-09-05 10:13:46 UTC (rev 316138) +++ php/php-src/trunk/ext/standard/tests/file/rename_variation7-win32.phpt 2011-09-05 10:14:13 UTC (rev 316139) @@ -26,11 +26,11 @@ echo Done\n; ? --EXPECTF-- -Warning: symlink(): Could not fetch file information(error 2) in %s on line %d +Warning: symlink(): Could not fetch file information(error 2) in %srename_variation7-win32.php on line %d -Warning: readlink(): Could not open file (error 2) in %s on line %d +Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link), error 2) in %srename_variation7-win32.php on line %d bool(false) -Warning: readlink(): Could not open file (error 2) in %s on line %d +Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link2), error 2) in %srename_variation7-win32.php on line %d bool(false) Done -- 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/standard/tests/file/file_put_contents_variation8-win32.phpt branches/PHP_5_4/ext/standard/tests/file/glob_variation-win32.phpt branches/PHP_5_4/ext/st
pajoye Mon, 05 Sep 2011 10:29:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316141
Log:
- update test to the zeng arg path argument
Changed paths:
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation-win32.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/readfile_variation10-win32.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/stat_error-win32.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7-win32.phpt
U
php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/glob_variation-win32.phpt
U
php/php-src/trunk/ext/standard/tests/file/readfile_variation10-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/stat_error-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/tempnam_variation7-win32.phpt
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8-win32.phpt 2011-09-05 10:16:36 UTC (rev 316140)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8-win32.phpt 2011-09-05 10:29:12 UTC (rev 316141)
@@ -78,12 +78,12 @@
-- Filename: \0 --
-Warning: file_put_contents(): Filename cannot be empty in %s on line %d
+Warning: file_put_contents() expects parameter 1 to be a valid path, string given in %s on line %d
Failed to write data to: \0
-- Filename: array() --
-Warning: file_put_contents() expects parameter 1 to be string, array given in %s on line %d
+Warning: file_put_contents() expects parameter 1 to be a valid path, array given in %s on line %d
Failed to write data to: array()
-- Filename: /no/such/file/dir --
@@ -95,4 +95,4 @@
Warning: file_put_contents(php/php): failed to open stream: %s in %s on line %d
Failed to write data to: php/php
-===Done===
\ No newline at end of file
+===Done===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation-win32.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation-win32.phpt 2011-09-05 10:16:36 UTC (rev 316140)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation-win32.phpt 2011-09-05 10:29:12 UTC (rev 316141)
@@ -325,21 +325,25 @@
}
-- Iteration 8 --
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(1) {
- [0]=
- string(%d) %s/glob_variation/WONDER5
-}
-array(0) {
-}
-array(0) {
-}
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
+Warning: glob() expects parameter 1 to be a valid path, string given %sglob_variation-win32.php on line %d
+NULL
+
-- Iteration 9 --
array(0) {
}
@@ -441,8 +445,9 @@
array(0) {
}
-- Iteration 8 --
-array(0) {
-}
+
+Warning: glob() expects parameter 1 to be a valid path, string given in %sglob_variation-win32.php on line %d
+NULL
-- Iteration 9 --
array(0) {
}
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/readfile_variation10-win32.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/readfile_variation10-win32.phpt 2011-09-05 10:16:36 UTC (rev 316140)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/readfile_variation10-win32.phpt 2011-09-05 10:29:12 UTC (rev 316141)
@@ -71,11 +71,11 @@
-- Filename: \0 --
-Warning: readfile(): Filename cannot be empty in %s on line %d
+Warning: readfile() expects parameter 1 to be a valid path, string given in %s on line %d
-- Filename: array() --
-Warning: readfile() expects parameter 1 to be string, array given in %s on line %d
+Warning: readfile() expects parameter 1 to be a valid path, array given in %s on line %d
-- Filename: /no/such/file/dir --
@@ -84,4 +84,4 @@
-- Filename: php/php --
Warning: readfile(php/php): failed to open stream: No such file or directory in %s on line %d
-===Done===
\ No newline at end of file
+===Done===
Modified:
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/tests/bug13142.phpt branches/PHP_5_4/ext/date/tests/bug13142.phpt trunk/ext/date/tests/bug13142.phpt
bjoriMon, 05 Sep 2011 10:30:41 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316142
Log:
Fix test, one skipif is enough
Changed paths:
U php/php-src/branches/PHP_5_3/ext/date/tests/bug13142.phpt
U php/php-src/branches/PHP_5_4/ext/date/tests/bug13142.phpt
U php/php-src/trunk/ext/date/tests/bug13142.phpt
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/bug13142.phpt
===
--- php/php-src/branches/PHP_5_3/ext/date/tests/bug13142.phpt 2011-09-05
10:29:12 UTC (rev 316141)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/bug13142.phpt 2011-09-05
10:30:41 UTC (rev 316142)
@@ -7,8 +7,6 @@
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
die(skip. set TZ env is not supported at runtime.);
}
---SKIPIF--
-?php
if (!@putenv(TZ=US/Eastern) || getenv(TZ) != 'US/Eastern') {
die(skip unable to change TZ enviroment variable\n);
}
Modified: php/php-src/branches/PHP_5_4/ext/date/tests/bug13142.phpt
===
--- php/php-src/branches/PHP_5_4/ext/date/tests/bug13142.phpt 2011-09-05
10:29:12 UTC (rev 316141)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/bug13142.phpt 2011-09-05
10:30:41 UTC (rev 316142)
@@ -7,8 +7,6 @@
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
die(skip. set TZ env is not supported at runtime.);
}
---SKIPIF--
-?php
if (!@putenv(TZ=US/Eastern) || getenv(TZ) != 'US/Eastern') {
die(skip unable to change TZ enviroment variable\n);
}
Modified: php/php-src/trunk/ext/date/tests/bug13142.phpt
===
--- php/php-src/trunk/ext/date/tests/bug13142.phpt 2011-09-05 10:29:12 UTC
(rev 316141)
+++ php/php-src/trunk/ext/date/tests/bug13142.phpt 2011-09-05 10:30:41 UTC
(rev 316142)
@@ -7,8 +7,6 @@
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
die(skip. set TZ env is not supported at runtime.);
}
---SKIPIF--
-?php
if (!@putenv(TZ=US/Eastern) || getenv(TZ) != 'US/Eastern') {
die(skip unable to change TZ enviroment variable\n);
}
--
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_3/ext/standard/tests/general_functions/highlight_heredoc.phpt branches/PHP_5_4/ext/standard/tests/general_functions/highlight_heredoc.phpt trunk/ext/standar
pajoye Mon, 05 Sep 2011 10:52:01 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316144 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/highlight_heredoc.phpt _U php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/highlight_heredoc.phpt _U php/php-src/trunk/ext/standard/tests/general_functions/highlight_heredoc.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/highlight_heredoc.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/highlight_heredoc.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/standard/tests/general_functions/highlight_heredoc.phpt ___ Modified: svn:eol-style - native + LF -- 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_3/ext/standard/tests/misc/time_sleep_until_basic.phpt branches/PHP_5_4/ext/standard/tests/misc/time_sleep_until_basic.phpt trunk/ext/standard/tests/misc/tim
bjoriMon, 05 Sep 2011 10:55:07 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316145 Log: Fix test to use microtime() as time() doesn't always catchup fast enough :] Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_basic.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/misc/time_sleep_until_basic.phpt U php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_basic.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_basic.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 10:52:01 UTC (rev 316144) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 10:55:07 UTC (rev 316145) @@ -8,9 +8,10 @@ #PHPTestFest Cesena Italia on 2009-06-20 --FILE-- ?php - $time = time() + 2; - time_sleep_until( $time ); - var_dump( time() = $time ); + $time = microtime(true) + 2; + var_dump(time_sleep_until( (int)$time )); + var_dump(microtime(true) = (int)$time); ? --EXPECT-- bool(true) +bool(true); Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/misc/time_sleep_until_basic.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 10:52:01 UTC (rev 316144) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 10:55:07 UTC (rev 316145) @@ -8,9 +8,10 @@ #PHPTestFest Cesena Italia on 2009-06-20 --FILE-- ?php - $time = time() + 2; - time_sleep_until( $time ); - var_dump( time() = $time ); + $time = microtime(true) + 2; + var_dump(time_sleep_until( (int)$time )); + var_dump(microtime(true) = (int)$time); ? --EXPECT-- bool(true) +bool(true); Modified: php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_basic.phpt === --- php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 10:52:01 UTC (rev 316144) +++ php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 10:55:07 UTC (rev 316145) @@ -8,9 +8,10 @@ #PHPTestFest Cesena Italia on 2009-06-20 --FILE-- ?php - $time = time() + 2; - time_sleep_until( $time ); - var_dump( time() = $time ); + $time = microtime(true) + 2; + var_dump(time_sleep_until( (int)$time )); + var_dump(microtime(true) = (int)$time); ? --EXPECT-- bool(true) +bool(true); -- 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_3/ext/standard/tests/general_functions/parse_ini_file.phpt branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file.phpt trunk/ext/standard/test
pajoye Mon, 05 Sep 2011 10:59:26 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316152 Log: - force LF and enable it on windows now Changed paths: _U php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/parse_ini_file.phpt UU php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file.phpt _U php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/parse_ini_file.phpt ___ Modified: svn:eol-style - native + LF Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file.phpt 2011-09-05 10:57:23 UTC (rev 316151) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file.phpt 2011-09-05 10:59:26 UTC (rev 316152) @@ -1,7 +1,5 @@ --TEST-- parse_ini_file() multiple calls ---SKIPIF-- -?php if( substr(PHP_OS, 0, 3) == 'WIN' ) die(skip Windows has different error message);? --FILE-- ?php Property changes on: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_file.phpt ___ Modified: svn:eol-style - native + LF -- 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_3/ext/standard/tests/strings/htmlentities_html4.phpt branches/PHP_5_4/ext/standard/tests/strings/htmlentities_html4.phpt trunk/ext/standard/tests/strings/ht
sheinMon, 05 Sep 2011 11:00:14 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316153
Log:
Make the test faster, what was done:
1) replaced multiple htmlentities calls with one call to get_html_translation
table since they share the same code internally
2) reduced the upper range of the for loop to 0x2710 (1), according to
http://www.w3.org/TR/html4/sgml/entities.html it's enough
3) placed additional check to make sure all entities from
get_html_translation_table were checked in the test
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities_html4.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities_html4.phpt
U php/php-src/trunk/ext/standard/tests/strings/htmlentities_html4.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities_html4.phpt
===
---
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities_html4.phpt
2011-09-05 10:59:26 UTC (rev 316152)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities_html4.phpt
2011-09-05 11:00:14 UTC (rev 316153)
@@ -1,9 +1,5 @@
--TEST--
htmlentities() conformance check (HTML 4)
---SKIPIF--
-?php
-if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
-?
--FILE--
?php
function utf32_utf8($k) {
@@ -43,15 +39,23 @@
return $retval;
}
-for ($i = 0; $i 0x11; $i++) {
+$table = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES, 'UTF-8');
+
+for ($i = 0; $i 0x2710; $i++) {
if ($i = 0xd800 $i 0xe000)
continue;
$str = utf32_utf8($i);
-$result = htmlentities($str, ENT_QUOTES, 'UTF-8');
-if ($str != $result) {
-printf(%s\tU+%05X\n, $result, $i);
-}
+ if (isset($table[$str])) {
+ printf(%s\tU+%05X\n, $table[$str], $i);
+ unset($table[$str]);
+ }
}
+
+if (!empty($table)) {
+ echo Not matched entities: ;
+ var_dump($table);
+}
+
?
--EXPECT--
quot; U+00022
Modified:
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities_html4.phpt
===
---
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities_html4.phpt
2011-09-05 10:59:26 UTC (rev 316152)
+++
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities_html4.phpt
2011-09-05 11:00:14 UTC (rev 316153)
@@ -1,9 +1,5 @@
--TEST--
htmlentities() conformance check (HTML 4)
---SKIPIF--
-?php
-if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
-?
--FILE--
?php
function utf32_utf8($k) {
@@ -43,15 +39,23 @@
return $retval;
}
-for ($i = 0; $i 0x11; $i++) {
+$table = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES, 'UTF-8');
+
+for ($i = 0; $i 0x2710; $i++) {
if ($i = 0xd800 $i 0xe000)
continue;
$str = utf32_utf8($i);
-$result = htmlentities($str, ENT_QUOTES, 'UTF-8');
-if ($str != $result) {
-printf(%s\tU+%05X\n, $result, $i);
-}
+ if (isset($table[$str])) {
+ printf(%s\tU+%05X\n, $table[$str], $i);
+ unset($table[$str]);
+ }
}
+
+if (!empty($table)) {
+ echo Not matched entities: ;
+ var_dump($table);
+}
+
?
--EXPECT--
quot; U+00022
Modified: php/php-src/trunk/ext/standard/tests/strings/htmlentities_html4.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/htmlentities_html4.phpt
2011-09-05 10:59:26 UTC (rev 316152)
+++ php/php-src/trunk/ext/standard/tests/strings/htmlentities_html4.phpt
2011-09-05 11:00:14 UTC (rev 316153)
@@ -1,9 +1,5 @@
--TEST--
htmlentities() conformance check (HTML 4)
---SKIPIF--
-?php
-if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
-?
--FILE--
?php
function utf32_utf8($k) {
@@ -43,15 +39,23 @@
return $retval;
}
-for ($i = 0; $i 0x11; $i++) {
+$table = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES, 'UTF-8');
+
+for ($i = 0; $i 0x2710; $i++) {
if ($i = 0xd800 $i 0xe000)
continue;
$str = utf32_utf8($i);
-$result = htmlentities($str, ENT_QUOTES, 'UTF-8');
-if ($str != $result) {
-printf(%s\tU+%05X\n, $result, $i);
-}
+ if (isset($table[$str])) {
+ printf(%s\tU+%05X\n, $table[$str], $i);
+ unset($table[$str]);
+ }
}
+
+if (!empty($table)) {
+ echo Not matched entities: ;
+ var_dump($table);
+}
+
?
--EXPECT--
quot; U+00022
--
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_3/ext/standard/tests/general_functions/parse_ini_file-win32.phpt branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file-win32.phpt trunk/ext/s
pajoye Mon, 05 Sep 2011 11:00:52 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316154
Log:
- not used anymore, one version to rule them all
Changed paths:
D
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/parse_ini_file-win32.phpt
D
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file-win32.phpt
D
php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_file-win32.phpt
Deleted: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/parse_ini_file-win32.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/parse_ini_file-win32.phpt 2011-09-05 11:00:14 UTC (rev 316153)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/parse_ini_file-win32.phpt 2011-09-05 11:00:52 UTC (rev 316154)
@@ -1,196 +0,0 @@
---TEST--
-parse_ini_file() multiple calls
---SKIPIF--
-?php if( substr(PHP_OS, 0, 3) != 'WIN' ) die(skip non Windows systems have different error message);?
---FILE--
-?php
-
-$filename = dirname(__FILE__)./parse_ini_file.dat;
-@unlink($filename); /* Make sure the file really does not exist! */
-
-var_dump(parse_ini_file());
-var_dump(parse_ini_file(1,1,1,1));
-var_dump(parse_ini_file($filename));
-var_dump(parse_ini_file($filename, true));
-
-$ini =
-test =
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename));
-$ini =
-test==
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename));
-
-$ini =
-test=test=
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename));
-
-$ini =
-test= \new
-line\
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename));
-
-define(TEST_CONST, test const value);
-$ini =
-test=TEST_CONST
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename));
-
-$ini =
-[section]
-test=hello
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename, true));
-
-$ini =
-[section]
-test=hello
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename, false));
-
-$ini =
-section.test=hello
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename, true));
-
-$ini =
-[section]
-section.test=hello
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename, true));
-
-$ini =
-[section]
-1=2
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename, true));
-
-$ini =
-1=2
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename, true));
-$ini =
-test=test2
-test=test3
-test=test4
-;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename, true));
-
-/* From bug #44574 */
-$ini = [section1]\nname = value;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename, true));
-
-/* #44842, labels starting with underscore */
-$ini = 'INI'
-foo=bar1
-_foo=bar2
-foo_=bar3
-INI;
-file_put_contents($filename, $ini);
-var_dump(parse_ini_file($filename, true));
-
-@unlink($filename);
-echo Done\n;
-?
---EXPECTF--
-Warning: parse_ini_file() expects at least 1 parameter, 0 given in %s on line 6
-bool(false)
-
-Warning: parse_ini_file() expects at most 3 parameters, 4 given in %s on line 7
-bool(false)
-
-Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such file or directory in %s.php on line 8
-bool(false)
-
-Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such file or directory in %s.php on line 9
-bool(false)
-array(1) {
- [test]=
- string(0)
-}
-
-Warning: parse error in %s on line %d
- in %s on line 20
-bool(false)
-
-Warning: parse error in %s on line %d
- in %s on line 26
-bool(false)
-array(1) {
- [test]=
- string(8) new
-line
-}
-array(1) {
- [test]=
- string(16) test const value
-}
-array(1) {
- [section]=
- array(1) {
-[test]=
-string(5) hello
- }
-}
-array(1) {
- [test]=
- string(5) hello
-}
-array(1) {
- [section.test]=
- string(5) hello
-}
-array(1) {
- [section]=
- array(1) {
-[section.test]=
-string(5) hello
- }
-}
-array(1) {
- [section]=
- array(1) {
-[1]=
-string(1) 2
- }
-}
-array(1) {
- [1]=
- string(1) 2
-}
-array(1) {
- [test]=
- string(5) test4
-}
-array(1) {
- [section1]=
- array(1) {
-[name]=
-string(5) value
- }
-}
-array(3) {
- [foo]=
- string(4) bar1
- [_foo]=
- string(4) bar2
- [foo_]=
- string(4) bar3
-}
-Done
Deleted: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file-win32.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file-win32.phpt 2011-09-05 11:00:14 UTC (rev 316153)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_file-win32.phpt 2011-09-05 11:00:52 UTC (rev 316154)
@@ -1,196 +0,0 @@
---TEST--
-parse_ini_file() multiple
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt trunk/ext/iconv/tests/iconv_stream_filter.phpt
bjoriMon, 05 Sep 2011 11:07:38 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316158 Log: Fix the test in 5.4 and trunk. older libraries will emmit error here, while new won't. So lets just suppress it rather then making the test uselessly fail for random people. Changed paths: U php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt U php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt U php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.phpt Modified: php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt === --- php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt 2011-09-05 11:07:10 UTC (rev 316157) +++ php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt 2011-09-05 11:07:38 UTC (rev 316158) @@ -22,7 +22,7 @@ $fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'rb'); stream_filter_append($fp, 'string.rot13'); // this will make conversion fail. stream_filter_append($fp, 'convert.iconv.ISO-2022-JP/EUC-JP'); -var_dump(bin2hex(fread($fp, 10)) != a4b3a4f3a4cba4c1a4cf); +var_dump(bin2hex(@fread($fp, 10)) != a4b3a4f3a4cba4c1a4cf); var_dump(bin2hex(fread($fp, 5)) != 69636f6e76); var_dump(bin2hex(fread($fp, 1)) != 0a); fclose($fp); Modified: php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt === --- php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt 2011-09-05 11:07:10 UTC (rev 316157) +++ php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt 2011-09-05 11:07:38 UTC (rev 316158) @@ -22,7 +22,7 @@ $fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'rb'); stream_filter_append($fp, 'string.rot13'); // this will make conversion fail. stream_filter_append($fp, 'convert.iconv.ISO-2022-JP/EUC-JP'); -var_dump(bin2hex(fread($fp, 10)) != a4b3a4f3a4cba4c1a4cf); +var_dump(bin2hex(@fread($fp, 10)) != a4b3a4f3a4cba4c1a4cf); var_dump(bin2hex(fread($fp, 5)) != 69636f6e76); var_dump(bin2hex(fread($fp, 1)) != 0a); fclose($fp); @@ -34,8 +34,6 @@ string(20) a4b3a4f3a4cba4c1a4cf string(10) 69636f6e76 string(2) 0a - -Warning: fread(): iconv stream filter (ISO-2022-JP=EUC-JP): invalid multibyte sequence in %s on line %d bool(true) bool(true) bool(true) Modified: php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.phpt === --- php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.phpt 2011-09-05 11:07:10 UTC (rev 316157) +++ php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.phpt 2011-09-05 11:07:38 UTC (rev 316158) @@ -22,7 +22,7 @@ $fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'rb'); stream_filter_append($fp, 'string.rot13'); // this will make conversion fail. stream_filter_append($fp, 'convert.iconv.ISO-2022-JP/EUC-JP'); -var_dump(bin2hex(fread($fp, 10)) != a4b3a4f3a4cba4c1a4cf); +var_dump(bin2hex(@fread($fp, 10)) != a4b3a4f3a4cba4c1a4cf); var_dump(bin2hex(fread($fp, 5)) != 69636f6e76); var_dump(bin2hex(fread($fp, 1)) != 0a); fclose($fp); @@ -34,8 +34,6 @@ string(20) a4b3a4f3a4cba4c1a4cf string(10) 69636f6e76 string(2) 0a - -Warning: fread(): iconv stream filter (ISO-2022-JP=EUC-JP): invalid multibyte sequence in %s on line %d bool(true) bool(true) bool(true) -- 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_3/ext/standard/tests/general_functions/parse_ini_string_002.phpt branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_string_002.phpt trunk/ext/s
pajoye Mon, 05 Sep 2011 11:46:05 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316168 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/parse_ini_string_002.phpt _U php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_string_002.phpt _U php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_string_002.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/parse_ini_string_002.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_string_002.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_string_002.phpt ___ Modified: svn:eol-style - native + LF -- 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_3/ext/standard/tests/misc/time_sleep_until_basic.phpt branches/PHP_5_4/ext/standard/tests/misc/time_sleep_until_basic.phpt trunk/ext/standard/tests/misc/tim
bjoriMon, 05 Sep 2011 12:00:24 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316170 Log: typo Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_basic.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/misc/time_sleep_until_basic.phpt U php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_basic.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_basic.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 11:56:00 UTC (rev 316169) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 12:00:24 UTC (rev 316170) @@ -14,4 +14,4 @@ ? --EXPECT-- bool(true) -bool(true); +bool(true) Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/misc/time_sleep_until_basic.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 11:56:00 UTC (rev 316169) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 12:00:24 UTC (rev 316170) @@ -14,4 +14,4 @@ ? --EXPECT-- bool(true) -bool(true); +bool(true) Modified: php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_basic.phpt === --- php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 11:56:00 UTC (rev 316169) +++ php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_basic.phpt 2011-09-05 12:00:24 UTC (rev 316170) @@ -14,4 +14,4 @@ ? --EXPECT-- bool(true) -bool(true); +bool(true) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Mon, 05 Sep 2011 12:09:21 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316171 Log: - flavius karma for meta Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-09-05 12:00:24 UTC (rev 316170) +++ SVNROOT/global_avail2011-09-05 12:09:21 UTC (rev 316171) @@ -345,6 +345,7 @@ avail|knut|php/php-src/*/tests avail|laruence|pecl/yaf,phpdoc avail|whereswardy|pecl/handlersocket,phpdoc +avail|flavius|pecl/meta,phpdoc # Objective-C bridge avail|wez,jan|php/php-objc -- 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_3/ext/standard/tests/network/gethostbyaddr_basic1.phpt branches/PHP_5_4/ext/standard/tests/network/gethostbyaddr_basic1.phpt trunk/ext/standard/tests/networ
pajoye Mon, 05 Sep 2011 12:34:55 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316172 Log: - other hostname can be defined or returned first Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbyaddr_basic1.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/network/gethostbyaddr_basic1.phpt U php/php-src/trunk/ext/standard/tests/network/gethostbyaddr_basic1.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbyaddr_basic1.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbyaddr_basic1.phpt 2011-09-05 12:09:21 UTC (rev 316171) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbyaddr_basic1.phpt 2011-09-05 12:34:55 UTC (rev 316172) @@ -14,5 +14,5 @@ ===DONE=== --EXPECTF-- *** Testing gethostbyaddr() : basic functionality *** -%rloopback|localhost(\.localdomain)?%r -===DONE=== \ No newline at end of file +%rloopback|localhost(\.localdomain)?|%s%r +===DONE=== Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/network/gethostbyaddr_basic1.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/network/gethostbyaddr_basic1.phpt 2011-09-05 12:09:21 UTC (rev 316171) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/network/gethostbyaddr_basic1.phpt 2011-09-05 12:34:55 UTC (rev 316172) @@ -14,5 +14,5 @@ ===DONE=== --EXPECTF-- *** Testing gethostbyaddr() : basic functionality *** -%rloopback|localhost(\.localdomain)?%r -===DONE=== \ No newline at end of file +%rloopback|localhost(\.localdomain)?|%s%r +===DONE=== Modified: php/php-src/trunk/ext/standard/tests/network/gethostbyaddr_basic1.phpt === --- php/php-src/trunk/ext/standard/tests/network/gethostbyaddr_basic1.phpt 2011-09-05 12:09:21 UTC (rev 316171) +++ php/php-src/trunk/ext/standard/tests/network/gethostbyaddr_basic1.phpt 2011-09-05 12:34:55 UTC (rev 316172) @@ -14,5 +14,5 @@ ===DONE=== --EXPECTF-- *** Testing gethostbyaddr() : basic functionality *** -%rloopback|localhost(\.localdomain)?%r -===DONE=== \ No newline at end of file +%rloopback|localhost(\.localdomain)?|%s%r +===DONE=== -- 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_3/ext/standard/tests/network/ip2long_variation1.phpt branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt trunk/ext/standard/tests/network/ip
pajoye Mon, 05 Sep 2011 13:04:12 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316173 Log: - disable on win Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt U php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 12:34:55 UTC (rev 316172) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:04:12 UTC (rev 316173) @@ -1,5 +1,9 @@ --TEST-- Test ip2long() function : usage variation +?php +if(substr(PHP_OS, 0, 3) == WIN) + die(Windows is more compliant (like 0 for localhost, etc.)); +? --FILE-- ?php /* Prototype : int ip2long(string ip_address) Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 12:34:55 UTC (rev 316172) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:04:12 UTC (rev 316173) @@ -1,5 +1,9 @@ --TEST-- Test ip2long() function : usage variation +?php +if(substr(PHP_OS, 0, 3) == WIN) + die(Windows is more compliant (like 0 for localhost, etc.)); +? --FILE-- ?php /* Prototype : int ip2long(string ip_address) @@ -196,4 +200,4 @@ --resource-- Error: 2 - ip2long() expects parameter 1 to be string, resource given, %s(%d) NULL -===DONE=== \ No newline at end of file +===DONE=== Modified: php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt === --- php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 12:34:55 UTC (rev 316172) +++ php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:04:12 UTC (rev 316173) @@ -1,5 +1,9 @@ --TEST-- Test ip2long() function : usage variation +?php +if(substr(PHP_OS, 0, 3) == WIN) + die(Windows is more compliant (like 0 for localhost, etc.)); +? --FILE-- ?php /* Prototype : int ip2long(string ip_address) -- 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/mysqli/mysqli.c trunk/ext/mysqli/mysqli.c
johannes Mon, 05 Sep 2011 13:05:15 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316174 Log: Fix #ifdef for mixed builds (ext/mysql using myslqnd, mysqli using libmysql) Changed paths: U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c U php/php-src/trunk/ext/mysqli/mysqli.c Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c === --- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c2011-09-05 13:04:12 UTC (rev 316173) +++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c2011-09-05 13:05:15 UTC (rev 316174) @@ -838,7 +838,7 @@ #endif -#ifdef MYSQL_USE_MYSQLND +#ifdef MYSQLI_USE_MYSQLND mysqlnd_register_api_extension(mysqli_api_ext); #endif Modified: php/php-src/trunk/ext/mysqli/mysqli.c === --- php/php-src/trunk/ext/mysqli/mysqli.c 2011-09-05 13:04:12 UTC (rev 316173) +++ php/php-src/trunk/ext/mysqli/mysqli.c 2011-09-05 13:05:15 UTC (rev 316174) @@ -838,7 +838,7 @@ #endif -#ifdef MYSQL_USE_MYSQLND +#ifdef MYSQLI_USE_MYSQLND mysqlnd_register_api_extension(mysqli_api_ext); #endif -- 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_3/ext/standard/tests/network/ip2long_variation1.phpt branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt trunk/ext/standard/tests/network/ip
pajoye Mon, 05 Sep 2011 13:05:28 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316175 Log: - disable on win Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt U php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:05:15 UTC (rev 316174) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:05:28 UTC (rev 316175) @@ -1,5 +1,6 @@ --TEST-- Test ip2long() function : usage variation +--SKIPIF-- ?php if(substr(PHP_OS, 0, 3) == WIN) die(Windows is more compliant (like 0 for localhost, etc.)); Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:05:15 UTC (rev 316174) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:05:28 UTC (rev 316175) @@ -1,5 +1,6 @@ --TEST-- Test ip2long() function : usage variation +--SKIPIF-- ?php if(substr(PHP_OS, 0, 3) == WIN) die(Windows is more compliant (like 0 for localhost, etc.)); Modified: php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt === --- php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:05:15 UTC (rev 316174) +++ php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:05:28 UTC (rev 316175) @@ -1,5 +1,6 @@ --TEST-- Test ip2long() function : usage variation +--SKIPIF-- ?php if(substr(PHP_OS, 0, 3) == WIN) die(Windows is more compliant (like 0 for localhost, etc.)); -- 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_3/ext/standard/tests/network/ip2long_variation1.phpt branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt trunk/ext/standard/tests/network/ip
pajoye Mon, 05 Sep 2011 13:06:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316176 Log: - stupid me. Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt U php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:05:28 UTC (rev 316175) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:06:51 UTC (rev 316176) @@ -3,7 +3,7 @@ --SKIPIF-- ?php if(substr(PHP_OS, 0, 3) == WIN) - die(Windows is more compliant (like 0 for localhost, etc.)); + die(skip. Windows is more compliant (like 0 for localhost, etc.)); ? --FILE-- ?php Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:05:28 UTC (rev 316175) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:06:51 UTC (rev 316176) @@ -3,7 +3,7 @@ --SKIPIF-- ?php if(substr(PHP_OS, 0, 3) == WIN) - die(Windows is more compliant (like 0 for localhost, etc.)); + die(skip. Windows is more compliant (like 0 for localhost, etc.)); ? --FILE-- ?php Modified: php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt === --- php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:05:28 UTC (rev 316175) +++ php/php-src/trunk/ext/standard/tests/network/ip2long_variation1.phpt 2011-09-05 13:06:51 UTC (rev 316176) @@ -3,7 +3,7 @@ --SKIPIF-- ?php if(substr(PHP_OS, 0, 3) == WIN) - die(Windows is more compliant (like 0 for localhost, etc.)); + die(skip. Windows is more compliant (like 0 for localhost, etc.)); ? --FILE-- ?php -- 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/standard/tests/php_ini_loaded_file.phpt trunk/ext/standard/tests/php_ini_loaded_file.phpt
pajoye Mon, 05 Sep 2011 13:13:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316177 Log: - fix test, slash or back slash can be present Changed paths: U php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt U php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-05 13:06:51 UTC (rev 316176) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-05 13:13:37 UTC (rev 316177) @@ -11,4 +11,4 @@ var_dump(php_ini_loaded_file()); ? --EXPECTF-- -string(%d) %s/tmp-php.ini +string(%d) %stmp-php.ini Modified: php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt === --- php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-05 13:06:51 UTC (rev 316176) +++ php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-05 13:13:37 UTC (rev 316177) @@ -11,4 +11,4 @@ var_dump(php_ini_loaded_file()); ? --EXPECTF-- -string(%d) %s/tmp-php.ini +string(%d) %stmp-php.ini -- 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/standard/tests/streams/bug54623.phpt trunk/ext/standard/tests/streams/bug54623.phpt
pajoye Mon, 05 Sep 2011 13:23:25 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316178 Log: - syncfix test with 5.3 Changed paths: U php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt U php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt 2011-09-05 13:13:37 UTC (rev 316177) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt 2011-09-05 13:23:25 UTC (rev 316178) @@ -14,6 +14,4 @@ int(%d) int(%d) -Notice: fwrite(): send of 1 bytes failed with errno=61 Connection refused in %s on line %d - Warning: fwrite(): %d is not a valid stream resource in %s on line %d Modified: php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt === --- php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt 2011-09-05 13:13:37 UTC (rev 316177) +++ php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt 2011-09-05 13:23:25 UTC (rev 316178) @@ -14,6 +14,4 @@ int(%d) int(%d) -Notice: fwrite(): send of 1 bytes failed with errno=61 Connection refused in %s on line %d - Warning: fwrite(): %d is not a valid stream resource in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt trunk/ext/iconv/tests/iconv_stream_filter.phpt
Hi Hannes 2011/9/5 Hannes Magnusson bj...@php.net: bjori Mon, 05 Sep 2011 11:07:38 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316158 Log: Fix the test in 5.4 and trunk. older libraries will emmit error here, while new won't. So lets just suppress it rather then making the test uselessly fail for random people. Just for the record here, is this behaviour documented anywhere? -- regards, Kalle Sommer Nielsen ka...@php.net -- 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_3/ext/standard/tests/streams/bug54946.phpt branches/PHP_5_4/ext/standard/tests/streams/bug54946.phpt trunk/ext/standard/tests/streams/bug54946.phpt
pajoye Mon, 05 Sep 2011 13:31:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316179 Log: - close the stream before removing the file (win and other system may lock it) and use test dir for tmp data Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug54946.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54946.phpt U php/php-src/trunk/ext/standard/tests/streams/bug54946.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug54946.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug54946.phpt 2011-09-05 13:23:25 UTC (rev 316178) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug54946.phpt 2011-09-05 13:31:13 UTC (rev 316179) @@ -2,33 +2,32 @@ Bug#54946 stream_get_contents infinite loop --FILE-- ?php -$filename = tempnam(sys_get_temp_dir(), phpbug); - +$filename = tempnam(__DIR__, phpbug); $stream = fopen($filename, w); // w or a $retval = stream_get_contents($stream, 1, 1); - +fclose($stream); var_dump($retval); unlink($filename); -$filename = tempnam(sys_get_temp_dir(), phpbug2); +$filename = tempnam(__DIR__, phpbug2); $stream = fopen($filename, a); $retval = stream_get_contents($stream, 1, 1); - var_dump($retval); +fclose($stream); unlink($filename); -$filename = tempnam(sys_get_temp_dir(), phpbug3); +$filename = tempnam(__DIR__, phpbug3); $stream = fopen($filename, a); fseek($stream, 1); $retval = stream_get_contents($stream, 1); - var_dump($retval); +fclose($stream); unlink($filename); ? ===DONE=== Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54946.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54946.phpt 2011-09-05 13:23:25 UTC (rev 316178) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54946.phpt 2011-09-05 13:31:13 UTC (rev 316179) @@ -2,33 +2,32 @@ Bug#54946 stream_get_contents infinite loop --FILE-- ?php -$filename = tempnam(sys_get_temp_dir(), phpbug); - +$filename = tempnam(__DIR__, phpbug); $stream = fopen($filename, w); // w or a $retval = stream_get_contents($stream, 1, 1); - +fclose($stream); var_dump($retval); unlink($filename); -$filename = tempnam(sys_get_temp_dir(), phpbug2); +$filename = tempnam(__DIR__, phpbug2); $stream = fopen($filename, a); $retval = stream_get_contents($stream, 1, 1); - var_dump($retval); +fclose($stream); unlink($filename); -$filename = tempnam(sys_get_temp_dir(), phpbug3); +$filename = tempnam(__DIR__, phpbug3); $stream = fopen($filename, a); fseek($stream, 1); $retval = stream_get_contents($stream, 1); - var_dump($retval); +fclose($stream); unlink($filename); ? ===DONE=== Modified: php/php-src/trunk/ext/standard/tests/streams/bug54946.phpt === --- php/php-src/trunk/ext/standard/tests/streams/bug54946.phpt 2011-09-05 13:23:25 UTC (rev 316178) +++ php/php-src/trunk/ext/standard/tests/streams/bug54946.phpt 2011-09-05 13:31:13 UTC (rev 316179) @@ -2,33 +2,32 @@ Bug#54946 stream_get_contents infinite loop --FILE-- ?php -$filename = tempnam(sys_get_temp_dir(), phpbug); - +$filename = tempnam(__DIR__, phpbug); $stream = fopen($filename, w); // w or a $retval = stream_get_contents($stream, 1, 1); - +fclose($stream); var_dump($retval); unlink($filename); -$filename = tempnam(sys_get_temp_dir(), phpbug2); +$filename = tempnam(__DIR__, phpbug2); $stream = fopen($filename, a); $retval = stream_get_contents($stream, 1, 1); - var_dump($retval); +fclose($stream); unlink($filename); -$filename = tempnam(sys_get_temp_dir(), phpbug3); +$filename = tempnam(__DIR__, phpbug3); $stream = fopen($filename, a); fseek($stream, 1); $retval = stream_get_contents($stream, 1); - var_dump($retval); +fclose($stream); unlink($filename); ? ===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt trunk/ext/iconv/tests/iconv_stream_filter.phpt
On Mon, Sep 5, 2011 at 15:28, Kalle Sommer Nielsen ka...@php.net wrote: Hi Hannes 2011/9/5 Hannes Magnusson bj...@php.net: bjori Mon, 05 Sep 2011 11:07:38 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316158 Log: Fix the test in 5.4 and trunk. older libraries will emmit error here, while new won't. So lets just suppress it rather then making the test uselessly fail for random people. Just for the record here, is this behaviour documented anywhere? We generally don't document random warnings/notices, especially not when originating from 3rd party libs.. -Hannes -- 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/standard/tests/strings/006-win32.phpt branches/PHP_5_4/ext/standard/tests/strings/006.phpt trunk/ext/standard/tests/strings/006-win32.phpt trunk/ext/s
pajoye Mon, 05 Sep 2011 13:37:30 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316180
Log:
- use the same test on win
Changed paths:
D php/php-src/branches/PHP_5_4/ext/standard/tests/strings/006-win32.phpt
UU php/php-src/branches/PHP_5_4/ext/standard/tests/strings/006.phpt
D php/php-src/trunk/ext/standard/tests/strings/006-win32.phpt
UU php/php-src/trunk/ext/standard/tests/strings/006.phpt
Deleted: php/php-src/branches/PHP_5_4/ext/standard/tests/strings/006-win32.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/006-win32.phpt
2011-09-05 13:31:13 UTC (rev 316179)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/006-win32.phpt
2011-09-05 13:37:30 UTC (rev 316180)
@@ -1,23 +0,0 @@
---TEST--
-highlight_file() and output buffer
---SKIPIF--
-?php if( substr(PHP_OS, 0, 3) != WIN) die('skip Windows only test');?
---INI--
-log_errors_max_len=4096
---FILE--
-?php
-
-$file = str_repeat(A, 1024);
-
-var_dump(highlight_file($file, true));
-var_dump(ob_get_contents());
-
-?
-===DONE===
---EXPECTF--
-Warning:
highlight_file(!
): failed to open
stream: No such file or directory in %s on line %d
-
-Warning: highlight_file(): Failed opening
'A!
AAA'
for highlighting in %s on line %d
-bool(false)
-bool(false)
-===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/strings/006.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/006.phpt
2011-09-05 13:31:13 UTC (rev 316179)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/006.phpt
2011-09-05 13:37:30 UTC (rev 316180)
@@ -1,7 +1,5 @@
--TEST--
highlight_file() and output buffer
---SKIPIF--
-?php if( substr(PHP_OS, 0, 3) == WIN) die('skip Non windows test');?
--INI--
log_errors_max_len=4096
--FILE--
Property changes on:
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/006.phpt
___
Modified: svn:eol-style
- native
+ LF
Deleted: php/php-src/trunk/ext/standard/tests/strings/006-win32.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/006-win32.phpt 2011-09-05
13:31:13 UTC (rev 316179)
+++ php/php-src/trunk/ext/standard/tests/strings/006-win32.phpt 2011-09-05
13:37:30 UTC (rev 316180)
@@ -1,23 +0,0 @@
---TEST--
-highlight_file() and output buffer
---SKIPIF--
-?php if( substr(PHP_OS, 0, 3) != WIN) die('skip Windows only test');?
---INI--
-log_errors_max_len=4096
---FILE--
-?php
-
-$file = str_repeat(A, 1024);
-
-var_dump(highlight_file($file, true));
-var_dump(ob_get_contents());
-
-?
-===DONE===
---EXPECTF--
-Warning:
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/wddx/tests/bug48562.phpt branches/PHP_5_4/ext/wddx/tests/bug48562.phpt trunk/ext/wddx/tests/bug48562.phpt
pajoye Mon, 05 Sep 2011 13:41:01 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316181
Log:
- add skipif
Changed paths:
U php/php-src/branches/PHP_5_3/ext/wddx/tests/bug48562.phpt
U php/php-src/branches/PHP_5_4/ext/wddx/tests/bug48562.phpt
U php/php-src/trunk/ext/wddx/tests/bug48562.phpt
Modified: php/php-src/branches/PHP_5_3/ext/wddx/tests/bug48562.phpt
===
--- php/php-src/branches/PHP_5_3/ext/wddx/tests/bug48562.phpt 2011-09-05
13:37:30 UTC (rev 316180)
+++ php/php-src/branches/PHP_5_3/ext/wddx/tests/bug48562.phpt 2011-09-05
13:41:01 UTC (rev 316181)
@@ -1,5 +1,11 @@
--TEST--
Bug #48562 (Reference recursion causes segfault when used in
wddx_serialize_vars())
+--SKIPIF--
+?php
+if (!extension_loaded('wddx')) {
+die('skip. wddx not available');
+}
+?
--FILE--
?php
Modified: php/php-src/branches/PHP_5_4/ext/wddx/tests/bug48562.phpt
===
--- php/php-src/branches/PHP_5_4/ext/wddx/tests/bug48562.phpt 2011-09-05
13:37:30 UTC (rev 316180)
+++ php/php-src/branches/PHP_5_4/ext/wddx/tests/bug48562.phpt 2011-09-05
13:41:01 UTC (rev 316181)
@@ -1,5 +1,11 @@
--TEST--
Bug #48562 (Reference recursion causes segfault when used in
wddx_serialize_vars())
+--SKIPIF--
+?php
+if (!extension_loaded('wddx')) {
+die('skip. wddx not available');
+}
+?
--FILE--
?php
Modified: php/php-src/trunk/ext/wddx/tests/bug48562.phpt
===
--- php/php-src/trunk/ext/wddx/tests/bug48562.phpt 2011-09-05 13:37:30 UTC
(rev 316180)
+++ php/php-src/trunk/ext/wddx/tests/bug48562.phpt 2011-09-05 13:41:01 UTC
(rev 316181)
@@ -1,5 +1,11 @@
--TEST--
Bug #48562 (Reference recursion causes segfault when used in
wddx_serialize_vars())
+--SKIPIF--
+?php
+if (!extension_loaded('wddx')) {
+die('skip. wddx not available');
+}
+?
--FILE--
?php
--
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_3/ext/wddx/tests/bug52468.phpt branches/PHP_5_4/ext/wddx/tests/bug52468.phpt trunk/ext/wddx/tests/bug52468.phpt
pajoye Mon, 05 Sep 2011 13:52:24 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316182
Log:
- add skipif
Changed paths:
U php/php-src/branches/PHP_5_3/ext/wddx/tests/bug52468.phpt
U php/php-src/branches/PHP_5_4/ext/wddx/tests/bug52468.phpt
U php/php-src/trunk/ext/wddx/tests/bug52468.phpt
Modified: php/php-src/branches/PHP_5_3/ext/wddx/tests/bug52468.phpt
===
--- php/php-src/branches/PHP_5_3/ext/wddx/tests/bug52468.phpt 2011-09-05
13:41:01 UTC (rev 316181)
+++ php/php-src/branches/PHP_5_3/ext/wddx/tests/bug52468.phpt 2011-09-05
13:52:24 UTC (rev 316182)
@@ -1,5 +1,11 @@
--TEST--
Bug #52468 (wddx_deserialize corrupts integer field value when left empty)
+--SKIPIF--
+?php
+if (!extension_loaded('wddx')) {
+die('skip. wddx not available');
+}
+?
--FILE--
?php
Modified: php/php-src/branches/PHP_5_4/ext/wddx/tests/bug52468.phpt
===
--- php/php-src/branches/PHP_5_4/ext/wddx/tests/bug52468.phpt 2011-09-05
13:41:01 UTC (rev 316181)
+++ php/php-src/branches/PHP_5_4/ext/wddx/tests/bug52468.phpt 2011-09-05
13:52:24 UTC (rev 316182)
@@ -1,5 +1,11 @@
--TEST--
Bug #52468 (wddx_deserialize corrupts integer field value when left empty)
+--SKIPIF--
+?php
+if (!extension_loaded('wddx')) {
+die('skip. wddx not available');
+}
+?
--FILE--
?php
Modified: php/php-src/trunk/ext/wddx/tests/bug52468.phpt
===
--- php/php-src/trunk/ext/wddx/tests/bug52468.phpt 2011-09-05 13:41:01 UTC
(rev 316181)
+++ php/php-src/trunk/ext/wddx/tests/bug52468.phpt 2011-09-05 13:52:24 UTC
(rev 316182)
@@ -1,5 +1,11 @@
--TEST--
Bug #52468 (wddx_deserialize corrupts integer field value when left empty)
+--SKIPIF--
+?php
+if (!extension_loaded('wddx')) {
+die('skip. wddx not available');
+}
+?
--FILE--
?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt trunk/ext/iconv/tests/iconv_stream_filter.phpt
Hi We generally don't document random warnings/notices, especially not when originating from 3rd party libs.. kk, just wondering but I guess if it becomes a must then either a bug or user comment will appear regarding this. -- regards, Kalle Sommer Nielsen ka...@php.net -- 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_3/ext/standard/tests/file/fread_socket_variation1.phpt branches/PHP_5_4/ext/standard/tests/file/fread_socket_variation1.phpt trunk/ext/standard/tests/file/f
sheinMon, 05 Sep 2011 14:43:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316183
Log:
Reduced timeout in this test to 1ms, no need to wait further.
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fread_socket_variation1.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fread_socket_variation1.phpt
U php/php-src/trunk/ext/standard/tests/file/fread_socket_variation1.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fread_socket_variation1.phpt
===
---
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fread_socket_variation1.phpt
2011-09-05 13:52:24 UTC (rev 316182)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fread_socket_variation1.phpt
2011-09-05 14:43:08 UTC (rev 316183)
@@ -1,15 +1,11 @@
--TEST--
Testing fread() on a TCP server socket
---SKIPIF--
-?php
-if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
-?
--FILE--
?php
$tcp_socket = stream_socket_server('tcp://127.0.0.1:31337');
-socket_set_timeout($tcp_socket, 1);
+socket_set_timeout($tcp_socket, 0, 1000);
var_dump(fread($tcp_socket, 1));
Modified:
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fread_socket_variation1.phpt
===
---
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fread_socket_variation1.phpt
2011-09-05 13:52:24 UTC (rev 316182)
+++
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fread_socket_variation1.phpt
2011-09-05 14:43:08 UTC (rev 316183)
@@ -1,15 +1,11 @@
--TEST--
Testing fread() on a TCP server socket
---SKIPIF--
-?php
-if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
-?
--FILE--
?php
$tcp_socket = stream_socket_server('tcp://127.0.0.1:31337');
-socket_set_timeout($tcp_socket, 1);
+socket_set_timeout($tcp_socket, 0, 1000);
var_dump(fread($tcp_socket, 1));
Modified: php/php-src/trunk/ext/standard/tests/file/fread_socket_variation1.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/fread_socket_variation1.phpt
2011-09-05 13:52:24 UTC (rev 316182)
+++ php/php-src/trunk/ext/standard/tests/file/fread_socket_variation1.phpt
2011-09-05 14:43:08 UTC (rev 316183)
@@ -1,15 +1,11 @@
--TEST--
Testing fread() on a TCP server socket
---SKIPIF--
-?php
-if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
-?
--FILE--
?php
$tcp_socket = stream_socket_server('tcp://127.0.0.1:31337');
-socket_set_timeout($tcp_socket, 1);
+socket_set_timeout($tcp_socket, 0, 1000);
var_dump(fread($tcp_socket, 1));
--
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/filter/sanitizing_filters.c branches/PHP_5_4/ext/mysqlnd/mysqlnd_bt.c branches/PHP_5_4/ext/pdo/pdo.c trunk/ext/filter/sanitizing_filters.c trunk/ext/m
laruence Mon, 05 Sep 2011 15:02:21 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316185
Log:
Fixed compiler warning incompatible pointer type
Changed paths:
U php/php-src/branches/PHP_5_4/ext/filter/sanitizing_filters.c
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_bt.c
U php/php-src/branches/PHP_5_4/ext/pdo/pdo.c
U php/php-src/trunk/ext/filter/sanitizing_filters.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_bt.c
U php/php-src/trunk/ext/pdo/pdo.c
Modified: php/php-src/branches/PHP_5_4/ext/filter/sanitizing_filters.c
===
--- php/php-src/branches/PHP_5_4/ext/filter/sanitizing_filters.c
2011-09-05 14:52:23 UTC (rev 316184)
+++ php/php-src/branches/PHP_5_4/ext/filter/sanitizing_filters.c
2011-09-05 15:02:21 UTC (rev 316185)
@@ -250,7 +250,8 @@
void php_filter_full_special_chars(PHP_INPUT_FILTER_PARAM_DECL)
{
char *buf;
- int len, quotes;
+ size_t len;
+ int quotes;
if (!(flags FILTER_FLAG_NO_ENCODE_QUOTES)) {
quotes = ENT_QUOTES;
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_bt.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_bt.c 2011-09-05
14:52:23 UTC (rev 316184)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_bt.c 2011-09-05
15:02:21 UTC (rev 316185)
@@ -373,7 +373,7 @@
TRACE_APPEND_STR(Object();
- dupl = zend_get_object_classname(*arg, class_name,
class_name_len TSRMLS_CC);
+ dupl = zend_get_object_classname(*arg, (const char
**)class_name, class_name_len TSRMLS_CC);
TRACE_APPEND_STRL(class_name, class_name_len);
if (!dupl) {
Modified: php/php-src/branches/PHP_5_4/ext/pdo/pdo.c
===
--- php/php-src/branches/PHP_5_4/ext/pdo/pdo.c 2011-09-05 14:52:23 UTC (rev
316184)
+++ php/php-src/branches/PHP_5_4/ext/pdo/pdo.c 2011-09-05 15:02:21 UTC (rev
316185)
@@ -277,7 +277,7 @@
parsed[j].optval = estrndup(data_source
+ valstart, semi - valstart - n_semicolumns);
} else {
int vlen = semi - valstart;
- char *orig_val = data_source + valstart;
+ const char *orig_val = data_source +
valstart;
char *new_val = (char *) emalloc(vlen
- n_semicolumns + 1);
parsed[j].optval = new_val;
Modified: php/php-src/trunk/ext/filter/sanitizing_filters.c
===
--- php/php-src/trunk/ext/filter/sanitizing_filters.c 2011-09-05 14:52:23 UTC
(rev 316184)
+++ php/php-src/trunk/ext/filter/sanitizing_filters.c 2011-09-05 15:02:21 UTC
(rev 316185)
@@ -250,7 +250,8 @@
void php_filter_full_special_chars(PHP_INPUT_FILTER_PARAM_DECL)
{
char *buf;
- int len, quotes;
+ size_t len;
+ int quotes;
if (!(flags FILTER_FLAG_NO_ENCODE_QUOTES)) {
quotes = ENT_QUOTES;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_bt.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_bt.c 2011-09-05 14:52:23 UTC (rev
316184)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_bt.c 2011-09-05 15:02:21 UTC (rev
316185)
@@ -373,7 +373,7 @@
TRACE_APPEND_STR(Object();
- dupl = zend_get_object_classname(*arg, class_name,
class_name_len TSRMLS_CC);
+ dupl = zend_get_object_classname(*arg, (const char
**)class_name, class_name_len TSRMLS_CC);
TRACE_APPEND_STRL(class_name, class_name_len);
if (!dupl) {
Modified: php/php-src/trunk/ext/pdo/pdo.c
===
--- php/php-src/trunk/ext/pdo/pdo.c 2011-09-05 14:52:23 UTC (rev 316184)
+++ php/php-src/trunk/ext/pdo/pdo.c 2011-09-05 15:02:21 UTC (rev 316185)
@@ -277,7 +277,7 @@
parsed[j].optval = estrndup(data_source
+ valstart, semi - valstart - n_semicolumns);
} else {
int vlen = semi - valstart;
- char *orig_val = data_source + valstart;
+ const char *orig_val = data_source +
valstart;
char *new_val = (char *) emalloc(vlen
- n_semicolumns + 1);
parsed[j].optval = new_val;
--
PHP CVS Mailing List (http://www.php.net/)
To
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/phar/tests/fatal_error_webphar.phpt trunk/ext/phar/tests/fatal_error_webphar.phpt
laruence Mon, 05 Sep 2011 15:05:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316186 Log: Fixed tests (due to error message changed) Changed paths: U php/php-src/branches/PHP_5_4/ext/phar/tests/fatal_error_webphar.phpt U php/php-src/trunk/ext/phar/tests/fatal_error_webphar.phpt Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/fatal_error_webphar.phpt === --- php/php-src/branches/PHP_5_4/ext/phar/tests/fatal_error_webphar.phpt 2011-09-05 15:02:21 UTC (rev 316185) +++ php/php-src/branches/PHP_5_4/ext/phar/tests/fatal_error_webphar.phpt 2011-09-05 15:05:51 UTC (rev 316186) @@ -15,4 +15,4 @@ --EXPECTF-- string(9) \Web\View -Parse error: syntax error, unexpected 'echo' (T_ECHO), expecting function (T_FUNCTION) in phar:///%sfatal_error_webphar.php/Web/View.php on line 380 +Parse error: syntax error, unexpected echo (T_ECHO), expecting function (T_FUNCTION) in phar:///%sfatal_error_webphar.php/Web/View.php on line 380 Modified: php/php-src/trunk/ext/phar/tests/fatal_error_webphar.phpt === --- php/php-src/trunk/ext/phar/tests/fatal_error_webphar.phpt 2011-09-05 15:02:21 UTC (rev 316185) +++ php/php-src/trunk/ext/phar/tests/fatal_error_webphar.phpt 2011-09-05 15:05:51 UTC (rev 316186) @@ -15,4 +15,4 @@ --EXPECTF-- string(9) \Web\View -Parse error: syntax error, unexpected 'echo' (T_ECHO), expecting function (T_FUNCTION) in phar:///%sfatal_error_webphar.php/Web/View.php on line 380 +Parse error: syntax error, unexpected echo (T_ECHO), expecting function (T_FUNCTION) in phar:///%sfatal_error_webphar.php/Web/View.php on line 380 -- 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_3/NEWS branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h branches/PHP_5_3/ext/mysqli/mysqli_mysqlnd.h branches/PHP_5_3/
andrey Mon, 05 Sep 2011 15:29:45 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316188
Log:
Fix for Bug #55582 mysqli_num_rows() returns always 0 for unbuffered, when
mysqlnd is used
Bug: https://bugs.php.net/55582 (Open) mysqli_num_rows() returns always 0 for
unbuffered, when mysqlnd is used
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_mysqlnd.h
A php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug55582.phpt
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_api.c
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_mysqlnd.h
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_result_iterator.c
A php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_result.c
U php/php-src/trunk/ext/mysqli/mysqli_api.c
U php/php-src/trunk/ext/mysqli/mysqli_libmysql.h
U php/php-src/trunk/ext/mysqli/mysqli_mysqlnd.h
U php/php-src/trunk/ext/mysqli/mysqli_result_iterator.c
A php/php-src/trunk/ext/mysqli/tests/bug55582.phpt
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-09-05 15:11:48 UTC (rev 316187)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-09-05 15:29:45 UTC (rev 316188)
@@ -18,6 +18,10 @@
- MySQL:
. Fixed bug #0 (mysql.trace_mode miscounts result sets). (Johannes)
+- MySQLi extension:
+ . Fixed bug #55582 (mysqli_num_rows() returns always 0 for unbuffered, when
+ mysqlnd is used). (Andrey)
+
- mysqlnd
. Fixed bug #55067 (MySQL doesn't support compression - wrong config option).
(Andrey)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2011-09-05 15:11:48 UTC (rev 316187)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2011-09-05 15:29:45 UTC (rev 316188)
@@ -1608,7 +1608,7 @@
}
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, mysqli_result, MYSQLI_STATUS_VALID);
- if (mysqli_result_is_unbuffered(result)) {
+ if (mysqli_result_is_unbuffered_and_not_everything_is_fetched(result)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Function cannot be used with MYSQL_USE_RESULT);
RETURN_LONG(0);
}
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h 2011-09-05 15:11:48 UTC (rev 316187)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h 2011-09-05 15:29:45 UTC (rev 316188)
@@ -30,6 +30,7 @@
#define MYSQLND_OPT_INT_AND_YEAR_AS_INT201
#define mysqli_result_is_unbuffered(r) ((r)-handle (r)-handle-status == MYSQL_STATUS_USE_RESULT)
+#define mysqli_result_is_unbuffered_and_not_everything_is_fetched(r) (((r)-handle (r)-handle-status == MYSQL_STATUS_USE_RESULT) || ((r)-data == NULL))
#define mysqli_server_status(c)(c)-server_status
#define mysqli_stmt_get_id(s)((s)-stmt_id)
#define mysqli_stmt_warning_count(s) mysql_warning_count((s)-mysql)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_mysqlnd.h 2011-09-05 15:11:48 UTC (rev 316187)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_mysqlnd.h 2011-09-05 15:29:45 UTC (rev 316188)
@@ -31,6 +31,7 @@
#define MYSQLI_CLOSE_DISCONNECTED MYSQLND_CLOSE_DISCONNECTED
#define mysqli_result_is_unbuffered(r) ((r)-unbuf)
+#define mysqli_result_is_unbuffered_and_not_everything_is_fetched(r) ((r)-unbuf !(r)-unbuf-eof_reached)
#define mysqli_server_status(c) (c)-upsert_status.server_status
#define mysqli_stmt_get_id(s) ((s)-data-stmt_id)
#define mysqli_stmt_warning_count(s) mysqlnd_stmt_warning_count((s))
Added: php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug55582.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug55582.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug55582.phpt 2011-09-05 15:29:45 UTC (rev 316188)
@@ -0,0 +1,41 @@
+--TEST--
+Bug #55582 mysqli_num_rows() returns always 0 for unbuffered, when mysqlnd is used
+--SKIPIF--
+?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+require_once(connect.inc);
+?
+--FILE--
+?php
+ include connect.inc;
+ if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) {
+ printf([001]
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd_result.c
andrey Mon, 05 Sep 2011 15:37:58 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316189
Log:
missing from previous commit for #55582
Bug: https://bugs.php.net/55582 (Closed) mysqli_num_rows() returns always 0 for
unbuffered, when mysqlnd is used
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2011-09-05
15:29:45 UTC (rev 316188)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2011-09-05
15:37:58 UTC (rev 316189)
@@ -616,19 +616,18 @@
static unsigned long *
mysqlnd_fetch_lengths_unbuffered(MYSQLND_RES * const result TSRMLS_DC)
{
- return result-lengths;
+ /* simulate output of libmysql */
+ return (!result-unbuf || result-unbuf-last_row_data ||
result-unbuf-eof_reached)? result-lengths:NULL;
}
/* }}} */
-#if !defined(MYSQLND_USE_OPTIMISATIONS) || MYSQLND_USE_OPTIMISATIONS == 0
/* {{{ mysqlnd_res::fetch_lengths */
PHPAPI unsigned long * _mysqlnd_fetch_lengths(MYSQLND_RES * const result
TSRMLS_DC)
{
return result-m.fetch_lengths? result-m.fetch_lengths(result
TSRMLS_CC) : NULL;
}
/* }}} */
-#endif
/* {{{ mysqlnd_fetch_row_unbuffered_c */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/tests/connect.inc branches/PHP_5_3/ext/mysql/tests/mysql_affected_rows.phpt branches/PHP_5_3/ext/mysql/tests/mysql_insert_id.phpt branches/P
Hi! Am 04.09.2011 16:21, schrieb Tjerk Anne Meesters: datibbaw Sun, 04 Sep 2011 14:21:27 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316108 Log: Patch to run two more mysql test cases that would usually be skipped. Replaced skipifdefaultconnectionfailure.inc by three additional ini_set() statements in connect.inc for the default connection settings Patch also includes a typo in connect.inc concerning mysql.default_socket Please, revert! Two things get mixed together, accidently changing code flow, good and valid goal, but different implementation, please... a) Please, do no change connect.inc to allow tests to fool themselves. If testing default connections, do this on a per-test basis Default connections are evil and hard to debug. Generally speaking I do not want any test to be accidently fooled by a default connection, thus do not set defaults in connect.inc . At a quick look, I cannot tell why socket has been set in connect.inc. b) Code flow change Some functions, such as mysql_affected_rows(), attempt to open a default connection. The test starts with: if (0 !== ($tmp = @mysql_affected_rows())) The first assertion made covers: mysql_affected_rows() - no connection given - attempt to open default connection Before your change the test checked what happens if no default connection can be opened: mysql_affected_rows() - no connection given - attempt to open default connection - open fails - return After your change the test checks what happens if a default connection can be opened: mysql_affected_rows() - no connection given - attempt to open default connection - open success - return As you can see, you have changed the semantics of the test. Probably accidently, you have added an assertion not tested before but at the same time removed an assertion. Before your change three assertions have been checked: (1) mysql_affected_rows() - no connection given - attempt to open default connection - open fails - return (2) mysql_affected_rows() - valid connection given - return (3) mysql_affected_rows() - invalid connection given - return Due to your change (1) has been replaced with: (4) mysql_affected_rows() - no connection given - attempt to open default connection - open succeeds - return Now, if you did your changes in a way that 1-4 are covered, that would be wonderful. I'm actually a bit suprised of the result that one gets for (4). That will make a great new test. Thanks for the idea! However, please, revert this commit and do it right. Ulf -- 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_3/ext/mysqli/tests/mysqli_stmt_num_rows.phpt branches/PHP_5_4/ext/mysqli/tests/mysqli_stmt_num_rows.phpt trunk/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
uw Mon, 05 Sep 2011 16:24:40 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316190
Log:
No more test failure for libmysql, http://news.php.net/php.internals/55210
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
2011-09-05 15:37:58 UTC (rev 316189)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
2011-09-05 16:24:40 UTC (rev 316190)
@@ -82,7 +82,17 @@
$i++;
} while (mysqli_stmt_fetch($stmt));
- if (7 !== ($tmp = mysqli_stmt_num_rows($stmt)))
+ /* NOTE to users
+ Behaviour with libmysql is UNDEFINED, see
http://news.php.net/php.internals/55210
+ Because it is undefined it is allowed to the mysqlnd DEVELOPER
to implement
+ any behaviour they like, including the one checked for in this
test.
+ What the test does is cover an implementation detail of the
mysqlnd library.
+ This implementation detail may, at any time, change without
prior notice.
+ On the contrary, the mysqlnd way is a reasonable one and,
maybe, one fine
+ day, after Klingons visited earh, becomes the official one.
Meanwhile do
+ not rely on it.
+ */
+ if ($IS_MYSQLND (7 !== ($tmp = mysqli_stmt_num_rows($stmt
printf([54] Expecting int/7, got %s/%s\n,
gettype($tmp), $tmp);
} else {
Modified:
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
2011-09-05 15:37:58 UTC (rev 316189)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
2011-09-05 16:24:40 UTC (rev 316190)
@@ -82,7 +82,17 @@
$i++;
} while (mysqli_stmt_fetch($stmt));
- if (7 !== ($tmp = mysqli_stmt_num_rows($stmt)))
+ /* NOTE to users
+ Behaviour with libmysql is UNDEFINED, see
http://news.php.net/php.internals/55210
+ Because it is undefined it is allowed to the mysqlnd DEVELOPER
to implement
+ any behaviour they like, including the one checked for in this
test.
+ What the test does is cover an implementation detail of the
mysqlnd library.
+ This implementation detail may, at any time, change without
prior notice.
+ On the contrary, the mysqlnd way is a reasonable one and,
maybe, one fine
+ day, after Klingons visited earh, becomes the official one.
Meanwhile do
+ not rely on it.
+ */
+ if ($IS_MYSQLND (7 !== ($tmp = mysqli_stmt_num_rows($stmt
printf([54] Expecting int/7, got %s/%s\n,
gettype($tmp), $tmp);
} else {
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
===
--- php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
2011-09-05 15:37:58 UTC (rev 316189)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
2011-09-05 16:24:40 UTC (rev 316190)
@@ -82,7 +82,17 @@
$i++;
} while (mysqli_stmt_fetch($stmt));
- if (7 !== ($tmp = mysqli_stmt_num_rows($stmt)))
+ /* NOTE to users
+ Behaviour with libmysql is UNDEFINED, see
http://news.php.net/php.internals/55210
+ Because it is undefined it is allowed to the mysqlnd DEVELOPER
to implement
+ any behaviour they like, including the one checked for in this
test.
+ What the test does is cover an implementation detail of the
mysqlnd library.
+ This implementation detail may, at any time, change without
prior notice.
+ On the contrary, the mysqlnd way is a reasonable one and,
maybe, one fine
+ day, after Klingons visited earh, becomes the official one.
Meanwhile do
+ not rely on it.
+ */
+ if ($IS_MYSQLND (7 !== ($tmp = mysqli_stmt_num_rows($stmt
printf([54] Expecting int/7, got %s/%s\n,
gettype($tmp), $tmp);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: =?utf-8?q?svn:_/php/php-src/_branches/PHP=5F5=5F4/ext/xsl/tests/xsltprocessor=5FregisterPHPFunctions-funcnostring.phpt_branches/PHP=5F5=5F4/ext/xsl/tests/xsltprocessor=5FregisterPHPFunct
Just tested at home on x86 box, all tests pass. It seems I forgot to svn up before changing this, sorry again for messing things up. 2011/9/5 Alexey Shein con...@gmail.com: 2011/9/5 Christian Stocker christian.stoc...@liip.ch: Hi Why did you do that? They're different on purpose. I'll revert that, since the tests now fail. I spotted them on gcov.php.net (it's x64 box, see at the bottom http://gcov.php.net/viewer.php?version=PHP_5_4func=system), so I checked them on my x64 ubuntu laptop and they were failing too, that's why I fixed them this way. It seems gcov agrees with me, there's no failing xsl tests now: http://gcov.php.net/viewer.php?version=PHP_5_4func=tests (there are also some troubles with trunk section, it's outdated, maybe because its build is not finished yet after recent downtime, so it needs to be checked further). Now I checked your commit on x86 ubuntu and tests have passed, will check it again on x64-laptop when I got home. chregu On 9/2/11 8:01 PM, Shein Alexey wrote: shein Fri, 02 Sep 2011 18:01:20 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316043 Log: Synchronized fixed tests from 5.3 branch. Changed paths: U php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt U php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt U php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt U php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt Modified: php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt === --- php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 17:56:07 UTC (rev 316042) +++ php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 18:01:20 UTC (rev 316043) @@ -21,10 +21,17 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); +? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %s on line %d + +Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d + +Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d + +Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt === --- php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-02 17:56:07 UTC (rev 316042) +++ php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt 2011-09-02 18:01:20 UTC (rev 316043) @@ -20,10 +20,17 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); +? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Unable to call handler undefinedfunc() in %s on line %d + +Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d + +Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d + +Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified: php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt === --- php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 17:56:07 UTC (rev 316042) +++ php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt 2011-09-02 18:01:20 UTC (rev 316043) @@ -21,10 +21,17 @@ $proc-importStylesheet($phpfuncxsl); var_dump($proc-registerPHPFunctions()); var_dump($proc-transformToXml($dom)); +? --EXPECTF-- NULL Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %s on line %d + +Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d + +Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d + +Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d NULL --CREDITS-- Christian Weiske, cwei...@php.net Modified:
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/dom/tests/DOMDocument_loadHTML_error1.phpt branches/PHP_5_4/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt branches/PHP_5_4/ext/fileinfo/te
Hi! On 9/5/11 4:11 AM, Hannes Magnusson wrote: You broke the iconv/tests/iconv_stream_filter.phpt test for me :] According to the changelog for that test it is version dependent We can however simply suppress the errormessage for older versions, like I have done now. Could you verify it still works fine for you? Yes, this tests works for me in current SVN. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- 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_3/ext/xmlrpc/tests/bug51288.phpt branches/PHP_5_4/ext/xmlrpc/tests/bug51288.phpt trunk/ext/xmlrpc/tests/bug51288.phpt
pajoye Mon, 05 Sep 2011 19:59:42 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316193 Log: - add skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug51288.phpt U php/php-src/branches/PHP_5_4/ext/xmlrpc/tests/bug51288.phpt U php/php-src/trunk/ext/xmlrpc/tests/bug51288.phpt Modified: php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug51288.phpt === --- php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug51288.phpt 2011-09-05 19:43:55 UTC (rev 316192) +++ php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug51288.phpt 2011-09-05 19:59:42 UTC (rev 316193) @@ -1,5 +1,7 @@ --TEST-- Bug #51288 (CVE-2010-0397, NULL pointer deref when no methodName in request) +--SKIPIF-- +?php if (!extension_loaded(xmlrpc)) print skip; ? --FILE-- ?php $method = NULL; Modified: php/php-src/branches/PHP_5_4/ext/xmlrpc/tests/bug51288.phpt === --- php/php-src/branches/PHP_5_4/ext/xmlrpc/tests/bug51288.phpt 2011-09-05 19:43:55 UTC (rev 316192) +++ php/php-src/branches/PHP_5_4/ext/xmlrpc/tests/bug51288.phpt 2011-09-05 19:59:42 UTC (rev 316193) @@ -1,5 +1,7 @@ --TEST-- Bug #51288 (CVE-2010-0397, NULL pointer deref when no methodName in request) +--SKIPIF-- +?php if (!extension_loaded(xmlrpc)) print skip; ? --FILE-- ?php $method = NULL; Modified: php/php-src/trunk/ext/xmlrpc/tests/bug51288.phpt === --- php/php-src/trunk/ext/xmlrpc/tests/bug51288.phpt2011-09-05 19:43:55 UTC (rev 316192) +++ php/php-src/trunk/ext/xmlrpc/tests/bug51288.phpt2011-09-05 19:59:42 UTC (rev 316193) @@ -1,5 +1,7 @@ --TEST-- Bug #51288 (CVE-2010-0397, NULL pointer deref when no methodName in request) +--SKIPIF-- +?php if (!extension_loaded(xmlrpc)) print skip; ? --FILE-- ?php $method = 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
stas Tue, 06 Sep 2011 05:04:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316202 Log: report fix Changed paths: U php/php-src/branches/PHP_5_4/NEWS Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-09-06 02:34:38 UTC (rev 316201) +++ php/php-src/branches/PHP_5_4/NEWS 2011-09-06 05:04:37 UTC (rev 316202) @@ -29,6 +29,9 @@ . Added ReflectionClass::newInstanceWithoutConstructor() to create a new instance of a class without invoking its constructor. FR #55490. (Sebastian) +- Improved intl extension: + . Fixed bug #55562 (grapheme_substr() returns false on big length). (Stas) + - Improved JSON extension: . Added new json_encode() option JSON_UNESCAPED_UNICODE. FR #53946. (Irker, Gwynne) -- 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/mysqli/tests/bug55582.phpt trunk/ext/mysqli/tests/bug55582.phpt
stas Tue, 06 Sep 2011 05:13:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316203
Log:
this tests looks mysqlnd only
Changed paths:
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt
U php/php-src/trunk/ext/mysqli/tests/bug55582.phpt
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt 2011-09-06
05:04:37 UTC (rev 316202)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt 2011-09-06
05:13:47 UTC (rev 316203)
@@ -5,6 +5,7 @@
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
require_once(connect.inc);
+if(!$IS_MYSQLND) die(skip This bug is for mysqlnd only);
?
--FILE--
?php
@@ -38,4 +39,4 @@
int(0)
NULL
int(1)
-done
\ No newline at end of file
+done
Modified: php/php-src/trunk/ext/mysqli/tests/bug55582.phpt
===
--- php/php-src/trunk/ext/mysqli/tests/bug55582.phpt2011-09-06 05:04:37 UTC
(rev 316202)
+++ php/php-src/trunk/ext/mysqli/tests/bug55582.phpt2011-09-06 05:13:47 UTC
(rev 316203)
@@ -5,6 +5,7 @@
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
require_once(connect.inc);
+if(!$IS_MYSQLND) die(skip This bug is for mysqlnd only);
?
--FILE--
?php
@@ -38,4 +39,4 @@
int(0)
NULL
int(1)
-done
\ No newline at end of file
+done
--
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/mysqli/mysqli.c trunk/ext/mysqli/mysqli.c
stas Tue, 06 Sep 2011 05:20:05 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316204 Log: use DBUG_ON flag for checking debug # Some libmysql builds don't define DBUG_OFF and non-debug builds are more frequent Changed paths: U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c U php/php-src/trunk/ext/mysqli/mysqli.c Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c === --- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c2011-09-06 05:13:47 UTC (rev 316203) +++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c2011-09-06 05:20:05 UTC (rev 316204) @@ -809,10 +809,10 @@ #ifdef MYSQLI_USE_MYSQLND REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, MYSQLND_DBG_ENABLED, CONST_CS | CONST_PERSISTENT); #else -#ifndef DBUG_OFF +#ifdef DBUG_ON + REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, 1, CONST_CS | CONST_PERSISTENT); +#else REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, 0, CONST_CS | CONST_PERSISTENT); -#else - REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, 1, CONST_CS | CONST_PERSISTENT); #endif #endif Modified: php/php-src/trunk/ext/mysqli/mysqli.c === --- php/php-src/trunk/ext/mysqli/mysqli.c 2011-09-06 05:13:47 UTC (rev 316203) +++ php/php-src/trunk/ext/mysqli/mysqli.c 2011-09-06 05:20:05 UTC (rev 316204) @@ -809,10 +809,10 @@ #ifdef MYSQLI_USE_MYSQLND REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, MYSQLND_DBG_ENABLED, CONST_CS | CONST_PERSISTENT); #else -#ifndef DBUG_OFF +#ifdef DBUG_ON + REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, 1, CONST_CS | CONST_PERSISTENT); +#else REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, 0, CONST_CS | CONST_PERSISTENT); -#else - REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, 1, CONST_CS | CONST_PERSISTENT); #endif #endif -- 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/mysql/tests/mysql_query_load_data_openbasedir.phpt trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
stas Tue, 06 Sep 2011 05:20:51 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316205
Log:
fix test
Changed paths:
U
php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
U php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
Modified:
php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
===
---
php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
2011-09-06 05:20:05 UTC (rev 316204)
+++
php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
2011-09-06 05:20:51 UTC (rev 316205)
@@ -25,11 +25,10 @@
}
}
?
---INI--
-open_basedir=.
--FILE--
?php
@include_once(connect.inc);
+ini_set(open_basedir, __DIR__);
if (!isset($db)) {
// run-tests, I love you for not allowing me to set ini settings
dynamically
print [006] [1148] The used command is not allowed with this MySQL
version
Modified:
php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
===
--- php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
2011-09-06 05:20:05 UTC (rev 316204)
+++ php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
2011-09-06 05:20:51 UTC (rev 316205)
@@ -25,11 +25,10 @@
}
}
?
---INI--
-open_basedir=.
--FILE--
?php
@include_once(connect.inc);
+ini_set(open_basedir, __DIR__);
if (!isset($db)) {
// run-tests, I love you for not allowing me to set ini settings
dynamically
print [006] [1148] The used command is not allowed with this MySQL
version
--
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/pdo_mysql/tests/common.phpt trunk/ext/pdo_mysql/tests/common.phpt
stas Tue, 06 Sep 2011 05:21:56 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316206
Log:
fix redirect when test run from different places
Changed paths:
U php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/common.phpt
U php/php-src/trunk/ext/pdo_mysql/tests/common.phpt
Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/common.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/common.phpt
2011-09-06 05:20:51 UTC (rev 316205)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/common.phpt
2011-09-06 05:21:56 UTC (rev 316206)
@@ -8,7 +8,7 @@
# magic auto-configuration
$config = array(
- 'TESTS' = 'ext/pdo/tests'
+ 'TESTS' = __DIR__.'/ext/pdo/tests'
);
if (false !== getenv('PDO_MYSQL_TEST_DSN')) {
Modified: php/php-src/trunk/ext/pdo_mysql/tests/common.phpt
===
--- php/php-src/trunk/ext/pdo_mysql/tests/common.phpt 2011-09-06 05:20:51 UTC
(rev 316205)
+++ php/php-src/trunk/ext/pdo_mysql/tests/common.phpt 2011-09-06 05:21:56 UTC
(rev 316206)
@@ -8,7 +8,7 @@
# magic auto-configuration
$config = array(
- 'TESTS' = 'ext/pdo/tests'
+ 'TESTS' = __DIR__.'/ext/pdo/tests'
);
if (false !== getenv('PDO_MYSQL_TEST_DSN')) {
--
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/standard/filestat.c trunk/ext/standard/filestat.c
stas Tue, 06 Sep 2011 05:28:25 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316207
Log:
allow user streams to override ch* on windows too
Changed paths:
U php/php-src/branches/PHP_5_4/ext/standard/filestat.c
U php/php-src/trunk/ext/standard/filestat.c
Modified: php/php-src/branches/PHP_5_4/ext/standard/filestat.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/filestat.c2011-09-06
05:21:56 UTC (rev 316206)
+++ php/php-src/branches/PHP_5_4/ext/standard/filestat.c2011-09-06
05:28:25 UTC (rev 316207)
@@ -415,6 +415,7 @@
#endif
return SUCCESS;
}
+#endif
static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
{
@@ -450,11 +451,18 @@
RETURN_FALSE;
}
} else {
+#if !defined(WINDOWS)
+/* On Windows, we expect regular chgrp to fail silently by default */
php_error_docref(NULL TSRMLS_CC, E_WARNING, Can not
call chgrp() for a non-standard stream);
+#endif
RETURN_FALSE;
}
}
+#if defined(WINDOWS)
+ /* We have no native chgrp on Windows, nothing left to do if stream
doesn't have own implementation */
+ RETURN_FALSE;
+#else
if (Z_TYPE_P(group) == IS_LONG) {
gid = (gid_t)Z_LVAL_P(group);
} else if (Z_TYPE_P(group) == IS_STRING) {
@@ -484,20 +492,16 @@
RETURN_FALSE;
}
RETURN_TRUE;
+#endif
}
/* }}} */
-#endif
#ifndef NETWARE
/* {{{ proto bool chgrp(string filename, mixed group)
Change file group */
PHP_FUNCTION(chgrp)
{
-#if !defined(WINDOWS)
php_do_chgrp(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
-#else
- RETURN_FALSE;
-#endif
}
/* }}} */
@@ -546,6 +550,7 @@
#endif
return SUCCESS;
}
+#endif
static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
{
@@ -581,11 +586,19 @@
RETURN_FALSE;
}
} else {
+#if !defined(WINDOWS)
+/* On Windows, we expect regular chown to fail silently by default */
php_error_docref(NULL TSRMLS_CC, E_WARNING, Can not
call chown() for a non-standard stream);
+#endif
RETURN_FALSE;
}
}
+#if defined(WINDOWS)
+ /* We have no native chown on Windows, nothing left to do if stream
doesn't have own implementation */
+ RETURN_FALSE;
+#else
+
if (Z_TYPE_P(user) == IS_LONG) {
uid = (uid_t)Z_LVAL_P(user);
} else if (Z_TYPE_P(user) == IS_STRING) {
@@ -614,21 +627,18 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
strerror(errno));
RETURN_FALSE;
}
+ RETURN_TRUE;
+#endif
}
/* }}} */
-#endif
+
#ifndef NETWARE
/* {{{ proto bool chown (string filename, mixed user)
Change file owner */
PHP_FUNCTION(chown)
{
-#if !defined(WINDOWS)
- RETVAL_TRUE;
php_do_chown(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
-#else
- RETURN_FALSE;
-#endif
}
/* }}} */
Modified: php/php-src/trunk/ext/standard/filestat.c
===
--- php/php-src/trunk/ext/standard/filestat.c 2011-09-06 05:21:56 UTC (rev
316206)
+++ php/php-src/trunk/ext/standard/filestat.c 2011-09-06 05:28:25 UTC (rev
316207)
@@ -415,6 +415,7 @@
#endif
return SUCCESS;
}
+#endif
static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
{
@@ -450,11 +451,18 @@
RETURN_FALSE;
}
} else {
+#if !defined(WINDOWS)
+/* On Windows, we expect regular chgrp to fail silently by default */
php_error_docref(NULL TSRMLS_CC, E_WARNING, Can not
call chgrp() for a non-standard stream);
+#endif
RETURN_FALSE;
}
}
+#if defined(WINDOWS)
+ /* We have no native chgrp on Windows, nothing left to do if stream
doesn't have own implementation */
+ RETURN_FALSE;
+#else
if (Z_TYPE_P(group) == IS_LONG) {
gid = (gid_t)Z_LVAL_P(group);
} else if (Z_TYPE_P(group) == IS_STRING) {
@@ -484,20 +492,16 @@
RETURN_FALSE;
}
RETURN_TRUE;
+#endif
}
/* }}} */
-#endif
#ifndef NETWARE
/* {{{ proto bool chgrp(string filename, mixed group)
Change file group */
PHP_FUNCTION(chgrp)
{
-#if !defined(WINDOWS)
php_do_chgrp(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
-#else
- RETURN_FALSE;
-#endif
}
/* }}} */
@@ -546,6 +550,7 @@
#endif
return SUCCESS;
}
+#endif
static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
{
@@ -581,11 +586,19 @@
RETURN_FALSE;
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/filestat.c trunk/ext/standard/filestat.c
stas Tue, 06 Sep 2011 05:31:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316208
Log:
unused variables
Changed paths:
U php/php-src/branches/PHP_5_4/ext/standard/filestat.c
U php/php-src/trunk/ext/standard/filestat.c
Modified: php/php-src/branches/PHP_5_4/ext/standard/filestat.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/filestat.c2011-09-06
05:28:25 UTC (rev 316207)
+++ php/php-src/branches/PHP_5_4/ext/standard/filestat.c2011-09-06
05:31:08 UTC (rev 316208)
@@ -422,8 +422,10 @@
char *filename;
int filename_len;
zval *group;
+#if !defined(WINDOWS)
gid_t gid;
int ret;
+#endif
php_stream_wrapper *wrapper;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, pz/, filename,
filename_len, group) == FAILURE) {
@@ -557,8 +559,10 @@
char *filename;
int filename_len;
zval *user;
+#if !defined(WINDOWS)
uid_t uid;
int ret;
+#endif
php_stream_wrapper *wrapper;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, pz/, filename,
filename_len, user) == FAILURE) {
Modified: php/php-src/trunk/ext/standard/filestat.c
===
--- php/php-src/trunk/ext/standard/filestat.c 2011-09-06 05:28:25 UTC (rev
316207)
+++ php/php-src/trunk/ext/standard/filestat.c 2011-09-06 05:31:08 UTC (rev
316208)
@@ -422,8 +422,10 @@
char *filename;
int filename_len;
zval *group;
+#if !defined(WINDOWS)
gid_t gid;
int ret;
+#endif
php_stream_wrapper *wrapper;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, pz/, filename,
filename_len, group) == FAILURE) {
@@ -557,8 +559,10 @@
char *filename;
int filename_len;
zval *user;
+#if !defined(WINDOWS)
uid_t uid;
int ret;
+#endif
php_stream_wrapper *wrapper;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, pz/, filename,
filename_len, user) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
