tony2001                Thu Mar 20 08:35:11 2008 UTC

  Modified files:              
    /php-src/ext/standard/tests/streams 
                                        stream_get_meta_data_socket_basic.phpt 
                                        
stream_get_meta_data_socket_variation1.phpt 
                                        
stream_get_meta_data_socket_variation2.phpt 
                                        
stream_get_meta_data_socket_variation3.phpt 
                                        
stream_get_meta_data_socket_variation4.phpt 
  Log:
  fix tests (tcp_socket is tcp_socket/ssl when/if openssl is enabled)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt:1.1 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt:1.2
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt:1.1   
    Wed Mar 19 17:38:20 2008
+++ php-src/ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt   
Thu Mar 20 08:35:11 2008
@@ -11,7 +11,7 @@
 --EXPECT--
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -30,7 +30,7 @@
 --UEXPECT--
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt?r1=1.1&r2=1.2&diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.1
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.2
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.1
  Wed Mar 19 17:38:20 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt  
    Thu Mar 20 08:35:11 2008
@@ -37,7 +37,7 @@
 Write some data:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -58,7 +58,7 @@
 Read a line from the client, causing data to be buffered:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -79,7 +79,7 @@
 Read 3 bytes of data from the client:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -100,7 +100,7 @@
 Close the server side socket and read the remaining data from the client:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -122,7 +122,7 @@
 Notice: fwrite(): 23 character unicode buffer downcoded for binary stream 
runtime_encoding in %s on line %d
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -143,7 +143,7 @@
 Read a line from the client, causing data to be buffered:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -164,7 +164,7 @@
 Read 3 bytes of data from the client:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -185,7 +185,7 @@
 Close the server side socket and read the remaining data from the client:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt?r1=1.1&r2=1.2&diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.1
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.2
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.1
  Wed Mar 19 17:38:20 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt  
    Thu Mar 20 08:35:11 2008
@@ -35,7 +35,7 @@
 --EXPECT--
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -56,7 +56,7 @@
 Set a timeout on the client and attempt a read:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -77,7 +77,7 @@
 Write some data from the server:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -98,7 +98,7 @@
 Read some data from the client:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -117,7 +117,7 @@
 --UEXPECTF--
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -138,7 +138,7 @@
 Set a timeout on the client and attempt a read:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -161,7 +161,7 @@
 Notice: fwrite(): 5 character unicode buffer downcoded for binary stream 
runtime_encoding in %s on line %d
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -182,7 +182,7 @@
 Read some data from the client:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt?r1=1.1&r2=1.2&diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.1
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.2
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.1
  Wed Mar 19 17:38:20 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt  
    Thu Mar 20 08:35:11 2008
@@ -30,7 +30,7 @@
 --EXPECT--
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -52,7 +52,7 @@
 bool(true)
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -74,7 +74,7 @@
 bool(true)
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -93,7 +93,7 @@
 --UEXPECT--
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -115,7 +115,7 @@
 bool(true)
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -137,7 +137,7 @@
 bool(true)
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt?r1=1.1&r2=1.2&diff_format=u
Index: 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
diff -u 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.1
 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.2
--- 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.1
  Wed Mar 19 17:38:20 2008
+++ 
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt  
    Thu Mar 20 08:35:11 2008
@@ -35,7 +35,7 @@
 Write some data:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -56,7 +56,7 @@
 Read a line from the client:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -77,7 +77,7 @@
 Close the server side socket and read the remaining data from the client:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -99,7 +99,7 @@
 Notice: fwrite(): 23 character unicode buffer downcoded for binary stream 
runtime_encoding in %s on line %d
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -120,7 +120,7 @@
 Read a line from the client:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -141,7 +141,7 @@
 Close the server side socket and read the remaining data from the client:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>

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

Reply via email to