nlopess         Fri Nov 24 20:18:55 2006 UTC

  Added files:                 (Branch: PHP_5_2)
    /php-src/ext/standard/tests/general_functions       phpcredits.phpt 
                                                        phpcredits2.phpt 
                                                        phpinfo.phpt 
                                                        phpinfo2.phpt 
    /php-src/ext/ftp/tests      006.phpt 

  Modified files:              
    /php-src/ext/ftp/tests      bug39583.phpt server.inc 
  Log:
  more tests
  
http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/bug39583.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/ftp/tests/bug39583.phpt
diff -u php-src/ext/ftp/tests/bug39583.phpt:1.1.2.1 
php-src/ext/ftp/tests/bug39583.phpt:1.1.2.2
--- php-src/ext/ftp/tests/bug39583.phpt:1.1.2.1 Fri Nov 24 15:47:45 2006
+++ php-src/ext/ftp/tests/bug39583.phpt Fri Nov 24 20:18:54 2006
@@ -6,6 +6,7 @@
 ?>
 --FILE--
 <?php
+$bug39583=1;
 require 'server.inc';
 
 $ftp = ftp_connect('127.0.0.1', $port);
http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/server.inc?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/ftp/tests/server.inc
diff -u php-src/ext/ftp/tests/server.inc:1.1.2.4 
php-src/ext/ftp/tests/server.inc:1.1.2.5
--- php-src/ext/ftp/tests/server.inc:1.1.2.4    Fri Nov 24 15:47:45 2006
+++ php-src/ext/ftp/tests/server.inc    Fri Nov 24 20:18:54 2006
@@ -187,7 +187,7 @@
                if (isset($ascii) && !$ascii && $orig === $data) {
                        fputs($s, "226 Closing data Connection.\r\n");
 
-               } elseif (!empty($ascii) && $data === strtr($orig, array("\r\n" 
=> "\n", "\r" => "\n", "\n" => "\r\n"))) {
+               } elseif ((!empty($ascii) || isset($bug39583)) && $data === 
strtr($orig, array("\r\n" => "\n", "\r" => "\n", "\n" => "\r\n"))) {
                        fputs($s, "226 Closing data Connection.\r\n");
 
                } else {

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

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

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

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

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

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

Reply via email to