date:20110824

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/ldap/tests/ldap_control_paged_results_variation2.phpt trunk/ext/ldap/tests/ldap_control_paged_results_variation2.phpt

2011-08-24 Thread Scott MacVicar

scottmac Wed, 24 Aug 2011 06:50:39 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=315407

Log:
Fix typo in tests for ldap bug #42060

Bug: https://bugs.php.net/42060 (Feedback) [PATCH] LDAP: Add pagedResults 
support and more
  
Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/ldap/tests/ldap_control_paged_results_variation2.phpt
U   
php/php-src/trunk/ext/ldap/tests/ldap_control_paged_results_variation2.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/ldap/tests/ldap_control_paged_results_variation2.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/ldap/tests/ldap_control_paged_results_variation2.phpt
  2011-08-24 06:47:08 UTC (rev 315406)
+++ 
php/php-src/branches/PHP_5_4/ext/ldap/tests/ldap_control_paged_results_variation2.phpt
  2011-08-24 06:50:39 UTC (rev 315407)
@@ -1,5 +1,5 @@
 --TEST--
-ldap_ldap_control_paged_results() test (fetching the first page with a 
pagesize=2)
+ldap_ldap_control_paged_result() test (fetching the first page with a 
pagesize=2)
 --CREDITS--
 Jean-Sebastien Hedde jean...@au-fil-du.net
 --SKIPIF--
@@ -17,7 +17,7 @@
 $dn = dc=my-domain,dc=com;
 $filter = (cn=*);
 var_dump(
-   ldap_control_paged_results($link, 2),
+   ldap_control_paged_result($link, 2),
$result = ldap_search($link, $dn, $filter, array('cn')),
ldap_get_entries($link, $result)
 );

Modified: 
php/php-src/trunk/ext/ldap/tests/ldap_control_paged_results_variation2.phpt
===
--- php/php-src/trunk/ext/ldap/tests/ldap_control_paged_results_variation2.phpt 
2011-08-24 06:47:08 UTC (rev 315406)
+++ php/php-src/trunk/ext/ldap/tests/ldap_control_paged_results_variation2.phpt 
2011-08-24 06:50:39 UTC (rev 315407)
@@ -1,5 +1,5 @@
 --TEST--
-ldap_ldap_control_paged_results() test (fetching the first page with a 
pagesize=2)
+ldap_ldap_control_paged_result() test (fetching the first page with a 
pagesize=2)
 --CREDITS--
 Jean-Sebastien Hedde jean...@au-fil-du.net
 --SKIPIF--
@@ -17,7 +17,7 @@
 $dn = dc=my-domain,dc=com;
 $filter = (cn=*);
 var_dump(
-   ldap_control_paged_results($link, 2),
+   ldap_control_paged_result($link, 2),
$result = ldap_search($link, $dn, $filter, array('cn')),
ldap_get_entries($link, $result)
 );

-- 
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/ mysql/tests/bug55473.phpt mysql/tests/mysql_pconn_kill.phpt mysqlnd/mysqlnd_net.c

2011-08-24 Thread Xinchen Hui

laruence Wed, 24 Aug 2011 08:00:23 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=315410

Log:
Apply r315270 to 5.3
Fixed test script failed when host mysql doesn't listen on 3306
Fxied test script failed due to mysql_pconnect trigger a warning

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysql/tests/bug55473.phpt
U   php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_pconn_kill.phpt
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c

Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/bug55473.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysql/tests/bug55473.phpt  2011-08-24 
07:29:23 UTC (rev 315409)
+++ php/php-src/branches/PHP_5_3/ext/mysql/tests/bug55473.phpt  2011-08-24 
08:00:23 UTC (rev 315410)
@@ -15,6 +15,11 @@
 ?php
include connect.inc;

+if ($socket)
+$host = sprintf(%s:%s, $host, $socket);
+else if ($port)
+$host = sprintf(%s:%s, $host, $port);
+
$tmp= NULL;
$link   = NULL;

@@ -68,4 +73,4 @@
 Warning: mysql_ping(): MySQL server has gone away in %s on line %d
 reconnect
 OK
-done!
\ No newline at end of file
+done!

Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_pconn_kill.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_pconn_kill.phpt  
2011-08-24 07:29:23 UTC (rev 315409)
+++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_pconn_kill.phpt  
2011-08-24 08:00:23 UTC (rev 315410)
@@ -64,7 +64,9 @@

mysql_close($plink);

-   if (!($plink = mysql_pconnect($myhost, $user, $passwd)))
+   /* mysql_pconnect cound generate a warning when linked against mysqlnd
+   PHP Warning:  mysql_pconnect(): MySQL server has gone away */
+   if (!($plink = @mysql_pconnect($myhost, $user, $passwd)))
printf([009] Cannot create new persistent connection, [%d] 
%s\n, mysql_errno(), mysql_error());
mysql_select_db($db, $plink);


Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c  2011-08-24 
07:29:23 UTC (rev 315409)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c  2011-08-24 
08:00:23 UTC (rev 315410)
@@ -120,6 +120,17 @@

net-packet_no = net-compressed_envelope_packet_no = 0;

+   if (net-stream) {
+   /* close before opening a new one */
+   DBG_INF_FMT(Freeing stream. abstract=%p, 
net-stream-abstract);
+   if (net-persistent) {
+   php_stream_free(net-stream, 
PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);
+   } else {
+   php_stream_free(net-stream, PHP_STREAM_FREE_CLOSE);
+   }
+   net-stream = NULL;
+   }
+
if (net-options.timeout_connect) {
tv.tv_sec = net-options.timeout_connect;
tv.tv_usec = 0;

-- 
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/bug55473.phpt branches/PHP_5_4/ext/mysql/tests/mysql_pconn_kill.phpt branches/PHP_5_4/ext/mysqlnd/mysqlnd_charset.c trunk/ext/mysql/tests/

2011-08-24 Thread Xinchen Hui

laruence Wed, 24 Aug 2011 10:15:47 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=315414

Log:
Eliminated compile warning comparison is always false due to limited range of 
data type
Fixed test failed due to mysql_pconnect throw warning
Fixed test failed when host mysql server doesn't listen on 3306

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/mysql/tests/bug55473.phpt
U   php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_pconn_kill.phpt
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_charset.c
U   php/php-src/trunk/ext/mysql/tests/bug55473.phpt
U   php/php-src/trunk/ext/mysql/tests/mysql_pconn_kill.phpt
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_charset.c

Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/bug55473.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysql/tests/bug55473.phpt  2011-08-24 
10:05:10 UTC (rev 315413)
+++ php/php-src/branches/PHP_5_4/ext/mysql/tests/bug55473.phpt  2011-08-24 
10:15:47 UTC (rev 315414)
@@ -18,6 +18,11 @@
$tmp= NULL;
$link   = NULL;

+   if ($socket)
+$host = sprintf(%s:%s, $host, $socket);
+else if ($port)
+$host = sprintf(%s:%s, $host, $port);
+
function connect($host, $user, $passwd) {
$conn = mysql_pconnect($host, $user, $passwd);
if (!$conn)
@@ -68,4 +73,4 @@
 Warning: mysql_ping(): MySQL server has gone away in %s on line %d
 reconnect
 OK
-done!
\ No newline at end of file
+done!

Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_pconn_kill.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_pconn_kill.phpt  
2011-08-24 10:05:10 UTC (rev 315413)
+++ php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_pconn_kill.phpt  
2011-08-24 10:15:47 UTC (rev 315414)
@@ -64,7 +64,7 @@

mysql_close($plink);

-   if (!($plink = mysql_pconnect($myhost, $user, $passwd)))
+   if (!($plink = @mysql_pconnect($myhost, $user, $passwd)))
printf([009] Cannot create new persistent connection, [%d] 
%s\n, mysql_errno(), mysql_error());
mysql_select_db($db, $plink);


Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_charset.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_charset.c  2011-08-24 
10:05:10 UTC (rev 315413)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_charset.c  2011-08-24 
10:15:47 UTC (rev 315414)
@@ -126,8 +126,8 @@
if (!((start[1] ^ 0x80)  0x40 
(start[2] ^ 0x80)  0x40 
(start[3] ^ 0x80)  0x40 
-   (c = 0xf1 || start[1] = 0x90) 
-   (c = 0xf3 || start[1] = 0x8F)))
+   (c = 0xf1 || start[1] = (char)0x90) 
+   (c = 0xf3 || start[1] = (char)0x8F)))
{
return 0;   /* invalid utf8 character */
}

Modified: php/php-src/trunk/ext/mysql/tests/bug55473.phpt
===
--- php/php-src/trunk/ext/mysql/tests/bug55473.phpt 2011-08-24 10:05:10 UTC 
(rev 315413)
+++ php/php-src/trunk/ext/mysql/tests/bug55473.phpt 2011-08-24 10:15:47 UTC 
(rev 315414)
@@ -18,6 +18,11 @@
$tmp= NULL;
$link   = NULL;

+   if ($socket)
+$host = sprintf(%s:%s, $host, $socket);
+else if ($port)
+$host = sprintf(%s:%s, $host, $port);
+
function connect($host, $user, $passwd) {
$conn = mysql_pconnect($host, $user, $passwd);
if (!$conn)
@@ -68,4 +73,4 @@
 Warning: mysql_ping(): MySQL server has gone away in %s on line %d
 reconnect
 OK
-done!
\ No newline at end of file
+done!

Modified: php/php-src/trunk/ext/mysql/tests/mysql_pconn_kill.phpt
===
--- php/php-src/trunk/ext/mysql/tests/mysql_pconn_kill.phpt 2011-08-24 
10:05:10 UTC (rev 315413)
+++ php/php-src/trunk/ext/mysql/tests/mysql_pconn_kill.phpt 2011-08-24 
10:15:47 UTC (rev 315414)
@@ -64,7 +64,7 @@

mysql_close($plink);

-   if (!($plink = mysql_pconnect($myhost, $user, $passwd)))
+   if (!($plink = @mysql_pconnect($myhost, $user, $passwd)))
printf([009] Cannot create new persistent connection, [%d] 
%s\n, mysql_errno(), mysql_error());
mysql_select_db($db, $plink);


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_charset.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_charset.c 2011-08-24 10:05:10 UTC 
(rev 315413)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_charset.c 2011-08-24 10:15:47 UTC 
(rev 315414)
@@ -126,8 +126,8 @@
if

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/dom/tests/ DOMDocument_relaxNGValidate_error2.phpt

2011-08-24 Thread Shein Alexey

sheinWed, 24 Aug 2011 12:25:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=315418

Log:
Fixed failed test to take into account printed warnings like in 5.4 and trunk 
branches.

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
  2011-08-24 12:11:39 UTC (rev 315417)
+++ 
php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
  2011-08-24 12:25:30 UTC (rev 315418)
@@ -23,3 +23,9 @@
 ?
 --EXPECTF--

+Warning: DOMDocument::relaxNGValidate(): I/O warning : failed to load external 
entity %s/foo.rng in %s on line %d
+
+Warning: DOMDocument::relaxNGValidate(): xmlRelaxNGParse: could not load 
%s/foo.rng in %s on line %d
+
+Warning: DOMDocument::relaxNGValidate(): Invalid RelaxNG in %s on line %d
+bool(false)

-- 
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/tests/lang/ bug45392.phpt

2011-08-24 Thread Joey Smith

joey Wed, 24 Aug 2011 15:56:12 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=315430

Log:
Fix tests/lang/bug45392.phpt to log expected error when run with -n flag

Bug: https://bugs.php.net/45392 (Closed) ob_start()/ob_end_clean() and 
memory_limit
  
Changed paths:
U   php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt

Modified: php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt
===
--- php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt   2011-08-24 
15:32:42 UTC (rev 315429)
+++ php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt   2011-08-24 
15:56:12 UTC (rev 315430)
@@ -6,6 +6,7 @@
 ?php
 echo __LINE__ . \n;
 ini_set('memory_limit', 100);
+ini_set('log_errors', 1);
 ob_start();
 $i = 0;
 while($i++  5000)  {

-- 
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/tests/lang/ bug45392.phpt

2011-08-24 Thread Joey Smith

joey Wed, 24 Aug 2011 16:15:35 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=315436

Log:
Revert my previous change - getting different results in different 
environments, shouldn't have committed it

Changed paths:
U   php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt

Modified: php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt
===
--- php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt   2011-08-24 
16:15:05 UTC (rev 315435)
+++ php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt   2011-08-24 
16:15:35 UTC (rev 315436)
@@ -6,7 +6,6 @@
 ?php
 echo __LINE__ . \n;
 ini_set('memory_limit', 100);
-ini_set('log_errors', 1);
 ob_start();
 $i = 0;
 while($i++  5000)  {

-- 
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/ldap/tests/ldap_control_paged_results_variation2.phpt trunk/ext/ldap/tests/ldap_control_paged_results_variation2.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/ mysql/tests/bug55473.phpt mysql/tests/mysql_pconn_kill.phpt mysqlnd/mysqlnd_net.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysql/tests/bug55473.phpt branches/PHP_5_4/ext/mysql/tests/mysql_pconn_kill.phpt branches/PHP_5_4/ext/mysqlnd/mysqlnd_charset.c trunk/ext/mysql/tests/

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/dom/tests/ DOMDocument_relaxNGValidate_error2.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/tests/lang/ bug45392.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/tests/lang/ bug45392.phpt

6 matches

Site Navigation

Mail list logo

Footer information