date:20071115

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2007-11-15 Thread changelog

changelog   Fri Nov 16 01:31:35 2007 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2869r2=1.2870diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2869 php-src/ChangeLog:1.2870
--- php-src/ChangeLog:1.2869Thu Nov 15 01:31:28 2007
+++ php-src/ChangeLog   Fri Nov 16 01:31:34 2007
@@ -1,3 +1,45 @@
+2007-11-15  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/standard/tests/file/bug41655_2.phpt:
+  fix test (thanks to Felipe Pena for noticing)
+
+2007-11-15  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  NEWS
+  main/safe_mode.c:
+  
+  MFB: Fixed bug #43276 (Incomplete fix for bug #42739, mkdir() under
+  safe_mode).
+
+* (PHP_5_3)
+  main/safe_mode.c:
+  Completed fix for bug #42739 (fixes bug #43276)
+
+2007-11-15  Hannes Magnusson  [EMAIL PROTECTED]
+
+* ext/standard/basic_functions.c
+  ext/standard/tests/general_functions/getopt_002.phpt
+  ext/standard/tests/general_functions/getopt_002.phpt
+  ext/standard/tests/general_functions/getopt_002.phpt
+  ext/standard/tests/general_functions/getopt_003.phpt
+  ext/standard/tests/general_functions/getopt_003.phpt:
+  - Allow numeric options
+  - Add tests
+
+2007-11-15  Lars Westermann  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/pdo_firebird/firebird_statement.c:
+  - Fixed bug #43244 (firebird: closeCursor w/o returned data kills 
process)
+
+* (PHP_5_3)
+  ext/pdo_firebird/firebird_driver.c
+  ext/pdo_firebird/firebird_statement.c
+  ext/pdo_firebird/php_pdo_firebird_int.h:
+  - Fixed bug #43296 (Feature req: pdo_firebird: ATTR_FETCH_TABLE_NAMES
+  support)
+
 2007-11-14  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * (PHP_5_2)

Re: [PHP-CVS] cvs: php-src(PHP_5_3)

2007-11-15 Thread Antony Dovgal

On 14.11.2007 20:25, Raghubansh Kumar wrote:
 Hi Antony, 
 I have committed fix for these failure. Please give a run on the 
 linux-64bit machine and let me know how they go.

Yep, that worked.

-- 
Wbr, 
Antony Dovgal

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c /ext/standard/tests/general_functions getopt_002.phpt getopt_003.phpt

2007-11-15 Thread Hannes Magnusson

bjori   Thu Nov 15 13:13:21 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions   getopt_002.phpt 
getopt_003.phpt 

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  MFH: Allow numeric options  tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.11r2=1.725.2.31.2.64.2.12diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.11 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.12
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.11 Wed Nov 14 
14:42:25 2007
+++ php-src/ext/standard/basic_functions.c  Thu Nov 15 13:13:21 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.11 2007/11/14 14:42:25 bjori Exp 
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.12 2007/11/15 13:13:21 bjori Exp 
$ */
 
 #include php.h
 #include php_streams.h
@@ -4506,7 +4506,8 @@
int i, count = 0;
 
for (i = 0; i  strlen(opts); i++) {
-   if ((opts[i] = 65  opts[i] = 90) ||
+   if ((opts[i] = 48  opts[i] = 57) ||
+   (opts[i] = 65  opts[i] = 90) ||
(opts[i] = 97  opts[i] = 122)
) {
count++;
@@ -4516,8 +4517,9 @@
paras = safe_emalloc(sizeof(opt_struct), count, 0);
memset(paras, 0, sizeof(opt_struct) * count);
*result = paras;
-   while ( (*opts = 65  *opts = 90) ||
-   (*opts = 97  *opts = 122)
+   while ( (*opts = 48  *opts = 57) || /* 0 - 9 */
+   (*opts = 65  *opts = 90) || /* A - Z */
+   (*opts = 97  *opts = 122)   /* a - z */
) {
paras-opt_char = *opts;
paras-need_param = (*(++opts) == ':') ? 1 : 0;

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getopt_002.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/general_functions/getopt_002.phpt
+++ php-src/ext/standard/tests/general_functions/getopt_002.phpt
--TEST--
getopt#002
--ARGS--
-vvv -a value - -2 -v
--INI--
register_argc_argv=On
variables_order=GPS
--FILE--
?php
var_dump(getopt(2a:vcd1));
?
--EXPECT--
array(4) {
  [v]=
  array(4) {
[0]=
bool(false)
[1]=
bool(false)
[2]=
bool(false)
[3]=
bool(false)
  }
  [a]=
  string(5) value
  [1]=
  array(4) {
[0]=
bool(false)
[1]=
bool(false)
[2]=
bool(false)
[3]=
bool(false)
  }
  [2]=
  bool(false)
}



http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getopt_003.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/general_functions/getopt_003.phpt
+++ php-src/ext/standard/tests/general_functions/getopt_003.phpt
--TEST--
getopt#003
--ARGS--
-vvv --v -a value --another value - -2 --12 --0 --0 --1 -v
--INI--
register_argc_argv=On
variables_order=GPS
--FILE--
?php
var_dump(getopt(2a:vcd1, array(another:, 12, 0, 1, v)));
?
--EXPECT--
array(7) {
  [v]=
  array(5) {
[0]=
bool(false)
[1]=
bool(false)
[2]=
bool(false)
[3]=
bool(false)
[4]=
bool(false)
  }
  [a]=
  string(5) value
  [another]=
  string(5) value
  [1]=
  array(5) {
[0]=
bool(false)
[1]=
bool(false)
[2]=
bool(false)
[3]=
bool(false)
[4]=
bool(false)
  }
  [2]=
  bool(false)
  [12]=
  bool(false)
  [0]=
  array(2) {
[0]=
bool(false)
[1]=
bool(false)
  }
}

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

[PHP-CVS] cvs: CVSROOT / avail

2007-11-15 Thread Derick Rethans

derick  Thu Nov 15 15:32:59 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - This is easier as other things need to be updated as well (md5sum f.e.).
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1328r2=1.1329diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1328 CVSROOT/avail:1.1329
--- CVSROOT/avail:1.1328Thu Nov 15 15:18:27 2007
+++ CVSROOT/avail   Thu Nov 15 15:32:59 2007
@@ -52,7 +52,7 @@
 # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net,
 # and master.php.net.
 
-avail|lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web
+avail|jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web
 
 # The PHP Presentation Group has access to the presentations on the
 # conf.php.net site.
@@ -293,7 +293,7 @@
 avail|wez,jan|php-objc
 
 # php windows installer
-avail|jmertic|php-src/win32/installer,phpweb/distributions
+avail|jmertic|php-src/win32/installer
 
 # Curl modules
 
avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions getopt_002.phpt

2007-11-15 Thread Hannes Magnusson

bjori   Thu Nov 15 13:14:19 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions   getopt_002.phpt 
  Log:
  MFH test
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getopt_002.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/general_functions/getopt_002.phpt
+++ php-src/ext/standard/tests/general_functions/getopt_002.phpt
--TEST--
getopt#002
--ARGS--
-vvv -a value - -2 -v
--INI--
register_argc_argv=On
variables_order=GPS
--FILE--
?php
var_dump(getopt(2a:vcd1));
?
--EXPECT--
array(4) {
  [v]=
  array(4) {
[0]=
bool(false)
[1]=
bool(false)
[2]=
bool(false)
[3]=
bool(false)
  }
  [a]=
  string(5) value
  [1]=
  array(4) {
[0]=
bool(false)
[1]=
bool(false)
[2]=
bool(false)
[3]=
bool(false)
  }
  [2]=
  bool(false)
}

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

[PHP-CVS] cvs: CVSROOT / avail

2007-11-15 Thread Derick Rethans

derick  Thu Nov 15 15:18:28 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - Give John access so that he can upload new installers.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1327r2=1.1328diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1327 CVSROOT/avail:1.1328
--- CVSROOT/avail:1.1327Wed Nov 14 00:16:30 2007
+++ CVSROOT/avail   Thu Nov 15 15:18:27 2007
@@ -293,7 +293,7 @@
 avail|wez,jan|php-objc
 
 # php windows installer
-avail|jmertic|php-src/win32/installer
+avail|jmertic|php-src/win32/installer,phpweb/distributions
 
 # Curl modules
 
avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www

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

[PHP-CVS] cvs: php-src /ext/standard basic_functions.c /ext/standard/tests/general_functions getopt_002.phpt getopt_003.phpt

2007-11-15 Thread Hannes Magnusson

bjori   Thu Nov 15 13:11:48 2007 UTC

  Added files: 
/php-src/ext/standard/tests/general_functions   getopt_002.phpt 
getopt_003.phpt 

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  - Allow numeric options
  - Add tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.882r2=1.883diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.882 
php-src/ext/standard/basic_functions.c:1.883
--- php-src/ext/standard/basic_functions.c:1.882Wed Nov 14 14:55:44 2007
+++ php-src/ext/standard/basic_functions.c  Thu Nov 15 13:11:48 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.882 2007/11/14 14:55:44 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.883 2007/11/15 13:11:48 bjori Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -4470,7 +4470,8 @@
int i, count = 0;
 
for (i = 0; i  strlen(opts); i++) {
-   if ((opts[i] = 65  opts[i] = 90) ||
+   if ((opts[i] = 48  opts[i] = 57) ||
+   (opts[i] = 65  opts[i] = 90) ||
(opts[i] = 97  opts[i] = 122)
) {
count++;
@@ -4480,8 +4481,9 @@
paras = safe_emalloc(sizeof(opt_struct), count, 0);
memset(paras, 0, sizeof(opt_struct) * count);
*result = paras;
-   while ( (*opts = 65  *opts = 90) ||
-   (*opts = 97  *opts = 122)
+   while ( (*opts = 48  *opts = 57) || /* 0 - 9 */
+   (*opts = 65  *opts = 90) || /* A - Z */
+   (*opts = 97  *opts = 122)   /* a - z */
) {
paras-opt_char = *opts;
paras-need_param = (*(++opts) == ':') ? 1 : 0;

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getopt_002.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/general_functions/getopt_002.phpt
+++ php-src/ext/standard/tests/general_functions/getopt_002.phpt
--TEST--
getopt#002
--ARGS--
-vvv -a value - -2 -v
--INI--
register_argc_argv=On
variables_order=GPS
--FILE--
?php
var_dump(getopt(2a:vcd1));
?
--EXPECT--
array(4) {
  [v]=
  array(4) {
[0]=
bool(false)
[1]=
bool(false)
[2]=
bool(false)
[3]=
bool(false)
  }
  [a]=
  string(5) value
  [1]=
  array(4) {
[0]=
bool(false)
[1]=
bool(false)
[2]=
bool(false)
[3]=
bool(false)
  }
  [2]=
  bool(false)
}



http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getopt_003.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/general_functions/getopt_003.phpt
+++ php-src/ext/standard/tests/general_functions/getopt_003.phpt
--TEST--
getopt#003
--ARGS--
-vvv --v -a value --another value - -2 --12 --0 --0 --1 -v
--INI--
register_argc_argv=On
variables_order=GPS
--FILE--
?php
var_dump(getopt(2a:vcd1, array(another:, 12, 0, 1, v)));
?
--EXPECT--
array(7) {
  [v]=
  array(5) {
[0]=
bool(false)
[1]=
bool(false)
[2]=
bool(false)
[3]=
bool(false)
[4]=
bool(false)
  }
  [a]=
  string(5) value
  [another]=
  string(5) value
  [1]=
  array(5) {
[0]=
bool(false)
[1]=
bool(false)
[2]=
bool(false)
[3]=
bool(false)
[4]=
bool(false)
  }
  [2]=
  bool(false)
  [12]=
  bool(false)
  [0]=
  array(2) {
[0]=
bool(false)
[1]=
bool(false)
  }
}

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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main safe_mode.c

2007-11-15 Thread Ilia Alshanetsky

iliaa   Thu Nov 15 18:58:43 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/main   safe_mode.c 
  Log:
  
  MFB: Fixed bug #43276 (Incomplete fix for bug #42739, mkdir() under 
  safe_mode). 
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1011r2=1.2027.2.547.2.1012diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1011 php-src/NEWS:1.2027.2.547.2.1012
--- php-src/NEWS:1.2027.2.547.2.1011Wed Nov 14 15:19:29 2007
+++ php-src/NEWSThu Nov 15 18:58:43 2007
@@ -4,6 +4,8 @@
 - Fixed bug #43293 (Multiple segfaults in getopt()). (Hannes)
 - Fixed bug #43279 (pg_send_query_params() converts all elements in 'params' 
   to strings). (Ilia)
+- Fixed bug #43276 (Incomplete fix for bug #42739, mkdir() under safe_mode).
+  (Ilia)
 - Fixed bug #43248 (backward compatibility break in realpath()). (Dmitry)
 - Fixed bug #43221 (SimpleXML adding default namespace in addAttribute). (Rob)
 - Fixed bug #43216 (stream_is_local() returns false on file://). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.13r2=1.62.2.1.2.14diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.13 
php-src/main/safe_mode.c:1.62.2.1.2.14
--- php-src/main/safe_mode.c:1.62.2.1.2.13  Thu Oct 11 09:33:53 2007
+++ php-src/main/safe_mode.cThu Nov 15 18:58:43 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: safe_mode.c,v 1.62.2.1.2.13 2007/10/11 09:33:53 jani Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.14 2007/11/15 18:58:43 iliaa Exp $ */
 
 #include php.h
 
@@ -122,10 +122,17 @@
 
/* Trim off filename */
if ((s = strrchr(path, DEFAULT_SLASH))) {
-   if (s == path)
-   path[1] = '\0';
-   else
+   if (*(s + 1) == '\0'  s != path) { /* make sure that 
the / is not the last character */
*s = '\0';
+   s = strrchr(path, DEFAULT_SLASH);
+   }
+   if (s) {
+   if (s == path) {
+   path[1] = '\0';
+   } else {
+   *s = '\0';
+   }
+   }
}
} else { /* CHECKUID_ALLOW_ONLY_DIR */
s = strrchr(filename, DEFAULT_SLASH);

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

[PHP-CVS] cvs: php-src(PHP_5_3) /main safe_mode.c

2007-11-15 Thread Ilia Alshanetsky

iliaa   Thu Nov 15 18:57:14 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   safe_mode.c 
  Log:
  Completed fix for bug #42739 (fixes bug #43276)
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.10.2.3r2=1.62.2.1.2.10.2.4diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.10.2.3 
php-src/main/safe_mode.c:1.62.2.1.2.10.2.4
--- php-src/main/safe_mode.c:1.62.2.1.2.10.2.3  Thu Oct 11 09:33:30 2007
+++ php-src/main/safe_mode.cThu Nov 15 18:57:14 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: safe_mode.c,v 1.62.2.1.2.10.2.3 2007/10/11 09:33:30 jani Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.10.2.4 2007/11/15 18:57:14 iliaa Exp $ */
 
 #include php.h
 
@@ -122,10 +122,17 @@
 
/* Trim off filename */
if ((s = strrchr(path, DEFAULT_SLASH))) {
-   if (s == path)
-   path[1] = '\0';
-   else
+   if (*(s + 1) == '\0'  s != path) { /* make sure that 
the / is not the last character */
*s = '\0';
+   s = strrchr(path, DEFAULT_SLASH);
+   }
+   if (s) {
+   if (s == path) {
+   path[1] = '\0';
+   } else {
+   *s = '\0';
+   }
+   }
}
} else { /* CHECKUID_ALLOW_ONLY_DIR */
s = strrchr(filename, DEFAULT_SLASH);

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file bug41655_2.phpt

2007-11-15 Thread Antony Dovgal

tony2001Thu Nov 15 22:14:15 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/filebug41655_2.phpt 
  Log:
  MFH: fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_2.phpt?r1=1.1.4.4r2=1.1.4.4.2.1diff_format=u
Index: php-src/ext/standard/tests/file/bug41655_2.phpt
diff -u php-src/ext/standard/tests/file/bug41655_2.phpt:1.1.4.4 
php-src/ext/standard/tests/file/bug41655_2.phpt:1.1.4.4.2.1
--- php-src/ext/standard/tests/file/bug41655_2.phpt:1.1.4.4 Thu Sep 20 
13:49:33 2007
+++ php-src/ext/standard/tests/file/bug41655_2.phpt Thu Nov 15 22:14:15 2007
@@ -5,13 +5,11 @@
 --FILE--
 ?php
$dir = dirname(__FILE__);
-   $a=glob($dir . /bug41655*.*);
+   $a=glob($dir . /test.*);
print_r($a);
 ?
 --EXPECTF--
 Array
 (
-[0] = %sbug41655_1.phpt
-[1] = %sbug41655_2.php
-[2] = %sbug41655_2.phpt
+[0] = %stest.csv
 )


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

[PHP-CVS] cvs: php-src /ext/standard/tests/file bug41655_2.phpt

2007-11-15 Thread Antony Dovgal

tony2001Thu Nov 15 22:14:05 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/filebug41655_2.phpt 
  Log:
  fix test (thanks to Felipe Pena for noticing)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_2.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/tests/file/bug41655_2.phpt
diff -u php-src/ext/standard/tests/file/bug41655_2.phpt:1.4 
php-src/ext/standard/tests/file/bug41655_2.phpt:1.5
--- php-src/ext/standard/tests/file/bug41655_2.phpt:1.4 Thu Sep 20 13:39:04 2007
+++ php-src/ext/standard/tests/file/bug41655_2.phpt Thu Nov 15 22:14:04 2007
@@ -5,13 +5,11 @@
 --FILE--
 ?php
$dir = dirname(__FILE__);
-   $a=glob($dir . /bug41655*.*);
+   $a=glob($dir . /test.*);
print_r($a);
 ?
 --EXPECTF--
 Array
 (
-[0] = %sbug41655_1.phpt
-[1] = %sbug41655_2.php
-[2] = %sbug41655_2.phpt
+[0] = %stest.csv
 )

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file bug41655_2.phpt

2007-11-15 Thread Antony Dovgal

tony2001Thu Nov 15 22:14:29 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/filebug41655_2.phpt 
  Log:
  MFH: fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_2.phpt?r1=1.1.4.4r2=1.1.4.5diff_format=u
Index: php-src/ext/standard/tests/file/bug41655_2.phpt
diff -u php-src/ext/standard/tests/file/bug41655_2.phpt:1.1.4.4 
php-src/ext/standard/tests/file/bug41655_2.phpt:1.1.4.5
--- php-src/ext/standard/tests/file/bug41655_2.phpt:1.1.4.4 Thu Sep 20 
13:49:33 2007
+++ php-src/ext/standard/tests/file/bug41655_2.phpt Thu Nov 15 22:14:29 2007
@@ -5,13 +5,11 @@
 --FILE--
 ?php
$dir = dirname(__FILE__);
-   $a=glob($dir . /bug41655*.*);
+   $a=glob($dir . /test.*);
print_r($a);
 ?
 --EXPECTF--
 Array
 (
-[0] = %sbug41655_1.phpt
-[1] = %sbug41655_2.php
-[2] = %sbug41655_2.phpt
+[0] = %stest.csv
 )

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

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

Re: [PHP-CVS] cvs: php-src(PHP_5_3)

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c /ext/standard/tests/general_functions getopt_002.phpt getopt_003.phpt

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions getopt_002.phpt

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: php-src /ext/standard basic_functions.c /ext/standard/tests/general_functions getopt_002.phpt getopt_003.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main safe_mode.c

[PHP-CVS] cvs: php-src(PHP_5_3) /main safe_mode.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file bug41655_2.phpt

[PHP-CVS] cvs: php-src /ext/standard/tests/file bug41655_2.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file bug41655_2.phpt

12 matches

Site Navigation

Mail list logo

Footer information