date:20070625

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

2007-06-25 Thread changelog

changelog   Tue Jun 26 01:31:23 2007 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2729r2=1.2730diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2729 php-src/ChangeLog:1.2730
--- php-src/ChangeLog:1.2729Mon Jun 25 01:31:22 2007
+++ php-src/ChangeLog   Tue Jun 26 01:31:22 2007
@@ -1,3 +1,90 @@
+2007-06-25  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/standard/tests/file/bug41655_1.phpt
+  ext/standard/tests/file/bug41655_1.phpt
+  ext/standard/tests/file/bug41655_1.phpt
+  ext/standard/tests/file/bug41655_1.phpt:
+  fix test
+
+* (PHP_5_2)
+  NEWS
+  ext/standard/basic_functions.c:
+  fix #41773 (php_strip_whitespace sends headers with errors suppressed)
+  MFB is not needed, output buffering in HEAD handles this situation
+  correctly
+
+2007-06-25  Scott MacVicar  [EMAIL PROTECTED]
+
+* ext/mysql/php_mysql.c
+  ext/mysqli/mysqli.c:
+  MFB: Fixed bug #41350 (my_thread_global_end() error during request 
shutdown
+  on Windows).
+
+2007-06-25  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  NEWS
+  ext/oci8/oci8_lob.c
+  ext/oci8/tests/lob_null.phpt:
+  MFH: fix #41711 (Null temporary lobs not supported)
+
+* ext/oci8/oci8_lob.c
+  ext/oci8/tests/lob_null.phpt
+  ext/oci8/tests/lob_null.phpt:
+  fix #41711 (Null temporary lobs not supported)
+
+* ext/sysvshm/tests/003.phpt:
+  cleanup test data
+
+2007-06-25  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/pdo_sqlite/config.m4:
+  MFH: - Fixed bug #41794 (build fails with external libs under Solaris)
+
+* ext/pdo_sqlite/config.m4:
+  - Fixed bug #41794 (build fails with external libs under Solaris)
+
+2007-06-25  Scott MacVicar  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  NEWS
+  ext/mysql/php_mysql.c
+  ext/mysqli/mysqli.c:
+  Fixed bug #41350 (my_thread_global_end() error during request shutdown on
+  Windows).
+
+2007-06-25  Dmitry Stogov  [EMAIL PROTECTED]
+
+* configure.in
+  configure.in:
+  Fixed stat() to support rdev, blocksize and blocks on Fedora 7
+
+* ext/standard/dir.c:
+  (forgotten part of fix)
+
+* ext/standard/tests/file/lstat_stat_basic.phpt
+  ext/standard/tests/file/lstat_stat_basic.phpt
+  ext/standard/tests/file/symlink_link_linkinfo_is_link_variation.phpt
+  ext/standard/tests/file/symlink_link_linkinfo_is_link_variation.phpt
+  ext/xmlwriter/tests/007.phpt
+  ext/xmlwriter/tests/007.phpt
+  ext/xmlwriter/tests/OO_007.phpt
+  ext/xmlwriter/tests/OO_007.phpt:
+  Fixed tests
+
+* ext/standard/dir.c
+  ext/standard/dir.c
+  ext/standard/tests/file/bug41655_1.phpt
+  ext/standard/tests/file/bug41655_1.phpt:
+  Better fix for bug #41655
+
+* main/snprintf.c
+  main/snprintf.c
+  main/spprintf.c
+  main/spprintf.c:
+  Restore big exponent letter in var_export() ('1e300' - '1E300')
+
 2007-06-24  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * (PHP_5_2)

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlwriter/tests 007.phpt OO_007.phpt

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 06:45:57 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlwriter/tests007.phpt OO_007.phpt 
  Log:
  Fixed tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/007.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u
Index: php-src/ext/xmlwriter/tests/007.phpt
diff -u php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3 
php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3.2.1
--- php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3Mon Dec 12 21:21:11 2005
+++ php-src/ext/xmlwriter/tests/007.phptMon Jun 25 06:45:57 2007
@@ -7,7 +7,7 @@
 ?
 --FILE--
 ?php 
-/* $Id: 007.phpt,v 1.1.2.3 2005/12/12 21:21:11 tony2001 Exp $ */
+/* $Id: 007.phpt,v 1.1.2.3.2.1 2007/06/25 06:45:57 dmitry Exp $ */
 
 $xw = xmlwriter_open_memory();
 xmlwriter_set_indent($xw, TRUE);
@@ -32,7 +32,7 @@
 --EXPECT--
 ?xml version=1.0 encoding=UTF-8?
 root
-   ns1:child1 xmlns:ns1=urn:ns1 ns1:att1=aamp;b xmlns:ns1=urn:ns1 
att2=doublequot; single' ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
+   ns1:child1 ns1:att1=aamp;b att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
   charsspecial characters: lt;gt;quot;'amp;/chars
/ns1:child1
 /root
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/OO_007.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u
Index: php-src/ext/xmlwriter/tests/OO_007.phpt
diff -u php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3 
php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3.2.1
--- php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3 Mon Dec 12 21:21:11 2005
+++ php-src/ext/xmlwriter/tests/OO_007.phpt Mon Jun 25 06:45:57 2007
@@ -7,7 +7,7 @@
 ?
 --FILE--
 ?php 
-/* $Id: OO_007.phpt,v 1.1.2.3 2005/12/12 21:21:11 tony2001 Exp $ */
+/* $Id: OO_007.phpt,v 1.1.2.3.2.1 2007/06/25 06:45:57 dmitry Exp $ */
 
 $xw = new XMLWriter();
 $xw-openMemory();
@@ -33,7 +33,7 @@
 --EXPECT--
 ?xml version=1.0 encoding=UTF-8?
 root
-   ns1:child1 xmlns:ns1=urn:ns1 ns1:att1=aamp;b xmlns:ns1=urn:ns1 
att2=doublequot; single' ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
+   ns1:child1 ns1:att1=aamp;b att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
   charsspecial characters: lt;gt;quot;'amp;/chars
/ns1:child1
 /root

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

[PHP-CVS] cvs: php-src /ext/xmlwriter/tests 007.phpt OO_007.phpt

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 06:46:15 2007 UTC

  Modified files:  
/php-src/ext/xmlwriter/tests007.phpt OO_007.phpt 
  Log:
  Fixed tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/007.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/xmlwriter/tests/007.phpt
diff -u php-src/ext/xmlwriter/tests/007.phpt:1.2 
php-src/ext/xmlwriter/tests/007.phpt:1.3
--- php-src/ext/xmlwriter/tests/007.phpt:1.2Mon Dec 12 21:21:36 2005
+++ php-src/ext/xmlwriter/tests/007.phptMon Jun 25 06:46:15 2007
@@ -7,7 +7,7 @@
 ?
 --FILE--
 ?php 
-/* $Id: 007.phpt,v 1.2 2005/12/12 21:21:36 tony2001 Exp $ */
+/* $Id: 007.phpt,v 1.3 2007/06/25 06:46:15 dmitry Exp $ */
 
 $xw = xmlwriter_open_memory();
 xmlwriter_set_indent($xw, TRUE);
@@ -32,7 +32,7 @@
 --EXPECT--
 ?xml version=1.0 encoding=UTF-8?
 root
-   ns1:child1 xmlns:ns1=urn:ns1 ns1:att1=aamp;b xmlns:ns1=urn:ns1 
att2=doublequot; single' ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
+   ns1:child1 ns1:att1=aamp;b att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
   charsspecial characters: lt;gt;quot;'amp;/chars
/ns1:child1
 /root
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/OO_007.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/xmlwriter/tests/OO_007.phpt
diff -u php-src/ext/xmlwriter/tests/OO_007.phpt:1.2 
php-src/ext/xmlwriter/tests/OO_007.phpt:1.3
--- php-src/ext/xmlwriter/tests/OO_007.phpt:1.2 Mon Dec 12 21:21:36 2005
+++ php-src/ext/xmlwriter/tests/OO_007.phpt Mon Jun 25 06:46:15 2007
@@ -7,7 +7,7 @@
 ?
 --FILE--
 ?php 
-/* $Id: OO_007.phpt,v 1.2 2005/12/12 21:21:36 tony2001 Exp $ */
+/* $Id: OO_007.phpt,v 1.3 2007/06/25 06:46:15 dmitry Exp $ */
 
 $xw = new XMLWriter();
 $xw-openMemory();
@@ -33,7 +33,7 @@
 --EXPECT--
 ?xml version=1.0 encoding=UTF-8?
 root
-   ns1:child1 xmlns:ns1=urn:ns1 ns1:att1=aamp;b xmlns:ns1=urn:ns1 
att2=doublequot; single' ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
+   ns1:child1 ns1:att1=aamp;b att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
   charsspecial characters: lt;gt;quot;'amp;/chars
/ns1:child1
 /root

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

Re: [PHP-CVS] cvs: php-src /ext/standard dir.c /ext/standard/tests/file bug41655_1.phpt

2007-06-25 Thread Pierre


Hi Dmitry,

On 6/25/07, Dmitry Stogov [EMAIL PROTECTED] wrote:

dmitry  Mon Jun 25 08:40:37 2007 UTC

  Modified files:
/php-src/ext/standard   dir.c
/php-src/ext/standard/tests/filebug41655_1.phpt
  Log:
  Better fix for bug #41655


http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.163r2=1.164diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.163 php-src/ext/standard/dir.c:1.164
--- php-src/ext/standard/dir.c:1.163Tue Jun 12 13:42:04 2007
+++ php-src/ext/standard/dir.c  Mon Jun 25 08:40:36 2007
@@ -16,7 +16,7 @@
+--+
  */

-/* $Id: dir.c,v 1.163 2007/06/12 13:42:04 scottmac Exp $ */
+/* $Id: dir.c,v 1.164 2007/06/25 08:40:36 dmitry Exp $ */

 /* {{{ includes/startup/misc */

@@ -423,16 +423,15 @@
 #endif

if (PG(open_basedir)  *PG(open_basedir)) {
-   size_t base_len = php_dirname(pattern, strlen(pattern));
-   char pos = pattern[base_len];
-
-   pattern[base_len] = '\0';
-
+   int pattern_len = strlen(pattern);
+   char *basename = estrndup(pattern, pattern_len);
+
+   php_dirname(basename, pattern_len);


Why is it a better fix? In these versions (head and 5.2), we don't
need to duplicate the pattern. I applied in 4.4 as dirname modifies
the pattern.

Cheers,
--Pierre

--
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 lstat_stat_basic.phpt symlink_link_linkinfo_is_link_variation.phpt

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 09:02:07 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/filelstat_stat_basic.phpt 

symlink_link_linkinfo_is_link_variation.phpt 
  Log:
  Fixed tests
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/file/lstat_stat_basic.phpt
diff -u php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.2 
php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.3
--- php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.2   Thu Jun 21 
21:14:21 2007
+++ php-src/ext/standard/tests/file/lstat_stat_basic.phpt   Mon Jun 25 
09:02:07 2007
@@ -95,221 +95,221 @@
 -- comparing difference in dir stats before and after creating file in it --
 array(26) {
   [0]=
-  int(%d)
+  int(%i)
   [1]=
-  int(%d)
+  int(%i)
   [2]=
-  int(%d)
+  int(%i)
   [3]=
-  int(%d)
+  int(%i)
   [4]=
-  int(%d)
+  int(%i)
   [5]=
-  int(%d)
+  int(%i)
   [6]=
-  int(%d)
+  int(%i)
   [7]=
-  int(%d)
+  int(%i)
   [8]=
-  int(%d)
+  int(%i)
   [9]=
-  int(%d)
+  int(%i)
   [10]=
-  int(%d)
+  int(%i)
   [11]=
-  int(%d)
+  int(%i)
   [12]=
-  int(%d)
+  int(%i)
   [dev]=
-  int(%d)
+  int(%i)
   [ino]=
-  int(%d)
+  int(%i)
   [mode]=
-  int(%d)
+  int(%i)
   [nlink]=
-  int(%d)
+  int(%i)
   [uid]=
-  int(%d)
+  int(%i)
   [gid]=
-  int(%d)
+  int(%i)
   [rdev]=
-  int(%d)
+  int(%i)
   [size]=
-  int(%d)
+  int(%i)
   [atime]=
-  int(%d)
+  int(%i)
   [mtime]=
-  int(%d)
+  int(%i)
   [ctime]=
-  int(%d)
+  int(%i)
   [blksize]=
-  int(%d)
+  int(%i)
   [blocks]=
-  int(%d)
+  int(%i)
 }
 array(26) {
   [0]=
-  int(%d)
+  int(%i)
   [1]=
-  int(%d)
+  int(%i)
   [2]=
-  int(%d)
+  int(%i)
   [3]=
-  int(%d)
+  int(%i)
   [4]=
-  int(%d)
+  int(%i)
   [5]=
-  int(%d)
+  int(%i)
   [6]=
-  int(%d)
+  int(%i)
   [7]=
-  int(%d)
+  int(%i)
   [8]=
-  int(%d)
+  int(%i)
   [9]=
-  int(%d)
+  int(%i)
   [10]=
-  int(%d)
+  int(%i)
   [11]=
-  int(%d)
+  int(%i)
   [12]=
-  int(%d)
+  int(%i)
   [dev]=
-  int(%d)
+  int(%i)
   [ino]=
-  int(%d)
+  int(%i)
   [mode]=
-  int(%d)
+  int(%i)
   [nlink]=
-  int(%d)
+  int(%i)
   [uid]=
-  int(%d)
+  int(%i)
   [gid]=
-  int(%d)
+  int(%i)
   [rdev]=
-  int(%d)
+  int(%i)
   [size]=
-  int(%d)
+  int(%i)
   [atime]=
-  int(%d)
+  int(%i)
   [mtime]=
-  int(%d)
+  int(%i)
   [ctime]=
-  int(%d)
+  int(%i)
   [blksize]=
-  int(%d)
+  int(%i)
   [blocks]=
-  int(%d)
+  int(%i)
 }
 bool(true)
 -- comparing difference in file stats before and after creating link to it --
 array(26) {
   [0]=
-  int(%d)
+  int(%i)
   [1]=
-  int(%d)
+  int(%i)
   [2]=
-  int(%d)
+  int(%i)
   [3]=
-  int(%d)
+  int(%i)
   [4]=
-  int(%d)
+  int(%i)
   [5]=
-  int(%d)
+  int(%i)
   [6]=
-  int(%d)
+  int(%i)
   [7]=
-  int(%d)
+  int(%i)
   [8]=
-  int(%d)
+  int(%i)
   [9]=
-  int(%d)
+  int(%i)
   [10]=
-  int(%d)
+  int(%i)
   [11]=
-  int(%d)
+  int(%i)
   [12]=
-  int(%d)
+  int(%i)
   [dev]=
-  int(%d)
+  int(%i)
   [ino]=
-  int(%d)
+  int(%i)
   [mode]=
-  int(%d)
+  int(%i)
   [nlink]=
-  int(%d)
+  int(%i)
   [uid]=
-  int(%d)
+  int(%i)
   [gid]=
-  int(%d)
+  int(%i)
   [rdev]=
-  int(%d)
+  int(%i)
   [size]=
-  int(%d)
+  int(%i)
   [atime]=
-  int(%d)
+  int(%i)
   [mtime]=
-  int(%d)
+  int(%i)
   [ctime]=
-  int(%d)
+  int(%i)
   [blksize]=
-  int(%d)
+  int(%i)
   [blocks]=
-  int(%d)
+  int(%i)
 }
 array(26) {
   [0]=
-  int(%d)
+  int(%i)
   [1]=
-  int(%d)
+  int(%i)
   [2]=
-  int(%d)
+  int(%i)
   [3]=
-  int(%d)
+  int(%i)
   [4]=
-  int(%d)
+  int(%i)
   [5]=
-  int(%d)
+  int(%i)
   [6]=
-  int(%d)
+  int(%i)
   [7]=
-  int(%d)
+  int(%i)
   [8]=
-  int(%d)
+  int(%i)
   [9]=
-  int(%d)
+  int(%i)
   [10]=
-  int(%d)
+  int(%i)
   [11]=
-  int(%d)
+  int(%i)
   [12]=
-  int(%d)
+  int(%i)
   [dev]=
-  int(%d)
+  int(%i)
   [ino]=
-  int(%d)
+  int(%i)
   [mode]=
-  int(%d)
+  int(%i)
   [nlink]=
-  int(%d)
+  int(%i)
   [uid]=
-  int(%d)
+  int(%i)
   [gid]=
-  int(%d)
+  int(%i)
   [rdev]=
-  int(%d)
+  int(%i)
   [size]=
-  int(%d)
+  int(%i)
   [atime]=
-  int(%d)
+  int(%i)
   [mtime]=
-  int(%d)
+  int(%i)
   [ctime]=
-  int(%d)
+  int(%i)
   [blksize]=
-  int(%d)
+  int(%i)
   [blocks]=
-  int(%d)
+  int(%i)
 }
 bool(true)
 Done
@@ -325,221 +325,221 @@
 -- comparing difference in dir stats before and after creating file in it --
 array(26) {
   [0]=
-  int(%d)
+  int(%i)
   [1]=
-  int(%d)
+  int(%i)
   [2]=
-  int(%d)
+  int(%i)
   [3]=
-  int(%d)
+  int(%i)
   [4]=
-  int(%d)
+  int(%i)
   [5]=
-  int(%d)
+  int(%i)
   [6]=
-  int(%d)
+  int(%i)
   [7]=
-  int(%d)
+  int(%i)
   [8]=
-  int(%d)
+  int(%i)
   [9]=
-  int(%d)
+  int(%i)
   [10]=
-  int(%d)
+  int(%i)
   [11]=
-  int(%d)
+  int(%i)
   [12]=
-  int(%d)
+  int(%i)
   [udev]=
-  int(%d)
+  int(%i)
   [uino]=
-  int(%d)
+  int(%i)
   [umode]=
-  int(%d)
+  int(%i)
   [unlink]=
-  int(%d)
+  int(%i)
   [uuid]=
-  int(%d)
+  int(%i)
   [ugid]=

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

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 08:39:10 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   snprintf.c spprintf.c 
  Log:
  Restore big exponent letter in var_export() ('1e300' - '1E300')
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.37.2.4.2.12r2=1.37.2.4.2.13diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.37.2.4.2.12 
php-src/main/snprintf.c:1.37.2.4.2.13
--- php-src/main/snprintf.c:1.37.2.4.2.12   Tue Jun 19 12:20:50 2007
+++ php-src/main/snprintf.c Mon Jun 25 08:39:10 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: snprintf.c,v 1.37.2.4.2.12 2007/06/19 12:20:50 derick Exp $ */
+/* $Id: snprintf.c,v 1.37.2.4.2.13 2007/06/25 08:39:10 dmitry Exp $ */
 
 
 #include php.h
@@ -1036,7 +1036,7 @@
lconv = localeconv();
}
 #endif
-   s = php_gcvt(fp_num, precision, 
*fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G')?'E':'e', num_buf[1]);
+   s = php_gcvt(fp_num, precision, 
*fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', 
num_buf[1]);
if (*s == '-') {
prefix_char = *s++;
} else if (print_sign) {
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.25.2.2.2.6r2=1.25.2.2.2.7diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.25.2.2.2.6 
php-src/main/spprintf.c:1.25.2.2.2.7
--- php-src/main/spprintf.c:1.25.2.2.2.6Tue Jun 19 12:20:50 2007
+++ php-src/main/spprintf.c Mon Jun 25 08:39:10 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: spprintf.c,v 1.25.2.2.2.6 2007/06/19 12:20:50 derick Exp $ */
+/* $Id: spprintf.c,v 1.25.2.2.2.7 2007/06/25 08:39:10 dmitry Exp $ */
 
 /* This is the spprintf implementation.
  * It has emerged from apache snprintf. See original header:
@@ -619,7 +619,7 @@
lconv = localeconv();
}
 #endif
-   s = php_gcvt(fp_num, precision, 
*fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G')?'E':'e', num_buf[1]);
+   s = php_gcvt(fp_num, precision, 
*fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', 
num_buf[1]);
if (*s == '-')
prefix_char = *s++;
else if (print_sign)

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

[PHP-CVS] cvs: php-src /main snprintf.c spprintf.c

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 08:39:24 2007 UTC

  Modified files:  
/php-src/main   snprintf.c spprintf.c 
  Log:
  Restore big exponent letter in var_export() ('1e300' - '1E300')
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.56r2=1.57diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.56 php-src/main/snprintf.c:1.57
--- php-src/main/snprintf.c:1.56Tue Jun 19 12:19:27 2007
+++ php-src/main/snprintf.c Mon Jun 25 08:39:23 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: snprintf.c,v 1.56 2007/06/19 12:19:27 derick Exp $ */
+/* $Id: snprintf.c,v 1.57 2007/06/25 08:39:23 dmitry Exp $ */
 
 
 #include php.h
@@ -1082,7 +1082,7 @@
lconv = localeconv();
}
 #endif
-   s = php_gcvt(fp_num, precision, 
*fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G')?'E':'e', num_buf[1]);
+   s = php_gcvt(fp_num, precision, 
*fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', 
num_buf[1]);
if (*s == '-')
prefix_char = *s++;
else if (print_sign)
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.45r2=1.46diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.45 php-src/main/spprintf.c:1.46
--- php-src/main/spprintf.c:1.45Tue Jun 19 12:19:27 2007
+++ php-src/main/spprintf.c Mon Jun 25 08:39:23 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: spprintf.c,v 1.45 2007/06/19 12:19:27 derick Exp $ */
+/* $Id: spprintf.c,v 1.46 2007/06/25 08:39:23 dmitry Exp $ */
 
 /* This is the spprintf implementation.
  * It has emerged from apache snprintf. See original header:
@@ -709,7 +709,7 @@
lconv = localeconv();
}
 #endif
-   s = php_gcvt(fp_num, precision, 
*fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G')?'E':'e', num_buf[1]);
+   s = php_gcvt(fp_num, precision, 
*fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', 
num_buf[1]);
if (*s == '-')
prefix_char = *s++;
else if (print_sign)

-- 
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 dir.c /ext/standard/tests/file bug41655_1.phpt

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 08:40:20 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   dir.c 
/php-src/ext/standard/tests/filebug41655_1.phpt 
  Log:
  Better fix for bug #41655
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.7r2=1.147.2.3.2.8diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.7 
php-src/ext/standard/dir.c:1.147.2.3.2.8
--- php-src/ext/standard/dir.c:1.147.2.3.2.7Thu Jun 14 23:28:06 2007
+++ php-src/ext/standard/dir.c  Mon Jun 25 08:40:20 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.147.2.3.2.7 2007/06/14 23:28:06 iliaa Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.8 2007/06/25 08:40:20 dmitry Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -397,19 +397,19 @@
 #endif
 
if (PG(safe_mode) || (PG(open_basedir)  *PG(open_basedir))) {
-   size_t base_len = php_dirname(pattern, strlen(pattern));
-   char pos = pattern[base_len];
-
-   pattern[base_len] = '\0';
-
-   if (PG(safe_mode)  (!php_checkuid(pattern, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
+   int pattern_len = strlen(pattern);
+   char *basename = estrndup(pattern, pattern_len);
+   
+   php_dirname(basename, pattern_len);
+   if (PG(safe_mode)  (!php_checkuid(basename, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
+   efree(basename);
RETURN_FALSE;
}
-   if (php_check_open_basedir(pattern TSRMLS_CC)) {
+   if (php_check_open_basedir(basename TSRMLS_CC)) {
+   efree(basename);
RETURN_FALSE;
}
-
-   pattern[base_len] = pos;
+   efree(basename);
}
 
globbuf.gl_offs = 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_1.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/standard/tests/file/bug41655_1.phpt
diff -u php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.2 
php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.2 Fri Jun 22 
12:35:41 2007
+++ php-src/ext/standard/tests/file/bug41655_1.phpt Mon Jun 25 08:40:20 2007
@@ -7,4 +7,4 @@
$a=glob(./*.jpeg);
 ?
 --EXPECTF--
-Warning: glob() [%s]: open_basedir restriction in effect. File(.) is not 
within the allowed path(s): (/tmp) in %s on line %d
+Warning: glob(): open_basedir restriction in effect. File(.) is not within the 
allowed path(s): (/tmp) in %s on line %d

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

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

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 08:40:37 2007 UTC

  Modified files:  
/php-src/ext/standard   dir.c 
/php-src/ext/standard/tests/filebug41655_1.phpt 
  Log:
  Better fix for bug #41655
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.163r2=1.164diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.163 php-src/ext/standard/dir.c:1.164
--- php-src/ext/standard/dir.c:1.163Tue Jun 12 13:42:04 2007
+++ php-src/ext/standard/dir.c  Mon Jun 25 08:40:36 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.163 2007/06/12 13:42:04 scottmac Exp $ */
+/* $Id: dir.c,v 1.164 2007/06/25 08:40:36 dmitry Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -423,16 +423,15 @@
 #endif
 
if (PG(open_basedir)  *PG(open_basedir)) {
-   size_t base_len = php_dirname(pattern, strlen(pattern));
-   char pos = pattern[base_len];
-
-   pattern[base_len] = '\0';
-
+   int pattern_len = strlen(pattern);
+   char *basename = estrndup(pattern, pattern_len);
+   
+   php_dirname(basename, pattern_len);
if (php_check_open_basedir(pattern TSRMLS_CC)) {
+   efree(basename);
RETURN_FALSE;
}
-
-   pattern[base_len] = pos;
+   efree(basename);
}
 
globbuf.gl_offs = 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_1.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/file/bug41655_1.phpt
diff -u php-src/ext/standard/tests/file/bug41655_1.phpt:1.2 
php-src/ext/standard/tests/file/bug41655_1.phpt:1.3
--- php-src/ext/standard/tests/file/bug41655_1.phpt:1.2 Fri Jun 22 12:36:55 2007
+++ php-src/ext/standard/tests/file/bug41655_1.phpt Mon Jun 25 08:40:36 2007
@@ -7,4 +7,4 @@
$a=glob(./*.jpeg);
 ?
 --EXPECTF--
-Warning: glob() [%s]: open_basedir restriction in effect. File(.) is not 
within the allowed path(s): (/tmp) in %s on line %d
+Warning: glob(): open_basedir restriction in effect. File(.) is not within the 
allowed path(s): (/tmp) in %s on line %d

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

Re: [PHP-CVS] cvs: php-src /main snprintf.c spprintf.c

2007-06-25 Thread Derick Rethans

On Mon, 25 Jun 2007, Dmitry Stogov wrote:

 dmitryMon Jun 25 08:39:24 2007 UTC
 
   Modified files:  
 /php-src/main snprintf.c spprintf.c 
   Log:
   Restore big exponent letter in var_export() ('1e300' - '1E300')

Please add a test case for this...

Derick

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

[PHP-CVS] cvs: php-src /ext/standard dir.c

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 09:42:49 2007 UTC

  Modified files:  
/php-src/ext/standard   dir.c 
  Log:
  (forgotten part of fix)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.164r2=1.165diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.164 php-src/ext/standard/dir.c:1.165
--- php-src/ext/standard/dir.c:1.164Mon Jun 25 08:40:36 2007
+++ php-src/ext/standard/dir.c  Mon Jun 25 09:42:49 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.164 2007/06/25 08:40:36 dmitry Exp $ */
+/* $Id: dir.c,v 1.165 2007/06/25 09:42:49 dmitry Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -427,7 +427,7 @@
char *basename = estrndup(pattern, pattern_len);

php_dirname(basename, pattern_len);
-   if (php_check_open_basedir(pattern TSRMLS_CC)) {
+   if (php_check_open_basedir(basename TSRMLS_CC)) {
efree(basename);
RETURN_FALSE;
}

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

RE: [PHP-CVS] cvs: php-src /ext/standard dir.c /ext/standard/tests/file bug41655_1.phpt

2007-06-25 Thread Dmitry Stogov

 /php-src/ext/standard/tests/file/bug41655_2.phpt was broken because
pattern was truncated by php_dirname().

Dmitry.

 -Original Message-
 From: Pierre [mailto:[EMAIL PROTECTED] 
 Sent: Monday, June 25, 2007 12:52 PM
 To: Dmitry Stogov
 Cc: php-cvs@lists.php.net
 Subject: Re: [PHP-CVS] cvs: php-src /ext/standard dir.c 
 /ext/standard/tests/file bug41655_1.phpt
 
 
 Hi Dmitry,
 
 On 6/25/07, Dmitry Stogov [EMAIL PROTECTED] wrote:
  dmitry  Mon Jun 25 08:40:37 2007 UTC
 
Modified files:
  /php-src/ext/standard   dir.c
  /php-src/ext/standard/tests/filebug41655_1.phpt
Log:
Better fix for bug #41655
 
 
  
 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.163r2=1
  .164diff_format=u
  Index: php-src/ext/standard/dir.c
  diff -u php-src/ext/standard/dir.c:1.163 
 php-src/ext/standard/dir.c:1.164
  --- php-src/ext/standard/dir.c:1.163Tue Jun 12 13:42:04 2007
  +++ php-src/ext/standard/dir.c  Mon Jun 25 08:40:36 2007
  @@ -16,7 +16,7 @@
  
 +-
 -+
*/
 
  -/* $Id: dir.c,v 1.163 2007/06/12 13:42:04 scottmac Exp $ */
  +/* $Id: dir.c,v 1.164 2007/06/25 08:40:36 dmitry Exp $ */
 
   /* {{{ includes/startup/misc */
 
  @@ -423,16 +423,15 @@
   #endif
 
  if (PG(open_basedir)  *PG(open_basedir)) {
  -   size_t base_len = php_dirname(pattern, 
 strlen(pattern));
  -   char pos = pattern[base_len];
  -
  -   pattern[base_len] = '\0';
  -
  +   int pattern_len = strlen(pattern);
  +   char *basename = estrndup(pattern, pattern_len);
  +
  +   php_dirname(basename, pattern_len);
 
 Why is it a better fix? In these versions (head and 5.2), we 
 don't need to duplicate the pattern. I applied in 4.4 as 
 dirname modifies the pattern.
 
 Cheers,
 --Pierre
 

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

RE: [PHP-CVS] cvs: php-src /main snprintf.c spprintf.c

2007-06-25 Thread Dmitry Stogov

Didn't you see broken test tests/lang/bug24640.phpt?

Dmitry.

 -Original Message-
 From: Derick Rethans [mailto:[EMAIL PROTECTED] 
 Sent: Monday, June 25, 2007 12:48 PM
 To: Dmitry Stogov
 Cc: php-cvs@lists.php.net
 Subject: Re: [PHP-CVS] cvs: php-src /main snprintf.c spprintf.c 
 
 
 On Mon, 25 Jun 2007, Dmitry Stogov wrote:
 
  dmitry  Mon Jun 25 08:39:24 2007 UTC
  
Modified files:  
  /php-src/main   snprintf.c spprintf.c 
Log:
Restore big exponent letter in var_export() ('1e300' - '1E300')
 
 Please add a test case for this...
 
 Derick
 

-- 
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) / configure.in

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 14:22:49 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  Fixed stat() to support rdev, blocksize and blocks on Fedora 7
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.57r2=1.579.2.52.2.58diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.57 
php-src/configure.in:1.579.2.52.2.58
--- php-src/configure.in:1.579.2.52.2.57Wed May 30 18:48:58 2007
+++ php-src/configure.inMon Jun 25 14:22:49 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.57 2007/05/30 18:48:58 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.58 2007/06/25 14:22:49 dmitry Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -373,6 +373,7 @@
 sys/resource.h \
 sys/select.h \
 sys/socket.h \
+sys/stat.h \
 sys/statfs.h \
 sys/statvfs.h \
 sys/vfs.h \

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

[PHP-CVS] cvs: php-src / configure.in

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 14:23:21 2007 UTC

  Modified files:  
/php-srcconfigure.in 
  Log:
  Fixed stat() to support rdev, blocksize and blocks on Fedora 7
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.627r2=1.628diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.627 php-src/configure.in:1.628
--- php-src/configure.in:1.627  Thu May 24 23:31:15 2007
+++ php-src/configure.inMon Jun 25 14:23:21 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.627 2007/05/24 23:31:15 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.628 2007/06/25 14:23:21 dmitry Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -371,6 +371,7 @@
 sys/resource.h \
 sys/select.h \
 sys/socket.h \
+sys/stat.h \
 sys/statfs.h \
 sys/statvfs.h \
 sys/vfs.h \

-- 
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 /ext/mysql php_mysql.c /ext/mysqli mysqli.c

2007-06-25 Thread Scott MacVicar

scottmacMon Jun 25 16:01:30 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/mysql  php_mysql.c 
/php-src/ext/mysqli mysqli.c 
  Log:
  Fixed bug #41350 (my_thread_global_end() error during request shutdown on 
Windows).
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.796r2=1.2027.2.547.2.797diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.796 php-src/NEWS:1.2027.2.547.2.797
--- php-src/NEWS:1.2027.2.547.2.796 Sun Jun 24 17:37:01 2007
+++ php-src/NEWSMon Jun 25 16:01:29 2007
@@ -76,6 +76,8 @@
 - Fixed bug #41527 (WDDX deserialize numeric string array key). (Matt, Ilia)
 - Fixed bug #41518 (file_exists() warns of open_basedir restriction on 
   non-existent file). (Tony)
+- Fixed bug #41350 (my_thread_global_end() error during request shutdown
+  on Windows). (Scott, Andrey)
 - Fixed bug #39330 (apache2handler does not call shutdown actions before 
   apache child die). (isk at ecommerce dot com, Gopal, Tony)
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.14r2=1.213.2.6.2.15diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.14 
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.15
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.14Mon Jun 18 21:51:32 2007
+++ php-src/ext/mysql/php_mysql.c   Mon Jun 25 16:01:30 2007
@@ -18,7 +18,7 @@
+--+
 */
  
-/* $Id: php_mysql.c,v 1.213.2.6.2.14 2007/06/18 21:51:32 stas Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.15 2007/06/25 16:01:30 scottmac Exp $ */
 
 /* TODO:
  *
@@ -401,6 +401,10 @@
REGISTER_LONG_CONSTANT(MYSQL_CLIENT_INTERACTIVE, CLIENT_INTERACTIVE, 
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQL_CLIENT_IGNORE_SPACE, 
CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); 
 
+   if (mysql_server_init(0, NULL, NULL)) {
+   return FAILURE;
+   }
+
return SUCCESS;
 }
 /* }}} */
@@ -409,6 +413,16 @@
  */
 PHP_MSHUTDOWN_FUNCTION(mysql)
 {
+#ifdef PHP_WIN32
+   unsigned long client_ver = mysql_get_client_version;
+   /* Can't call mysql_server_end() multiple times prior to 5.0.42 on 
Windows */
+   if ((client_ver  50042  client_ver  50100) || client_ver  50122) {
+   mysql_server_end();
+   }
+#else
+   mysql_server_end();
+#endif
+
UNREGISTER_INI_ENTRIES();
return SUCCESS;
 }
@@ -418,12 +432,18 @@
  */
 PHP_RINIT_FUNCTION(mysql)
 {
+#ifdef ZTS
+   if (mysql_thread_init()) {
+   return FAILURE;
+   }
+#endif
MySG(default_link)=-1;
MySG(num_links) = MySG(num_persistent);
/* Reset connect error/errno on every request */
MySG(connect_error) = NULL;
MySG(connect_errno) =0;
MySG(result_allocated) = 0;
+
return SUCCESS;
 }
 /* }}} */
@@ -432,6 +452,10 @@
  */
 PHP_RSHUTDOWN_FUNCTION(mysql)
 {
+#ifdef ZTS
+   mysql_thread_end();
+#endif
+
if (MySG(trace_mode)) {
if (MySG(result_allocated)){
php_error_docref(function.mysql-free-result 
TSRMLS_CC, E_WARNING, %lu result set(s) not freed. Use mysql_free_result to 
free result sets which were requested using mysql_query(), 
MySG(result_allocated));
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.15r2=1.72.2.16.2.16diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.15 
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.16
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.15  Tue Mar 20 20:00:27 2007
+++ php-src/ext/mysqli/mysqli.c Mon Jun 25 16:01:30 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli.c,v 1.72.2.16.2.15 2007/03/20 20:00:27 helly Exp $ 
+  $Id: mysqli.c,v 1.72.2.16.2.16 2007/06/25 16:01:30 scottmac Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -652,6 +652,10 @@
REGISTER_LONG_CONSTANT(MYSQLI_REPORT_ALL, MYSQLI_REPORT_ALL, CONST_CS 
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_REPORT_OFF, 0, CONST_CS | 
CONST_PERSISTENT);
 
+   if (mysql_server_init(0, NULL, NULL)) {
+   return FAILURE;
+   }
+
return SUCCESS;
 }
 /* }}} */
@@ -660,6 +664,16 @@
  */
 PHP_MSHUTDOWN_FUNCTION(mysqli)
 {
+#ifdef PHP_WIN32
+   unsigned long client_ver = mysql_get_client_version;
+   /* Can't call mysql_server_end() multiple times prior to 5.0.42 on 
Windows */
+   if ((client_ver  50042  client_ver  50100) || client_ver  50122) {
+   mysql_server_end();
+   }
+#else
+   mysql_server_end();
+#endif
+
zend_hash_destroy(mysqli_driver_properties);
zend_hash_destroy(mysqli_result_properties);
zend_hash_destroy(mysqli_stmt_properties);
@@ -676,6 +690,11 @@
  */

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlwriter/tests 007.phpt OO_007.phpt

2007-06-25 Thread Antony Dovgal


This fix broke the tests for me.

On 25.06.2007 10:45, Dmitry Stogov wrote:

dmitry  Mon Jun 25 06:45:57 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlwriter/tests	007.phpt OO_007.phpt 
  Log:

  Fixed tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/007.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u

Index: php-src/ext/xmlwriter/tests/007.phpt
diff -u php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3 
php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3.2.1
--- php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3Mon Dec 12 21:21:11 2005
+++ php-src/ext/xmlwriter/tests/007.phptMon Jun 25 06:45:57 2007
@@ -7,7 +7,7 @@
 ?
 --FILE--
 ?php 
-/* $Id: 007.phpt,v 1.1.2.3 2005/12/12 21:21:11 tony2001 Exp $ */

+/* $Id: 007.phpt,v 1.1.2.3.2.1 2007/06/25 06:45:57 dmitry Exp $ */
 
 $xw = xmlwriter_open_memory();

 xmlwriter_set_indent($xw, TRUE);
@@ -32,7 +32,7 @@
 --EXPECT--
 ?xml version=1.0 encoding=UTF-8?
 root
-   ns1:child1 xmlns:ns1=urn:ns1 ns1:att1=aamp;b xmlns:ns1=urn:ns1 att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
+   ns1:child1 ns1:att1=aamp;b att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
   charsspecial characters: lt;gt;quot;'amp;/chars
/ns1:child1
 /root
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/OO_007.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u
Index: php-src/ext/xmlwriter/tests/OO_007.phpt
diff -u php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3 
php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3.2.1
--- php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3 Mon Dec 12 21:21:11 2005
+++ php-src/ext/xmlwriter/tests/OO_007.phpt Mon Jun 25 06:45:57 2007
@@ -7,7 +7,7 @@
 ?
 --FILE--
 ?php 
-/* $Id: OO_007.phpt,v 1.1.2.3 2005/12/12 21:21:11 tony2001 Exp $ */

+/* $Id: OO_007.phpt,v 1.1.2.3.2.1 2007/06/25 06:45:57 dmitry Exp $ */
 
 $xw = new XMLWriter();

 $xw-openMemory();
@@ -33,7 +33,7 @@
 --EXPECT--
 ?xml version=1.0 encoding=UTF-8?
 root
-   ns1:child1 xmlns:ns1=urn:ns1 ns1:att1=aamp;b xmlns:ns1=urn:ns1 att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
+   ns1:child1 ns1:att1=aamp;b att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
   charsspecial characters: lt;gt;quot;'amp;/chars
/ns1:child1
 /root




--
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 /ext/standard/tests/file bug41655_1.phpt

2007-06-25 Thread Antony Dovgal

tony2001Mon Jun 25 17:10:07 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/filebug41655_1.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_1.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/file/bug41655_1.phpt
diff -u php-src/ext/standard/tests/file/bug41655_1.phpt:1.3 
php-src/ext/standard/tests/file/bug41655_1.phpt:1.4
--- php-src/ext/standard/tests/file/bug41655_1.phpt:1.3 Mon Jun 25 08:40:36 2007
+++ php-src/ext/standard/tests/file/bug41655_1.phpt Mon Jun 25 17:10:07 2007
@@ -1,5 +1,5 @@
 --TEST--
-Bug #41655: open_basedir bypass via glob()
+Bug #41655 (open_basedir bypass via glob())
 --INI--
 open_basedir=/tmp
 --FILE--
@@ -7,4 +7,4 @@
$a=glob(./*.jpeg);
 ?
 --EXPECTF--
-Warning: glob(): open_basedir restriction in effect. File(.) is not within the 
allowed path(s): (/tmp) in %s on line %d
+Warning: glob(): open_basedir restriction in effect. File(%s.) is not within 
the allowed path(s): (/tmp) in %s on line %d

-- 
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_1.phpt

2007-06-25 Thread Antony Dovgal

tony2001Mon Jun 25 17:10:15 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/filebug41655_1.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_1.phpt?r1=1.1.4.3r2=1.1.4.4diff_format=u
Index: php-src/ext/standard/tests/file/bug41655_1.phpt
diff -u php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.3 
php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.4
--- php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.3 Mon Jun 25 
08:40:20 2007
+++ php-src/ext/standard/tests/file/bug41655_1.phpt Mon Jun 25 17:10:14 2007
@@ -1,5 +1,5 @@
 --TEST--
-Bug #41655: open_basedir bypass via glob()
+Bug #41655 (open_basedir bypass via glob())
 --INI--
 open_basedir=/tmp
 --FILE--
@@ -7,4 +7,4 @@
$a=glob(./*.jpeg);
 ?
 --EXPECTF--
-Warning: glob(): open_basedir restriction in effect. File(.) is not within the 
allowed path(s): (/tmp) in %s on line %d
+Warning: glob(): open_basedir restriction in effect. File(%s.) is not within 
the allowed path(s): (/tmp) in %s on line %d

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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlwriter/tests 007.phpt OO_007.phpt

2007-06-25 Thread Jani Taskinen


And for me too..

--Jani

Antony Dovgal kirjoitti:

This fix broke the tests for me.

On 25.06.2007 10:45, Dmitry Stogov wrote:

dmitryMon Jun 25 06:45:57 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlwriter/tests007.phpt OO_007.phpt   Log:
  Fixed tests

http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/007.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u 


Index: php-src/ext/xmlwriter/tests/007.phpt
diff -u php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3 
php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3.2.1
--- php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3Mon Dec 12 
21:21:11 2005

+++ php-src/ext/xmlwriter/tests/007.phptMon Jun 25 06:45:57 2007
@@ -7,7 +7,7 @@
 ?
 --FILE--
 ?php -/* $Id: 007.phpt,v 1.1.2.3 2005/12/12 21:21:11 tony2001 Exp $ */
+/* $Id: 007.phpt,v 1.1.2.3.2.1 2007/06/25 06:45:57 dmitry Exp $ */
 
 $xw = xmlwriter_open_memory();

 xmlwriter_set_indent($xw, TRUE);
@@ -32,7 +32,7 @@
 --EXPECT--
 ?xml version=1.0 encoding=UTF-8?
 root
-   ns1:child1 xmlns:ns1=urn:ns1 ns1:att1=aamp;b 
xmlns:ns1=urn:ns1 att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
+   ns1:child1 ns1:att1=aamp;b att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1

   charsspecial characters: lt;gt;quot;'amp;/chars
/ns1:child1
 /root
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/OO_007.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u 


Index: php-src/ext/xmlwriter/tests/OO_007.phpt
diff -u php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3 
php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3.2.1
--- php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3Mon Dec 12 
21:21:11 2005

+++ php-src/ext/xmlwriter/tests/OO_007.phptMon Jun 25 06:45:57 2007
@@ -7,7 +7,7 @@
 ?
 --FILE--
 ?php -/* $Id: OO_007.phpt,v 1.1.2.3 2005/12/12 21:21:11 tony2001 Exp 
$ */

+/* $Id: OO_007.phpt,v 1.1.2.3.2.1 2007/06/25 06:45:57 dmitry Exp $ */
 
 $xw = new XMLWriter();

 $xw-openMemory();
@@ -33,7 +33,7 @@
 --EXPECT--
 ?xml version=1.0 encoding=UTF-8?
 root
-   ns1:child1 xmlns:ns1=urn:ns1 ns1:att1=aamp;b 
xmlns:ns1=urn:ns1 att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
+   ns1:child1 ns1:att1=aamp;b att2=doublequot; single' 
ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1

   charsspecial characters: lt;gt;quot;'amp;/chars
/ns1:child1
 /root






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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file filesize_variation-win32.phpt filesize_variation.phpt lstat_stat_basic.phpt lstat_stat_error.phpt rename_variation-win32.phpt rename_variat

2007-06-25 Thread Antony Dovgal


On 22.06.2007 01:12, Raghubansh Kumar wrote:

kraghubaThu Jun 21 21:12:18 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/file	stat_error-win32.phpt 
	lstat_stat_error.phpt 
	filesize_variation-win32.phpt 
	rename_variation-win32.phpt 
	stat_basic-win32.phpt 
	filesize_variation.phpt 
	rename_variation.phpt 
	lstat_stat_basic.phpt 
  Log:

  New tests for file system handling functions
  

rename_variation.phpt fails here:
# cat ext/standard/tests/file/rename_variation.diff
046+
047+ Warning: link(): No such file or directory in 
/local/qa/5_2/ext/standard/tests/file/file.inc on line 384

Could you please divide the tests in small files?
It's almost impossible to find the place in the code which corresponds to line 
46 of output in 7Kb test..

--
Wbr, 
Antony Dovgal


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

Re: [PHP-CVS] cvs: php-src /ext/standard/tests/file symlink_link_linkinfo_is_link_basic.phpt symlink_link_linkinfo_is_link_error.phpt symlink_link_linkinfo_is_link_variation.phpt

2007-06-25 Thread Antony Dovgal


On 22.06.2007 12:14, Raghubansh Kumar wrote:

kraghubaFri Jun 22 08:14:16 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/file	
	symlink_link_linkinfo_is_link_basic.phpt 
	symlink_link_linkinfo_is_link_variation.phpt 
	symlink_link_linkinfo_is_link_error.phpt 
  Log:

  New tests for file system handling functions


symlink_link_linkinfo_is_link_error.phpt fails here:

008+ bool(true)
009- Warning: symlink(): No such file or directory in %s on line %d
010+ Warning: symlink(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 32
012- Warning: symlink(): No such file or directory in %s on line %d
013+ Warning: symlink(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 33
015- Warning: symlink(): No such file or directory in %s on line %d
016+ Warning: symlink(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 34
018- Warning: symlink(): No such file or directory in %s on line %d
019+ Warning: symlink(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 35
021- Warning: symlink(): No such file or directory in %s on line %d
022+ Warning: symlink(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 36
024- Warning: symlink(): No such file or directory in %s on line %d
025- bool(false)
026-
032+ int(2065)
033+ int(2065)
034+ int(2065)
035- Warning: linkinfo(): No such file or directory in %s on line %d
036- int(-1)
037-
038- Warning: linkinfo(): No such file or directory in %s on line %d
039- int(-1)
040-
044+ Warning: link(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 58
047+ Warning: link(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 59
049- Warning: link(): No such file or directory in %s on line %d
050+ Warning: link(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 60
052- Warning: link(): No such file or directory in %s on line %d
053+ Warning: link(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 61
055- Warning: link(): No such file or directory in %s on line %d
056+ Warning: link(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 62
058- Warning: link(): No such file or directory in %s on line %d
059+ Warning: link(): File exists in 
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php 
on line 63
061- Warning: link(): No such file or directory in %s on line %d
064- Warning: link(): No such file or directory in %s on line %d


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

2007-06-25 Thread Antony Dovgal

tony2001Mon Jun 25 17:37:48 2007 UTC

  Modified files:  
/php-src/ext/sysvshm/tests  003.phpt 
  Log:
  cleanup test data
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/tests/003.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/sysvshm/tests/003.phpt
diff -u php-src/ext/sysvshm/tests/003.phpt:1.2 
php-src/ext/sysvshm/tests/003.phpt:1.3
--- php-src/ext/sysvshm/tests/003.phpt:1.2  Fri Oct 27 21:18:56 2006
+++ php-src/ext/sysvshm/tests/003.phpt  Mon Jun 25 17:37:48 2007
@@ -5,7 +5,7 @@
 --FILE--
 ?php
 
-$key = ftok(__FILE__, 'q');
+$key = ftok(dirname(__FILE__)./003.phpt, 'q');
 
 var_dump(shm_detach());
 var_dump(shm_detach(1,1));
@@ -22,6 +22,14 @@
 
 echo Done\n;
 ?
+--CLEAN--
+?php
+
+$key = ftok(dirname(__FILE__)./003.phpt, 'q');
+$s = shm_attach($key);
+shm_remove($s);
+
+?
 --EXPECTF--
 Warning: shm_detach() expects exactly 1 parameter, 0 given in %s003.php on 
line %d
 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) /ext/sysvshm/tests 003.phpt

2007-06-25 Thread Antony Dovgal

tony2001Mon Jun 25 17:37:55 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/sysvshm/tests  003.phpt 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/tests/003.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/sysvshm/tests/003.phpt
diff -u php-src/ext/sysvshm/tests/003.phpt:1.1.2.2 
php-src/ext/sysvshm/tests/003.phpt:1.1.2.3
--- php-src/ext/sysvshm/tests/003.phpt:1.1.2.2  Thu Jun 29 09:00:33 2006
+++ php-src/ext/sysvshm/tests/003.phpt  Mon Jun 25 17:37:55 2007
@@ -5,7 +5,7 @@
 --FILE--
 ?php
 
-$key = ftok(__FILE__, 'q');
+$key = ftok(dirname(__FILE__)./003.phpt, 'q');
 
 var_dump(shm_detach());
 var_dump(shm_detach(1,1));
@@ -22,6 +22,14 @@
 
 echo Done\n;
 ?
+--CLEAN--
+?php
+
+$key = ftok(dirname(__FILE__)./003.phpt, 'q');
+$s = shm_attach($key);
+shm_remove($s);
+
+?
 --EXPECTF--
 Warning: Wrong parameter count for shm_detach() in %s on line %d
 NULL

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

RE: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlwriter/tests 007.phpt OO_007.phpt

2007-06-25 Thread Dmitry Stogov

Interesting. May be it depends on libxml version (I use 2.6.29).
I'll try to look into it tomorrow.

Dmitry.

 -Original Message-
 From: Jani Taskinen [mailto:[EMAIL PROTECTED] 
 Sent: Monday, June 25, 2007 9:11 PM
 To: Antony Dovgal
 Cc: Dmitry Stogov; php-cvs@lists.php.net
 Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_2) 
 /ext/xmlwriter/tests 007.phpt OO_007.phpt
 
 
 And for me too..
 
 --Jani
 
 Antony Dovgal kirjoitti:
  This fix broke the tests for me.
  
  On 25.06.2007 10:45, Dmitry Stogov wrote:
  dmitryMon Jun 25 06:45:57 2007 UTC
 
Modified files:  (Branch: PHP_5_2)
  /php-src/ext/xmlwriter/tests007.phpt OO_007.phpt   Log:
Fixed tests
  
  
 http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/007.phpt?r1
  =1.1.2.3r2=1.1.2.3.2.1diff_format=u
 
  Index: php-src/ext/xmlwriter/tests/007.phpt
  diff -u php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3
  php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3.2.1
  --- php-src/ext/xmlwriter/tests/007.phpt:1.1.2.3Mon Dec 12 
  21:21:11 2005
  +++ php-src/ext/xmlwriter/tests/007.phptMon Jun 25 
 06:45:57 2007
  @@ -7,7 +7,7 @@
   ?
   --FILE--
   ?php -/* $Id: 007.phpt,v 1.1.2.3 2005/12/12 21:21:11 
 tony2001 Exp $ 
  */
  +/* $Id: 007.phpt,v 1.1.2.3.2.1 2007/06/25 06:45:57 dmitry Exp $ */
   
   $xw = xmlwriter_open_memory();
   xmlwriter_set_indent($xw, TRUE);
  @@ -32,7 +32,7 @@
   --EXPECT--
   ?xml version=1.0 encoding=UTF-8?
   root
  -   ns1:child1 xmlns:ns1=urn:ns1 ns1:att1=aamp;b 
  xmlns:ns1=urn:ns1 att2=doublequot; single'
  ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
  +   ns1:child1 ns1:att1=aamp;b att2=doublequot; single'
  ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
 charsspecial characters: lt;gt;quot;'amp;/chars
  /ns1:child1
   /root 
  
 http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/OO_007.phpt
  ?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u
 
  Index: php-src/ext/xmlwriter/tests/OO_007.phpt
  diff -u php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3
  php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3.2.1
  --- php-src/ext/xmlwriter/tests/OO_007.phpt:1.1.2.3Mon Dec 12 
  21:21:11 2005
  +++ php-src/ext/xmlwriter/tests/OO_007.phptMon Jun 25 
 06:45:57 2007
  @@ -7,7 +7,7 @@
   ?
   --FILE--
   ?php -/* $Id: OO_007.phpt,v 1.1.2.3 2005/12/12 21:21:11 tony2001 
  Exp
  $ */
  +/* $Id: OO_007.phpt,v 1.1.2.3.2.1 2007/06/25 06:45:57 
 dmitry Exp $ 
  +*/
   
   $xw = new XMLWriter();
   $xw-openMemory();
  @@ -33,7 +33,7 @@
   --EXPECT--
   ?xml version=1.0 encoding=UTF-8?
   root
  -   ns1:child1 xmlns:ns1=urn:ns1 ns1:att1=aamp;b 
  xmlns:ns1=urn:ns1 att2=doublequot; single'
  ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
  +   ns1:child1 ns1:att1=aamp;b att2=doublequot; single'
  ns1:att2=lt;gt;quot;'amp; xmlns:ns1=urn:ns1
 charsspecial characters: lt;gt;quot;'amp;/chars
  /ns1:child1
   /root
 
  
  
 

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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlwriter/tests 007.phpt OO_007.phpt

2007-06-25 Thread Antony Dovgal


On 25.06.2007 21:41, Dmitry Stogov wrote:

Interesting. May be it depends on libxml version (I use 2.6.29).
I'll try to look into it tomorrow.


May be.
I use libxml2 2.6.26.

--
Wbr, 
Antony Dovgal


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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlwriter/tests 007.phpt OO_007.phpt

2007-06-25 Thread Rob Richards


Changed output is due to a I fix I made in libxml2 for 2.6.29

Rob

Antony Dovgal wrote:

On 25.06.2007 21:41, Dmitry Stogov wrote:

Interesting. May be it depends on libxml version (I use 2.6.29).
I'll try to look into it tomorrow.


May be.
I use libxml2 2.6.26.



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

[PHP-CVS] cvs: php-src /ext/oci8 oci8_lob.c /ext/oci8/tests lob_null.phpt

2007-06-25 Thread Antony Dovgal

tony2001Mon Jun 25 18:25:08 2007 UTC

  Added files: 
/php-src/ext/oci8/tests lob_null.phpt 

  Modified files:  
/php-src/ext/oci8   oci8_lob.c 
  Log:
  fix #41711 (Null temporary lobs not supported)
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.27 php-src/ext/oci8/oci8_lob.c:1.28
--- php-src/ext/oci8/oci8_lob.c:1.27Thu Mar 29 09:30:25 2007
+++ php-src/ext/oci8/oci8_lob.c Mon Jun 25 18:25:08 2007
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_lob.c,v 1.27 2007/03/29 09:30:25 tony2001 Exp $ */
+/* $Id: oci8_lob.c,v 1.28 2007/06/25 18:25:08 tony2001 Exp $ */
 
 
 
@@ -864,8 +864,7 @@
break;
}
 
-   if (!data.v || data_len = 0) {
-   /* nothing to write, silently fail */
+   if (data_len  0) {
return 1;
}
 

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/lob_null.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/lob_null.phpt
+++ php-src/ext/oci8/tests/lob_null.phpt
--TEST--
Test null data for CLOBs
--SKIPIF--
?php if (!extension_loaded('oci8')) die(skip no oci8 extension); ?
--FILE--
?php

require dirname(__FILE__).'/connect.inc';

// Initialization

$s = oci_parse($c, 'drop table lob_null_tab');
@oci_execute($s);

$s = oci_parse($c, 'create table lob_null_tab (id number, data clob)');
oci_execute($s);

$s = oci_parse($c, 
'create or replace procedure lob_null_proc_in (pid in number, pdata in CLOB)
 as begin
   insert into lob_null_tab (id, data) values (pid, pdata);
 end;');
oci_execute($s);

$s = oci_parse($c, 
'create or replace procedure lob_null_proc_out (pid in number, pdata out clob)
   as begin
 select data into pdata from lob_null_tab where id = pid;
 end;');
oci_execute($s);

// TEMPORARY CLOB

echo Temporary CLOB: NULL\n;
$s = oci_parse($c, insert into lob_null_tab values (1, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary(null);
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

echo Temporary CLOB: ''\n;
$s = oci_parse($c, insert into lob_null_tab values (2, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary('');
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

echo Temporary CLOB: text\n;
$s = oci_parse($c, insert into lob_null_tab values (3, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary('Inserted via SQL statement');
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

// PROCEDURE PARAMETER

echo Procedure parameter: NULL\n;
$s = oci_parse($c, call lob_null_proc_in(4, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary(null);
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

echo Procedure parameter: ''\n;
$s = oci_parse($c, call lob_null_proc_in(5, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary('');
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

echo Procedure parameter: text\n;
$s = oci_parse($c, call lob_null_proc_in(6, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary('Inserted via procedure parameter');
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

// RETURNING INTO

echo RETURNING INTO: null\n;
$s = oci_parse($c, insert into lob_null_tab values (7, empty_clob()) returning 
data into :b);
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
oci_execute($s, OCI_DEFAULT);  // Must have OCI_DEFAULT here so locator is 
still valid
$lob-save(null);

echo RETURNING INTO: ''\n;
$s = oci_parse($c, insert into lob_null_tab values (8, empty_clob()) returning 
data into :b);
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
oci_execute($s, OCI_DEFAULT);  // Must have OCI_DEFAULT here so locator is 
still valid
$lob-save('');

echo RETURNING INTO: text\n;
$s = oci_parse($c, insert into lob_null_tab values (9, empty_clob()) returning 
data into :b);
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
oci_execute($s, OCI_DEFAULT);  // Must have OCI_DEFAULT here so locator is 
still valid
$lob-save('Inserted with RETURNING INTO');

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/oci8 oci8_lob.c /ext/oci8/tests lob_null.phpt

2007-06-25 Thread Antony Dovgal

tony2001Mon Jun 25 18:26:52 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/oci8/tests lob_null.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/oci8   oci8_lob.c 
  Log:
  MFH: fix #41711 (Null temporary lobs not supported)
  
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.797r2=1.2027.2.547.2.798diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.797 php-src/NEWS:1.2027.2.547.2.798
--- php-src/NEWS:1.2027.2.547.2.797 Mon Jun 25 16:01:29 2007
+++ php-src/NEWSMon Jun 25 18:26:52 2007
@@ -41,6 +41,8 @@
 - Fixed bug #41724 (libxml_get_last_error() - errors service request scope).
   (thekid at php dot net, Ilia)
 - Fixed bug #41717 (imagepolygon does not respect thickness). (Pierre)
+- Fixed bug #41711 (NULL temporary lobs not supported in OCI8). 
+  (Chris Jones, Tony)
 - Fixed bug #41686 (Omitting length param in array_slice not possible).
   (Ilia)
 - Fixed bug #41685 (array_push() fails to warn when next index is already
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.7.2.6.2.11r2=1.7.2.6.2.12diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.11 
php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.12
--- php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.11Thu Mar 29 09:33:03 2007
+++ php-src/ext/oci8/oci8_lob.c Mon Jun 25 18:26:52 2007
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_lob.c,v 1.7.2.6.2.11 2007/03/29 09:33:03 tony2001 Exp $ */
+/* $Id: oci8_lob.c,v 1.7.2.6.2.12 2007/06/25 18:26:52 tony2001 Exp $ */
 
 
 
@@ -859,8 +859,7 @@
break;
}
 
-   if (!data || data_len = 0) {
-   /* nothing to write, silently fail */
+   if (data_len  0) {
return 1;
}
 

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/lob_null.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/lob_null.phpt
+++ php-src/ext/oci8/tests/lob_null.phpt
--TEST--
Test null data for CLOBs
--SKIPIF--
?php if (!extension_loaded('oci8')) die(skip no oci8 extension); ?
--FILE--
?php

require dirname(__FILE__).'/connect.inc';

// Initialization

$s = oci_parse($c, 'drop table lob_null_tab');
@oci_execute($s);

$s = oci_parse($c, 'create table lob_null_tab (id number, data clob)');
oci_execute($s);

$s = oci_parse($c, 
'create or replace procedure lob_null_proc_in (pid in number, pdata in CLOB)
 as begin
   insert into lob_null_tab (id, data) values (pid, pdata);
 end;');
oci_execute($s);

$s = oci_parse($c, 
'create or replace procedure lob_null_proc_out (pid in number, pdata out clob)
   as begin
 select data into pdata from lob_null_tab where id = pid;
 end;');
oci_execute($s);

// TEMPORARY CLOB

echo Temporary CLOB: NULL\n;
$s = oci_parse($c, insert into lob_null_tab values (1, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary(null);
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

echo Temporary CLOB: ''\n;
$s = oci_parse($c, insert into lob_null_tab values (2, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary('');
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

echo Temporary CLOB: text\n;
$s = oci_parse($c, insert into lob_null_tab values (3, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary('Inserted via SQL statement');
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

// PROCEDURE PARAMETER

echo Procedure parameter: NULL\n;
$s = oci_parse($c, call lob_null_proc_in(4, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary(null);
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

echo Procedure parameter: ''\n;
$s = oci_parse($c, call lob_null_proc_in(5, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary('');
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

echo Procedure parameter: text\n;
$s = oci_parse($c, call lob_null_proc_in(6, :b));
$lob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($s, ':b', $lob, -1, OCI_B_CLOB);
$lob-writeTemporary('Inserted via procedure parameter');
$r = @oci_execute($s);
if (!$r) {
$m = oci_error($s);
echo $m['message'], \n;
}   
else {
$lob-close();
}

// RETURNING INTO

echo RETURNING INTO: null\n;
$s = oci_parse($c, insert into lob_null_tab values (7, empty_clob()) returning 
data into :b);
$lob =

[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli.c

2007-06-25 Thread Scott MacVicar

scottmacMon Jun 25 20:19:30 2007 UTC

  Modified files:  
/php-src/ext/mysql  php_mysql.c 
/php-src/ext/mysqli mysqli.c 
  Log:
  MFB: Fixed bug #41350 (my_thread_global_end() error during request shutdown 
on Windows).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.237r2=1.238diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.237 php-src/ext/mysql/php_mysql.c:1.238
--- php-src/ext/mysql/php_mysql.c:1.237 Thu Jun  7 12:17:16 2007
+++ php-src/ext/mysql/php_mysql.c   Mon Jun 25 20:19:30 2007
@@ -18,7 +18,7 @@
+--+
 */
  
-/* $Id: php_mysql.c,v 1.237 2007/06/07 12:17:16 tony2001 Exp $ */
+/* $Id: php_mysql.c,v 1.238 2007/06/25 20:19:30 scottmac Exp $ */
 
 /* TODO:
  *
@@ -395,6 +395,10 @@
REGISTER_LONG_CONSTANT(MYSQL_CLIENT_INTERACTIVE, CLIENT_INTERACTIVE, 
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQL_CLIENT_IGNORE_SPACE, 
CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); 
 
+   if (mysql_server_init(0, NULL, NULL)) {
+   return FAILURE;
+   }
+
return SUCCESS;
 }
 /* }}} */
@@ -403,6 +407,16 @@
  */
 PHP_MSHUTDOWN_FUNCTION(mysql)
 {
+#ifdef PHP_WIN32
+   unsigned long client_ver = mysql_get_client_version;
+   /* Can't call mysql_server_end() multiple times prior to 5.0.42 on 
Windows */
+   if ((client_ver  50042  client_ver  50100) || client_ver  50122) {
+   mysql_server_end();
+   }
+#else
+   mysql_server_end();
+#endif
+
UNREGISTER_INI_ENTRIES();
return SUCCESS;
 }
@@ -412,6 +426,11 @@
  */
 PHP_RINIT_FUNCTION(mysql)
 {
+#ifdef ZTS
+   if (mysql_thread_init()) {
+   return FAILURE;
+   }
+#endif
MySG(default_link)=-1;
MySG(num_links) = MySG(num_persistent);
/* Reset connect error/errno on every request */
@@ -426,6 +445,9 @@
  */
 PHP_RSHUTDOWN_FUNCTION(mysql)
 {
+#ifdef ZTS
+   mysql_thread_end();
+#endif
if (MySG(trace_mode)) {
if (MySG(result_allocated)){
php_error_docref(function.mysql-free-result 
TSRMLS_CC, E_WARNING, %lu result set(s) not freed. Use mysql_free_result to 
free result sets which were requested using mysql_query(), 
MySG(result_allocated));
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.105r2=1.106diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.105 php-src/ext/mysqli/mysqli.c:1.106
--- php-src/ext/mysqli/mysqli.c:1.105   Fri Mar 23 08:21:08 2007
+++ php-src/ext/mysqli/mysqli.c Mon Jun 25 20:19:30 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli.c,v 1.105 2007/03/23 08:21:08 tony2001 Exp $ 
+  $Id: mysqli.c,v 1.106 2007/06/25 20:19:30 scottmac Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -662,6 +662,10 @@
REGISTER_LONG_CONSTANT(MYSQLI_REPORT_ALL, MYSQLI_REPORT_ALL, CONST_CS 
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_REPORT_OFF, 0, CONST_CS | 
CONST_PERSISTENT);
 
+   if (mysql_server_init(0, NULL, NULL)) {
+   return FAILURE;
+   }
+
return SUCCESS;
 }
 /* }}} */
@@ -670,6 +674,16 @@
  */
 PHP_MSHUTDOWN_FUNCTION(mysqli)
 {
+#ifdef PHP_WIN32
+   unsigned long client_ver = mysql_get_client_version;
+   /* Can't call mysql_server_end() multiple times prior to 5.0.42 on 
Windows */
+   if ((client_ver  50042  client_ver  50100) || client_ver  50122) {
+   mysql_server_end();
+   }
+#else
+   mysql_server_end();
+#endif
+
zend_hash_destroy(mysqli_driver_properties);
zend_hash_destroy(mysqli_result_properties);
zend_hash_destroy(mysqli_stmt_properties);
@@ -686,6 +700,11 @@
  */
 PHP_RINIT_FUNCTION(mysqli)
 {
+#ifdef ZTS
+   if (mysql_thread_init()) {
+   return FAILURE;
+   }
+#endif
MyG(error_msg) = NULL;
MyG(error_no) = 0;
 
@@ -697,6 +716,9 @@
  */
 PHP_RSHUTDOWN_FUNCTION(mysqli)
 {
+#ifdef ZTS
+   mysql_thread_end();
+#endif
if (MyG(error_msg)) {
efree(MyG(error_msg));
}

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

Re: [PHP-CVS] cvs: php-src /ext/standard/tests/file symlink_link_linkinfo_is_link_basic.phpt symlink_link_linkinfo_is_link_error.phpt symlink_link_linkinfo_is_link_variation.phpt

2007-06-25 Thread Raghubansh


Tony, I have tried running symlink_link_linkinfo_is_link_error.phpt with
php5 and php6 with following version and found it passing on linux
[EMAIL PROTECTED] file]$ php -v
PHP 6.0.0-dev (cli) (built: Jun 25 2007 20:36:37)
Copyright (c) 1997-2007 The PHP Group
Zend Engine v3.0.0-dev, Copyright (c) 1998-2007 Zend Technologies

PHP 5.2.4-dev (cli) (built: Jun 25 2007 20:34:56) (GCOV)
Copyright (c) 1997-2007 The PHP Group
Zend Engine v2.2.0, Copyright (c) 1998-2007 Zend Technologies

Could you please provide more details of the failure that you have mentioned
?
php version and os ?

with Regards,
Raghubansh, IBM India

On 6/25/07, Antony Dovgal [EMAIL PROTECTED] wrote:


On 22.06.2007 12:14, Raghubansh Kumar wrote:
 kraghuba  Fri Jun 22 08:14:16 2007 UTC

   Modified files:
 /php-src/ext/standard/tests/file

symlink_link_linkinfo_is_link_basic.phpt

symlink_link_linkinfo_is_link_variation.phpt

symlink_link_linkinfo_is_link_error.phpt
   Log:
   New tests for file system handling functions

symlink_link_linkinfo_is_link_error.phpt fails here:

008+ bool(true)
009- Warning: symlink(): No such file or directory in %s on line %d
010+ Warning: symlink(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 32
012- Warning: symlink(): No such file or directory in %s on line %d
013+ Warning: symlink(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 33
015- Warning: symlink(): No such file or directory in %s on line %d
016+ Warning: symlink(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 34
018- Warning: symlink(): No such file or directory in %s on line %d
019+ Warning: symlink(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 35
021- Warning: symlink(): No such file or directory in %s on line %d
022+ Warning: symlink(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 36
024- Warning: symlink(): No such file or directory in %s on line %d
025- bool(false)
026-
032+ int(2065)
033+ int(2065)
034+ int(2065)
035- Warning: linkinfo(): No such file or directory in %s on line %d
036- int(-1)
037-
038- Warning: linkinfo(): No such file or directory in %s on line %d
039- int(-1)
040-
044+ Warning: link(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 58
047+ Warning: link(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 59
049- Warning: link(): No such file or directory in %s on line %d
050+ Warning: link(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 60
052- Warning: link(): No such file or directory in %s on line %d
053+ Warning: link(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 61
055- Warning: link(): No such file or directory in %s on line %d
056+ Warning: link(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 62
058- Warning: link(): No such file or directory in %s on line %d
059+ Warning: link(): File exists in
/local/qa/5_2/ext/standard/tests/file/symlink_link_linkinfo_is_link_error.php
on line 63
061- Warning: link(): No such file or directory in %s on line %d
064- Warning: link(): No such file or directory in %s on line %d


--
Wbr,
Antony Dovgal

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





--
with Regards,
Raghubansh

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file filesize_variation-win32.phpt filesize_variation.phpt lstat_stat_basic.phpt lstat_stat_error.phpt rename_variation-win32.phpt rename_variat

2007-06-25 Thread Raghubansh


I do not see the failure(rename_variation.phpt) with  php5/php6 built from
latest checkout from CVS. Please provide more detail of the failure PHP
version, OS, etc.

About breaking up the testcase into smaller files, I'll revert back with
more details.

with Regards,
Raghubansh, IBM

On 6/25/07, Antony Dovgal [EMAIL PROTECTED] wrote:


On 22.06.2007 01:12, Raghubansh Kumar wrote:
 kraghuba  Thu Jun 21 21:12:18 2007 UTC

   Added files: (Branch: PHP_5_2)
 /php-src/ext/standard/tests/file  stat_error-win32.phpt
   lstat_stat_error.phpt
   filesize_variation-win32.phpt
   rename_variation-win32.phpt
   stat_basic-win32.phpt
   filesize_variation.phpt
   rename_variation.phpt
   lstat_stat_basic.phpt
   Log:
   New tests for file system handling functions

rename_variation.phpt fails here:
# cat ext/standard/tests/file/rename_variation.diff
046+
047+ Warning: link(): No such file or directory in
/local/qa/5_2/ext/standard/tests/file/file.inc on line 384

Could you please divide the tests in small files?
It's almost impossible to find the place in the code which corresponds to
line 46 of output in 7Kb test..

--
Wbr,
Antony Dovgal

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





--
with Regards,
Raghubansh

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard basic_functions.c

2007-06-25 Thread Antony Dovgal

tony2001Mon Jun 25 21:12:47 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/standard   basic_functions.c 
  Log:
  fix #41773 (php_strip_whitespace sends headers with errors suppressed)
  MFB is not needed, output buffering in HEAD handles this situation correctly
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.798r2=1.2027.2.547.2.799diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.798 php-src/NEWS:1.2027.2.547.2.799
--- php-src/NEWS:1.2027.2.547.2.798 Mon Jun 25 18:26:52 2007
+++ php-src/NEWSMon Jun 25 21:12:47 2007
@@ -36,7 +36,9 @@
 - Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory 
   already exists). (Pierre)
 
-- Fixed bug #41765 (Recode crashes/does not work on amd64) 
+- Fixed bug #41773 (php_strip_whitespace() sends headers with errors 
+  suppressed). (Tony)
+- Fixed bug #41765 (Recode crashes/does not work on amd64). 
   (nexus at smoula dot net, Stas)
 - Fixed bug #41724 (libxml_get_last_error() - errors service request scope).
   (thekid at php dot net, Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.54r2=1.725.2.31.2.55diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.54 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.55
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.54  Sat Jun  9 
11:44:08 2007
+++ php-src/ext/standard/basic_functions.c  Mon Jun 25 21:12:47 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.54 2007/06/09 11:44:08 sniper Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.55 2007/06/25 21:12:47 tony2001 Exp $ 
*/
 
 #include php.h
 #include php_streams.h
@@ -5455,7 +5455,18 @@
 
if (highlight_file(filename, syntax_highlighter_ini TSRMLS_CC) == 
FAILURE) {
if (i) { 
-   php_end_ob_buffer (1, 0 TSRMLS_CC); 
+   int res = php_ob_get_buffer(return_value TSRMLS_CC);
+
+   /* flush the buffer only if there is something to flush 
*/
+   if (res == SUCCESS  Z_STRLEN_P(return_value)  0) {
+   php_end_ob_buffer (1, 0 TSRMLS_CC);
+   zval_dtor(return_value);
+   } else {
+   php_end_ob_buffer (0, 0 TSRMLS_CC);
+   if (res == SUCCESS) {
+   zval_dtor(return_value);
+   }
+   }
}
RETURN_FALSE;
}
@@ -5482,8 +5493,6 @@
RETURN_FALSE;
}
 
-   php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
-
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.filename = filename;
file_handle.free_filename = 0;
@@ -5491,10 +5500,11 @@
zend_save_lexical_state(original_lex_state TSRMLS_CC);
if (open_file_for_scanning(file_handle TSRMLS_CC)==FAILURE) {
zend_restore_lexical_state(original_lex_state TSRMLS_CC);
-   php_end_ob_buffer(1, 0 TSRMLS_CC);
RETURN_EMPTY_STRING();
}
 
+   php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
+
zend_strip(TSRMLS_C);

zend_destroy_file_handle(file_handle TSRMLS_CC);

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

Re: [PHP-CVS] cvs: php-src /ext/standard/tests/file symlink_link_linkinfo_is_link_basic.phpt symlink_link_linkinfo_is_link_error.phpt symlink_link_linkinfo_is_link_variation.phpt

2007-06-25 Thread Hannes Magnusson


On 6/25/07, Raghubansh [EMAIL PROTECTED] wrote:

Tony, I have tried running symlink_link_linkinfo_is_link_error.phpt with
php5 and php6 with following version and found it passing on linux
[EMAIL PROTECTED] file]$ php -v
PHP 6.0.0-dev (cli) (built: Jun 25 2007 20:36:37)
Copyright (c) 1997-2007 The PHP Group
Zend Engine v3.0.0-dev, Copyright (c) 1998-2007 Zend Technologies

PHP 5.2.4-dev (cli) (built: Jun 25 2007 20:34:56) (GCOV)
Copyright (c) 1997-2007 The PHP Group
Zend Engine v2.2.0, Copyright (c) 1998-2007 Zend Technologies

Could you please provide more details of the failure that you have mentioned
?
php version and os ?


http://news.php.net/php.qa/36861

-Hannes

--
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_1.phpt

2007-06-25 Thread Antony Dovgal

tony2001Mon Jun 25 21:24:37 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/filebug41655_1.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_1.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/tests/file/bug41655_1.phpt
diff -u php-src/ext/standard/tests/file/bug41655_1.phpt:1.4 
php-src/ext/standard/tests/file/bug41655_1.phpt:1.5
--- php-src/ext/standard/tests/file/bug41655_1.phpt:1.4 Mon Jun 25 17:10:07 2007
+++ php-src/ext/standard/tests/file/bug41655_1.phpt Mon Jun 25 21:24:37 2007
@@ -7,4 +7,4 @@
$a=glob(./*.jpeg);
 ?
 --EXPECTF--
-Warning: glob(): open_basedir restriction in effect. File(%s.) is not within 
the allowed path(s): (/tmp) in %s on line %d
+Warning: glob(): open_basedir restriction in effect. File%s.) is not within 
the allowed path(s): (/tmp) in %s on line %d

-- 
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_1.phpt

2007-06-25 Thread Antony Dovgal

tony2001Mon Jun 25 21:24:44 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/filebug41655_1.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_1.phpt?r1=1.1.4.4r2=1.1.4.5diff_format=u
Index: php-src/ext/standard/tests/file/bug41655_1.phpt
diff -u php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.4 
php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.5
--- php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.4 Mon Jun 25 
17:10:14 2007
+++ php-src/ext/standard/tests/file/bug41655_1.phpt Mon Jun 25 21:24:44 2007
@@ -7,4 +7,4 @@
$a=glob(./*.jpeg);
 ?
 --EXPECTF--
-Warning: glob(): open_basedir restriction in effect. File(%s.) is not within 
the allowed path(s): (/tmp) in %s on line %d
+Warning: glob(): open_basedir restriction in effect. File%s.) is not within 
the allowed path(s): (/tmp) in %s on line %d

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

Re: [PHP-CVS] cvs: php-src /ext/standard/tests/file symlink_link_linkinfo_is_link_basic.phpt symlink_link_linkinfo_is_link_error.phpt symlink_link_linkinfo_is_link_variation.phpt

2007-06-25 Thread Antony Dovgal


On 26.06.2007 00:23, Raghubansh wrote:

Tony, I have tried running symlink_link_linkinfo_is_link_error.phpt with
php5 and php6 with following version and found it passing on linux
[EMAIL PROTECTED] file]$ php -v
PHP 6.0.0-dev (cli) (built: Jun 25 2007 20:36:37)
Copyright (c) 1997-2007 The PHP Group
Zend Engine v3.0.0-dev, Copyright (c) 1998-2007 Zend Technologies

PHP 5.2.4-dev (cli) (built: Jun 25 2007 20:34:56) (GCOV)
Copyright (c) 1997-2007 The PHP Group
Zend Engine v2.2.0, Copyright (c) 1998-2007 Zend Technologies

Could you please provide more details of the failure that you have mentioned
?
php version and os ?


5.2.4-dev  SuSE Linux 10.2 64bit
5.2.4-dev  Fedora Core release 3 64bit
5.2.4-dev  SuSE Linux 9.0 (x86-64)

These tests work fine on Fedora Core 3 32bit and SuSE 10.2 32bit.
Though, ext/standard/tests/file/readlink_realpath_basic.phpt fails on FC3 32bit:

$ cat ext/standard/tests/file/readlink_realpath_basic.diff
041+ string(108) 
/home/tony/php-src_5_2/ext/standard/tests/file/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp
041- bool(false)
067+ string(98) 
/home/tony/php-src_5_2/ext/standard/tests/file/readlink_realpath_basic/readlink_realpath_basic.tmp

I can also see lots of failures on MacIntel:
=
FAILED TEST SUMMARY
-
Test filesize() function: usage variations 
[ext/standard/tests/file/filesize_variation.phpt]
Test readlink() and realpath functions: basic functionality 
[ext/standard/tests/file/readlink_realpath_basic.phpt]
Test readlink() and realpath() functions: error conditions 
[ext/standard/tests/file/readlink_realpath_error.phpt]
Test readlink() and realpath() functions: usage variation 
[ext/standard/tests/file/readlink_realpath_variation.phpt]
Test symlink(), linkinfo(), link() and is_link() functions : error conditions 
[ext/standard/tests/file/symlink_link_linkinfo_is_link_error.phpt]
Test symlink(), linkinfo(), link() and is_link() functions : usage variations 
[ext/standard/tests/file/symlink_link_linkinfo_is_link_variation.phpt]

Want me to collect the diffs and send them to you?

--
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_2) /ext/standard/tests/file lstat_stat_basic.phpt symlink_link_linkinfo_is_link_variation.phpt

2007-06-25 Thread Dmitry Stogov

dmitry  Mon Jun 25 09:01:53 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/filelstat_stat_basic.phpt 

symlink_link_linkinfo_is_link_variation.phpt 
  Log:
  Fixed tests
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_basic.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/tests/file/lstat_stat_basic.phpt
diff -u php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.1.2.3 
php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.1.2.4
--- php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.1.2.3   Fri Jun 
22 19:18:37 2007
+++ php-src/ext/standard/tests/file/lstat_stat_basic.phpt   Mon Jun 25 
09:01:53 2007
@@ -95,221 +95,221 @@
 -- comparing difference in dir stats before and after creating file in it --
 array(26) {
   [0]=
-  int(%d)
+  int(%i)
   [1]=
-  int(%d)
+  int(%i)
   [2]=
-  int(%d)
+  int(%i)
   [3]=
-  int(%d)
+  int(%i)
   [4]=
-  int(%d)
+  int(%i)
   [5]=
-  int(%d)
+  int(%i)
   [6]=
-  int(%d)
+  int(%i)
   [7]=
-  int(%d)
+  int(%i)
   [8]=
-  int(%d)
+  int(%i)
   [9]=
-  int(%d)
+  int(%i)
   [10]=
-  int(%d)
+  int(%i)
   [11]=
-  int(%d)
+  int(%i)
   [12]=
-  int(%d)
+  int(%i)
   [dev]=
-  int(%d)
+  int(%i)
   [ino]=
-  int(%d)
+  int(%i)
   [mode]=
-  int(%d)
+  int(%i)
   [nlink]=
-  int(%d)
+  int(%i)
   [uid]=
-  int(%d)
+  int(%i)
   [gid]=
-  int(%d)
+  int(%i)
   [rdev]=
-  int(%d)
+  int(%i)
   [size]=
-  int(%d)
+  int(%i)
   [atime]=
-  int(%d)
+  int(%i)
   [mtime]=
-  int(%d)
+  int(%i)
   [ctime]=
-  int(%d)
+  int(%i)
   [blksize]=
-  int(%d)
+  int(%i)
   [blocks]=
-  int(%d)
+  int(%i)
 }
 array(26) {
   [0]=
-  int(%d)
+  int(%i)
   [1]=
-  int(%d)
+  int(%i)
   [2]=
-  int(%d)
+  int(%i)
   [3]=
-  int(%d)
+  int(%i)
   [4]=
-  int(%d)
+  int(%i)
   [5]=
-  int(%d)
+  int(%i)
   [6]=
-  int(%d)
+  int(%i)
   [7]=
-  int(%d)
+  int(%i)
   [8]=
-  int(%d)
+  int(%i)
   [9]=
-  int(%d)
+  int(%i)
   [10]=
-  int(%d)
+  int(%i)
   [11]=
-  int(%d)
+  int(%i)
   [12]=
-  int(%d)
+  int(%i)
   [dev]=
-  int(%d)
+  int(%i)
   [ino]=
-  int(%d)
+  int(%i)
   [mode]=
-  int(%d)
+  int(%i)
   [nlink]=
-  int(%d)
+  int(%i)
   [uid]=
-  int(%d)
+  int(%i)
   [gid]=
-  int(%d)
+  int(%i)
   [rdev]=
-  int(%d)
+  int(%i)
   [size]=
-  int(%d)
+  int(%i)
   [atime]=
-  int(%d)
+  int(%i)
   [mtime]=
-  int(%d)
+  int(%i)
   [ctime]=
-  int(%d)
+  int(%i)
   [blksize]=
-  int(%d)
+  int(%i)
   [blocks]=
-  int(%d)
+  int(%i)
 }
 bool(true)
 -- comparing difference in file stats before and after creating link to it --
 array(26) {
   [0]=
-  int(%d)
+  int(%i)
   [1]=
-  int(%d)
+  int(%i)
   [2]=
-  int(%d)
+  int(%i)
   [3]=
-  int(%d)
+  int(%i)
   [4]=
-  int(%d)
+  int(%i)
   [5]=
-  int(%d)
+  int(%i)
   [6]=
-  int(%d)
+  int(%i)
   [7]=
-  int(%d)
+  int(%i)
   [8]=
-  int(%d)
+  int(%i)
   [9]=
-  int(%d)
+  int(%i)
   [10]=
-  int(%d)
+  int(%i)
   [11]=
-  int(%d)
+  int(%i)
   [12]=
-  int(%d)
+  int(%i)
   [dev]=
-  int(%d)
+  int(%i)
   [ino]=
-  int(%d)
+  int(%i)
   [mode]=
-  int(%d)
+  int(%i)
   [nlink]=
-  int(%d)
+  int(%i)
   [uid]=
-  int(%d)
+  int(%i)
   [gid]=
-  int(%d)
+  int(%i)
   [rdev]=
-  int(%d)
+  int(%i)
   [size]=
-  int(%d)
+  int(%i)
   [atime]=
-  int(%d)
+  int(%i)
   [mtime]=
-  int(%d)
+  int(%i)
   [ctime]=
-  int(%d)
+  int(%i)
   [blksize]=
-  int(%d)
+  int(%i)
   [blocks]=
-  int(%d)
+  int(%i)
 }
 array(26) {
   [0]=
-  int(%d)
+  int(%i)
   [1]=
-  int(%d)
+  int(%i)
   [2]=
-  int(%d)
+  int(%i)
   [3]=
-  int(%d)
+  int(%i)
   [4]=
-  int(%d)
+  int(%i)
   [5]=
-  int(%d)
+  int(%i)
   [6]=
-  int(%d)
+  int(%i)
   [7]=
-  int(%d)
+  int(%i)
   [8]=
-  int(%d)
+  int(%i)
   [9]=
-  int(%d)
+  int(%i)
   [10]=
-  int(%d)
+  int(%i)
   [11]=
-  int(%d)
+  int(%i)
   [12]=
-  int(%d)
+  int(%i)
   [dev]=
-  int(%d)
+  int(%i)
   [ino]=
-  int(%d)
+  int(%i)
   [mode]=
-  int(%d)
+  int(%i)
   [nlink]=
-  int(%d)
+  int(%i)
   [uid]=
-  int(%d)
+  int(%i)
   [gid]=
-  int(%d)
+  int(%i)
   [rdev]=
-  int(%d)
+  int(%i)
   [size]=
-  int(%d)
+  int(%i)
   [atime]=
-  int(%d)
+  int(%i)
   [mtime]=
-  int(%d)
+  int(%i)
   [ctime]=
-  int(%d)
+  int(%i)
   [blksize]=
-  int(%d)
+  int(%i)
   [blocks]=
-  int(%d)
+  int(%i)
 }
 bool(true)
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: 
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation.phpt
diff -u 
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation.phpt:1.1.2.1
 
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation.phpt:1.1.2.2
--- 
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation.phpt:1.1.2.1
Fri Jun 22 08:11:44 2007
+++ 
php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation.phpt
Mon Jun 25 09:01:53 2007

38 matches

Mail list logo