date:20120109

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/mkdist.php branches/PHP_5_4/win32/build/mkdist.php trunk/win32/build/mkdist.php

2012-01-09 Thread Pierre Joye

pajoye   Mon, 09 Jan 2012 13:56:46 +

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

Log:
- spl tests are also under examples (sigh)

Changed paths:
U   php/php-src/branches/PHP_5_3/win32/build/mkdist.php
U   php/php-src/branches/PHP_5_4/win32/build/mkdist.php
U   php/php-src/trunk/win32/build/mkdist.php

Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2012-01-09 13:16:02 UTC 
(rev 321951)
+++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2012-01-09 13:56:46 UTC 
(rev 321952)
@@ -382,7 +382,7 @@
$directory = substr($directory,0,-1);
}

-   if ($directory == 'tests') {
+   if ($directory == 'tests' || $directory == 'examples') {
if (!is_dir($dest . '/tests')) {
mkdir($dest . '/tests', 0775, true);
}

Modified: php/php-src/branches/PHP_5_4/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_4/win32/build/mkdist.php 2012-01-09 13:16:02 UTC 
(rev 321951)
+++ php/php-src/branches/PHP_5_4/win32/build/mkdist.php 2012-01-09 13:56:46 UTC 
(rev 321952)
@@ -382,7 +382,7 @@
$directory = substr($directory,0,-1);
}

-   if ($directory == 'tests') {
+   if ($directory == 'tests' || $directory == 'examples') {
if (!is_dir($dest . '/tests')) {
mkdir($dest . '/tests', 0775, true);
}

Modified: php/php-src/trunk/win32/build/mkdist.php
===
--- php/php-src/trunk/win32/build/mkdist.php2012-01-09 13:16:02 UTC (rev 
321951)
+++ php/php-src/trunk/win32/build/mkdist.php2012-01-09 13:56:46 UTC (rev 
321952)
@@ -382,7 +382,7 @@
$directory = substr($directory,0,-1);
}

-   if ($directory == 'tests') {
+   if ($directory == 'tests' || $directory == 'examples') {
if (!is_dir($dest . '/tests')) {
mkdir($dest . '/tests', 0775, 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_4/tests/basic/bug46313-win.phpt trunk/tests/basic/bug46313-win.phpt

2012-01-09 Thread Pierre Joye

pajoye   Mon, 09 Jan 2012 14:29:06 +

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

Log:
- rm

Changed paths:
D   php/php-src/branches/PHP_5_4/tests/basic/bug46313-win.phpt
D   php/php-src/trunk/tests/basic/bug46313-win.phpt

Deleted: php/php-src/branches/PHP_5_4/tests/basic/bug46313-win.phpt
===
--- php/php-src/branches/PHP_5_4/tests/basic/bug46313-win.phpt  2012-01-09 
13:56:46 UTC (rev 321952)
+++ php/php-src/branches/PHP_5_4/tests/basic/bug46313-win.phpt  2012-01-09 
14:29:06 UTC (rev 321953)
@@ -1,62 +0,0 @@
---TEST--
-Bug #46313 (Magic quotes broke $_FILES)
---SKIPIF--
-?php if(substr(PHP_OS, 0, 3) != WIN) die(skip Windows-only test); ?
---INI--
-file_uploads=1
---POST_RAW--
-Content-Type: multipart/form-data; 
boundary=---20896060251896012921717172737
--20896060251896012921717172737
-Content-Disposition: form-data; name=o1'file; filename=o1'file.png
-Content-Type: text/plain-file1
-
-1
--20896060251896012921717172737
-Content-Disposition: form-data; name=o2'file; filename=o2'file2.txt
-Content-Type: text/plain-file2
-
-2
--20896060251896012921717172737--
---FILE--
-?php
-var_dump($_FILES);
-var_dump($GLOBALS[o1\'file_name]);
-var_dump($GLOBALS[o1\'file_name] === $_FILES[o1\'file][name]);
-var_dump($GLOBALS[o1\'file]);
-var_dump($GLOBALS[o1\'file] === $_FILES[o1\'file][tmp_name]);
-?
---EXPECTF--
-array(2) {
-  [o1\'file]=
-  array(5) {
-[name]=
-string(12) o1
-[type]=
-string(16) text/plain-file1
-[tmp_name]=
-string(14) %s
-[error]=
-int(0)
-[size]=
-int(1)
-  }
-  [o2\'file]=
-  array(5) {
-[name]=
-string(13) o2
-[type]=
-string(16) text/plain-file2
-[tmp_name]=
-string(14) %s
-[error]=
-int(0)
-[size]=
-int(1)
-  }
-}
-string(12) o1
-bool(true)
-string(%d) %s
-bool(true)
-Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in 
Unknown on line 0
-Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in 
Unknown on line 0

Deleted: php/php-src/trunk/tests/basic/bug46313-win.phpt
===
--- php/php-src/trunk/tests/basic/bug46313-win.phpt 2012-01-09 13:56:46 UTC 
(rev 321952)
+++ php/php-src/trunk/tests/basic/bug46313-win.phpt 2012-01-09 14:29:06 UTC 
(rev 321953)
@@ -1,62 +0,0 @@
---TEST--
-Bug #46313 (Magic quotes broke $_FILES)
---SKIPIF--
-?php if(substr(PHP_OS, 0, 3) != WIN) die(skip Windows-only test); ?
---INI--
-file_uploads=1
---POST_RAW--
-Content-Type: multipart/form-data; 
boundary=---20896060251896012921717172737
--20896060251896012921717172737
-Content-Disposition: form-data; name=o1'file; filename=o1'file.png
-Content-Type: text/plain-file1
-
-1
--20896060251896012921717172737
-Content-Disposition: form-data; name=o2'file; filename=o2'file2.txt
-Content-Type: text/plain-file2
-
-2
--20896060251896012921717172737--
---FILE--
-?php
-var_dump($_FILES);
-var_dump($GLOBALS[o1\'file_name]);
-var_dump($GLOBALS[o1\'file_name] === $_FILES[o1\'file][name]);
-var_dump($GLOBALS[o1\'file]);
-var_dump($GLOBALS[o1\'file] === $_FILES[o1\'file][tmp_name]);
-?
---EXPECTF--
-array(2) {
-  [o1\'file]=
-  array(5) {
-[name]=
-string(12) o1
-[type]=
-string(16) text/plain-file1
-[tmp_name]=
-string(14) %s
-[error]=
-int(0)
-[size]=
-int(1)
-  }
-  [o2\'file]=
-  array(5) {
-[name]=
-string(13) o2
-[type]=
-string(16) text/plain-file2
-[tmp_name]=
-string(14) %s
-[error]=
-int(0)
-[size]=
-int(1)
-  }
-}
-string(12) o1
-bool(true)
-string(%d) %s
-bool(true)
-Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in 
Unknown on line 0
-Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in 
Unknown on line 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_3/ext/standard/tests/file/rename_variation6-win32.phpt branches/PHP_5_4/ext/standard/tests/file/rename_variation6-win32.phpt trunk/ext/standard/tests/file/r

2012-01-09 Thread Pierre Joye

pajoye   Mon, 09 Jan 2012 15:31:33 +

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

Log:
- error is windows version dependent and not what we test here

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation6-win32.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation6-win32.phpt
U   php/php-src/trunk/ext/standard/tests/file/rename_variation6-win32.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation6-win32.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation6-win32.phpt
   2012-01-09 14:29:06 UTC (rev 321953)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation6-win32.phpt
   2012-01-09 15:31:33 UTC (rev 321954)
@@ -33,7 +33,7 @@
 echo Done\n;
 ?
 --EXPECTF--
-Warning: readlink(): Could not open file (error 2) in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) %srename_variation6-win32.php.tmp
 bool(true)

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation6-win32.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation6-win32.phpt
   2012-01-09 14:29:06 UTC (rev 321953)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation6-win32.phpt
   2012-01-09 15:31:33 UTC (rev 321954)
@@ -33,7 +33,7 @@
 echo Done\n;
 ?
 --EXPECTF--
-Warning: readlink(): Could not open file (error 2) in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) %srename_variation6-win32.php.tmp
 bool(true)

Modified: php/php-src/trunk/ext/standard/tests/file/rename_variation6-win32.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/rename_variation6-win32.phpt  
2012-01-09 14:29:06 UTC (rev 321953)
+++ php/php-src/trunk/ext/standard/tests/file/rename_variation6-win32.phpt  
2012-01-09 15:31:33 UTC (rev 321954)
@@ -33,7 +33,7 @@
 echo Done\n;
 ?
 --EXPECTF--
-Warning: readlink(): Could not open file (error 2) in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) %srename_variation6-win32.php.tmp
 bool(true)

-- 
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/standard/tests/general_functions/bug39322.phpt branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt trunk/ext/standard/tests/genera

2012-01-09 Thread Alexey Shein

Thanks for fixiing this! :)

2012/1/8 Nuno Lopes nlop...@php.net:
 nlopess                                  Sun, 08 Jan 2012 18:03:56 +

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

 Log:
 do kill 9 to fix a race condition in this test. (should fix the debian 32-bit 
 buildbot)

 Changed paths:
    U   
 php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt
    U   
 php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt
    U   php/php-src/trunk/ext/standard/tests/general_functions/bug39322.phpt

 Modified: 
 php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt
 ===
 --- 
 php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt
      2012-01-08 16:46:40 UTC (rev 321932)
 +++ 
 php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt
      2012-01-08 18:03:56 UTC (rev 321933)
 @@ -16,7 +16,7 @@

  $process = proc_open('/bin/sleep 120', $descriptors, $pipes);

 -proc_terminate($process);
 +proc_terminate($process, 9);
  sleep(1); // wait a bit to let the process finish
  var_dump(proc_get_status($process));

 @@ -38,7 +38,7 @@
   [exitcode]=
   int(-1)
   [termsig]=
 -  int(15)
 +  int(9)
   [stopsig]=
   int(0)
  }

 Modified: 
 php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt
 ===
 --- 
 php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt
      2012-01-08 16:46:40 UTC (rev 321932)
 +++ 
 php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt
      2012-01-08 18:03:56 UTC (rev 321933)
 @@ -16,7 +16,7 @@

  $process = proc_open('/bin/sleep 120', $descriptors, $pipes);

 -proc_terminate($process);
 +proc_terminate($process, 9);
  sleep(1); // wait a bit to let the process finish
  var_dump(proc_get_status($process));

 @@ -38,7 +38,7 @@
   [exitcode]=
   int(-1)
   [termsig]=
 -  int(15)
 +  int(9)
   [stopsig]=
   int(0)
  }

 Modified: php/php-src/trunk/ext/standard/tests/general_functions/bug39322.phpt
 ===
 --- php/php-src/trunk/ext/standard/tests/general_functions/bug39322.phpt      
   2012-01-08 16:46:40 UTC (rev 321932)
 +++ php/php-src/trunk/ext/standard/tests/general_functions/bug39322.phpt      
   2012-01-08 18:03:56 UTC (rev 321933)
 @@ -16,7 +16,7 @@

  $process = proc_open('/bin/sleep 120', $descriptors, $pipes);

 -proc_terminate($process);
 +proc_terminate($process, 9);
  sleep(1); // wait a bit to let the process finish
  var_dump(proc_get_status($process));

 @@ -38,7 +38,7 @@
   [exitcode]=
   int(-1)
   [termsig]=
 -  int(15)
 +  int(9)
   [stopsig]=
   int(0)
  }


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



-- 
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_3/ext/interbase/tests/ 003.phpt

2012-01-09 Thread Popa Adrian Marius

mariuz   Tue, 10 Jan 2012 05:26:20 +

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

Log:
sync firebird test 003 with the 5.4 branch , eliminate failing test 
http://gcov.php.net/viewer.php?version=PHP_5_3func=testsfile=ext%2Finterbase%2Ftests%2F003.phpt

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/interbase/tests/003.phpt

Modified: php/php-src/branches/PHP_5_3/ext/interbase/tests/003.phpt
===
--- php/php-src/branches/PHP_5_3/ext/interbase/tests/003.phpt   2012-01-10 
04:39:30 UTC (rev 321991)
+++ php/php-src/branches/PHP_5_3/ext/interbase/tests/003.phpt   2012-01-10 
05:26:20 UTC (rev 321992)
@@ -21,7 +21,7 @@
v_numeric15_0   numeric(15,0),
 v_double   double precision,
 v_float float,
-   v_integer   integer,
+v_integer   integer,
 v_smallint  smallint,
 v_varchar   varchar(1)
 ));
@@ -157,27 +157,27 @@
   int(10)
   [ID_10]=
   int(11)
-  [FIELD_00]=
+  [CONSTANT]=
   int(12)
-  [FIELD_01]=
+  [CONSTANT_01]=
   int(13)
-  [FIELD_02]=
+  [CONSTANT_02]=
   int(14)
-  [FIELD_03]=
+  [CONSTANT_03]=
   int(15)
-  [FIELD_04]=
+  [CONSTANT_04]=
   int(16)
-  [FIELD_05]=
+  [CONSTANT_05]=
   int(17)
-  [FIELD_06]=
+  [CONSTANT_06]=
   int(18)
-  [FIELD_07]=
+  [CONSTANT_07]=
   int(19)
-  [FIELD_08]=
+  [CONSTANT_08]=
   int(20)
-  [FIELD_09]=
+  [CONSTANT_09]=
   int(21)
-  [FIELD_10]=
+  [CONSTANT_10]=
   int(22)
 }
 end of test

-- 
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

2012-01-09 Thread Popa Adrian Marius

mariuz   Tue, 10 Jan 2012 06:53:37 +

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

Log:
added fixed Pdo Firebird bugs to the NEWS section

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-01-10 05:33:14 UTC (rev 321993)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-01-10 06:53:37 UTC (rev 321994)
@@ -2,6 +2,11 @@
 |||
 ?? ??? 2012, PHP 5.3.9

+- Pdo Firebird:
+  . Fixed bug #47415 (PDO_Firebird segfaults when passing lowercased column 
name to bindColumn).
+  . Fixed bug #53280 (PDO_Firebird segfaults if query column count less than 
param count).
+(Mariuz)
+
 22 Dec 2011, PHP 5.3.9RC4

 - Core:

-- 
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/sapi/cli/tests/php_cli_server_003.phpt trunk/sapi/cli/tests/php_cli_server_003.phpt

2012-01-09 Thread Pierre Joye

pajoye   Tue, 10 Jan 2012 07:33:36 +

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

Log:
- any other dir may not exist or may not be used

Changed paths:
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_003.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_003.phpt

Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_003.phpt
===
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_003.phpt 
2012-01-10 07:20:34 UTC (rev 321999)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_003.phpt 
2012-01-10 07:33:36 UTC (rev 322000)
@@ -9,7 +9,7 @@
 --FILE--
 ?php
 include php_cli_server.inc;
-php_cli_server_start('chdir(/tmp); echo okey;');
+php_cli_server_start('chdir(__DIR__); echo okey;');
 var_dump(file_get_contents(http://; . PHP_CLI_SERVER_ADDRESS));
 var_dump(file_get_contents(http://; . PHP_CLI_SERVER_ADDRESS));
 ?

Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_003.phpt
===
--- php/php-src/trunk/sapi/cli/tests/php_cli_server_003.phpt2012-01-10 
07:20:34 UTC (rev 321999)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server_003.phpt2012-01-10 
07:33:36 UTC (rev 322000)
@@ -9,7 +9,7 @@
 --FILE--
 ?php
 include php_cli_server.inc;
-php_cli_server_start('chdir(/tmp); echo okey;');
+php_cli_server_start('chdir(__DIR__); echo okey;');
 var_dump(file_get_contents(http://; . PHP_CLI_SERVER_ADDRESS));
 var_dump(file_get_contents(http://; . PHP_CLI_SERVER_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_3/win32/build/mkdist.php branches/PHP_5_4/win32/build/mkdist.php trunk/win32/build/mkdist.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/tests/basic/bug46313-win.phpt trunk/tests/basic/bug46313-win.phpt

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/rename_variation6-win32.phpt branches/PHP_5_4/ext/standard/tests/file/rename_variation6-win32.phpt trunk/ext/standard/tests/file/r

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt trunk/ext/standard/tests/genera

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/tests/php_cli_server_003.phpt trunk/sapi/cli/tests/php_cli_server_003.phpt

7 matches

Site Navigation

Mail list logo

Footer information