pajoye Thu, 28 Jan 2010 00:05:37 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294127
Log:
- fix possible EOL conversion on svn co on windows
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt
U php/php-src/trunk/ext/standard/tests/file/fflush_basic.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt
2010-01-27 23:54:52 UTC (rev 294126)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt
2010-01-28 00:05:37 UTC (rev 294127)
@@ -20,6 +20,9 @@
$file_handle = fopen($filename, "w");
if($file_handle == false)
exit("Error:failed to open file $filename");
+if(substr(PHP_OS, 0, 3) == "WIN") {
+ $data = str_replace("\r",'', $data);
+}
// writing data to the file
var_dump( fwrite($file_handle, $data) );
Modified: php/php-src/trunk/ext/standard/tests/file/fflush_basic.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fflush_basic.phpt 2010-01-27
23:54:52 UTC (rev 294126)
+++ php/php-src/trunk/ext/standard/tests/file/fflush_basic.phpt 2010-01-28
00:05:37 UTC (rev 294127)
@@ -20,6 +20,9 @@
$file_handle = fopen($filename, "w");
if($file_handle == false)
exit("Error:failed to open file $filename");
+if(substr(PHP_OS, 0, 3) == "WIN") {
+ $data = str_replace("\r",'', $data);
+}
// writing data to the file
var_dump( fwrite($file_handle, $data) );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
