date:20080225

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

2008-02-25 Thread changelog

changelog   Tue Feb 26 01:31:32 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2969r2=1.2970diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2969 php-src/ChangeLog:1.2970
--- php-src/ChangeLog:1.2969Mon Feb 25 01:31:37 2008
+++ php-src/ChangeLog   Tue Feb 26 01:31:31 2008
@@ -1,3 +1,181 @@
+2008-02-25  Christopher Jones  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/oci8/oci8_interface.c
+  ext/oci8/oci8_lob.c
+  ext/oci8/oci8_statement.c
+  ext/oci8/php_oci8_int.h
+  ext/oci8/tests/bug43492_2.phpt
+  ext/oci8/tests/bug44008.phpt
+  ext/oci8/tests/bug44206.phpt
+  ext/oci8/tests/lob_014.phpt
+  ext/oci8/tests/lob_021.phpt:
+  MFH: OCI8: fix bug #44008 (OCI-Lob-close)  bug #44206 (ref cursor leak)
+
+* ext/oci8/oci8_interface.c
+  ext/oci8/oci8_interface.c
+  ext/oci8/oci8_lob.c
+  ext/oci8/oci8_lob.c
+  ext/oci8/oci8_statement.c
+  ext/oci8/oci8_statement.c
+  ext/oci8/php_oci8_int.h
+  ext/oci8/php_oci8_int.h
+  ext/oci8/tests/bug43492_2.phpt
+  ext/oci8/tests/bug43492_2.phpt
+  ext/oci8/tests/bug43492_2.phpt
+  ext/oci8/tests/bug43492_2.phpt
+  ext/oci8/tests/bug44008.phpt
+  ext/oci8/tests/bug44008.phpt
+  ext/oci8/tests/bug44008.phpt
+  ext/oci8/tests/bug44008.phpt
+  ext/oci8/tests/bug44206.phpt
+  ext/oci8/tests/bug44206.phpt
+  ext/oci8/tests/bug44206.phpt
+  ext/oci8/tests/bug44206.phpt
+  ext/oci8/tests/lob_014.phpt
+  ext/oci8/tests/lob_014.phpt
+  ext/oci8/tests/lob_021.phpt
+  ext/oci8/tests/lob_021.phpt:
+  OCI8: fix bug #44008 (OCI-Lob-close)  bug #44206 (ref cursor leak)
+
+2008-02-25  Etienne Kneuss  [EMAIL PROTECTED]
+
+* ext/spl/spl_heap.c:
+  Fix folding
+
+* (PHP_5_3)
+  ext/spl/config.m4
+  ext/spl/config.w32
+  ext/spl/php_spl.c
+  ext/spl/spl_heap.c
+  ext/spl/spl_heap.h
+  ext/spl/tests/heap_001.phpt
+  ext/spl/tests/heap_002.phpt
+  ext/spl/tests/heap_003.phpt
+  ext/spl/tests/heap_004.phpt
+  ext/spl/tests/heap_005.phpt
+  ext/spl/tests/heap_006.phpt
+  ext/spl/tests/heap_007.phpt
+  ext/spl/tests/heap_008.phpt
+  ext/spl/tests/pqueue_001.phpt
+  ext/spl/tests/pqueue_002.phpt
+  ext/spl/tests/pqueue_003.phpt
+  ext/spl/tests/pqueue_004.phpt:
+  MFH: SplHeap, SplMinHeap, SplMaxHeap, SplPriorityQueue implementation
+
+* ext/spl/config.m4
+  ext/spl/config.w32
+  ext/spl/php_spl.c
+  ext/spl/spl_heap.c
+  ext/spl/spl_heap.c
+  ext/spl/spl_heap.h
+  ext/spl/spl_heap.h
+  ext/spl/tests/heap_001.phpt
+  ext/spl/tests/heap_001.phpt
+  ext/spl/tests/heap_002.phpt
+  ext/spl/tests/heap_002.phpt
+  ext/spl/tests/heap_003.phpt
+  ext/spl/tests/heap_003.phpt
+  ext/spl/tests/heap_004.phpt
+  ext/spl/tests/heap_004.phpt
+  ext/spl/tests/heap_005.phpt
+  ext/spl/tests/heap_005.phpt
+  ext/spl/tests/heap_006.phpt
+  ext/spl/tests/heap_006.phpt
+  ext/spl/tests/heap_007.phpt
+  ext/spl/tests/heap_007.phpt
+  ext/spl/tests/heap_008.phpt
+  ext/spl/tests/heap_008.phpt
+  ext/spl/tests/pqueue_001.phpt
+  ext/spl/tests/pqueue_001.phpt
+  ext/spl/tests/pqueue_002.phpt
+  ext/spl/tests/pqueue_002.phpt
+  ext/spl/tests/pqueue_003.phpt
+  ext/spl/tests/pqueue_003.phpt
+  ext/spl/tests/pqueue_004.phpt
+  ext/spl/tests/pqueue_004.phpt:
+  SplHeap, SplMinHeap, SplMaxHeap, SplPriorityQueue implementation
+
+2008-02-25  Felipe Pena  [EMAIL PROTECTED]
+
+* ext/standard/metaphone.c
+  ext/standard/metaphone.c
+  ext/standard/tests/strings/bug44242.phpt
+  ext/standard/tests/strings/bug44242.phpt:
+  MFB: Fixed bug #44242 (metaphone('CMXFXM') crashes PHP)
+
+2008-02-25  Rob Richards  [EMAIL PROTECTED]
+
+* ext/mysqlnd/mysqlnd_wireprotocol.c:
+  fix win32 build
+
+2008-02-25  Felipe Pena  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  NEWS
+  ext/standard/metaphone.c
+  ext/standard/tests/strings/bug44242.phpt
+  ext/standard/tests/strings/bug44242.phpt
+  ext/standard/tests/strings/bug44242.phpt:
+  Fixed bug #44242 (metaphone(CMXFXM) crashes PHP)
+
+2008-02-25  Derick Rethans  [EMAIL PROTECTED]
+
+* ext/date/php_date.c
+  ext/date/tests/bug41523-64bit.phpt
+  ext/date/tests/bug41523-64bit.phpt
+  ext/date/tests/bug41523-64bit.phpt
+  ext/date/tests/bug41523.phpt
+  ext/date/tests/mktime-3-64bit.phpt
+  ext/date/tests/mktime-3-64bit.phpt
+  ext/date/tests/mktime-3-64bit.phpt
+  ext/date/tests/mktime-3.phpt
+  ext/date/tests/strtotime-mysql-64bit.phpt
+  ext/date/tests/strtotime-mysql-64bit.phpt
+  ext/date/tests/strtotime-mysql-64bit.phpt
+  ext/date/tests/strtotime-mysql.phpt
+  ext/date/tests/strtotime3-64bit.phpt
+

Re: [PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c

2008-02-25 Thread Antony Dovgal

On 24.02.2008 19:09, Ilia Alshanetsky wrote:
 iliaa Sun Feb 24 16:09:13 2008 UTC
 
   Modified files:  
 /php-src/ext/pdo  pdo_stmt.c 
   Log:
   
   MFB: Fixed bug #44200 (A crash in PDO when no bound targets exists and yet 
   bound parameters are present)

The tests below are failing after this commit.

/local/qa/5_3/ext/pdo_mysql/tests/bug_39483.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/bug_36798.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/bug_39656.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_016.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_016a.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_018.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_024.phpt
/local/qa/5_3/ext/pdo_mysql/tests/pecl_bug_5780.phpt
/local/qa/5_3/ext/pdo_mysql/tests/pecl_bug_5802.phpt
/local/qa/5_3/ext/pdo_sqlite/tests/bug33841.phpt
/local/qa/5_3/ext/pdo_sqlite/tests/bug35336.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/bug_34630.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/bug_35671.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/bug_36798.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/bug_38394.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/bug_39398.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/bug_39656.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_016.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_016a.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_018.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_021.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_024.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_025.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_026.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_028.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_029.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_030.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_031.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: 
/local/qa/5_3/ext/pdo/tests/bug_36798.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: 
/local/qa/5_3/ext/pdo/tests/bug_39656.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_016.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_016a.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_018.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: 
/local/qa/5_3/ext/pdo/tests/pdo_024.phpt

-- 
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 fgetc_basic.phpt fgetc_variation2.phpt

2008-02-25 Thread Steve Seear

stevseeaMon Feb 25 10:33:30 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/filefgetc_variation2.phpt 
fgetc_basic.phpt 
  Log:
  Replace hardcoded resource ids with %d in fgetc() tests.
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_variation2.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/file/fgetc_variation2.phpt
diff -u php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.2 
php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.3
--- php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.2   Sat Jul 21 
08:01:25 2007
+++ php-src/ext/standard/tests/file/fgetc_variation2.phpt   Mon Feb 25 
10:33:30 2008
@@ -41,7 +41,7 @@
 *** Testing fgetc() : usage variations ***
 -- Testing fgetc() with closed handle --
 
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
+Warning: fgetc(): %d is not a valid stream resource in %s on line %d
 bool(false)
 -- Testing fgetc() with unset handle --
 
@@ -54,33 +54,7 @@
 *** Testing fgetc() : usage variations ***
 -- Testing fgetc() with closed handle --
 
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
-bool(false)
--- Testing fgetc() with unset handle --
-
-Notice: Undefined variable: file_handle in %s on line %d
-
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on 
line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing fgetc() : usage variations ***
--- Testing fgetc() with closed handle --
-
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
-bool(false)
--- Testing fgetc() with unset handle --
-
-Notice: Undefined variable: file_handle in %s on line %d
-
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on 
line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing fgetc() : usage variations ***
--- Testing fgetc() with closed handle --
-
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
+Warning: fgetc(): %d is not a valid stream resource in %s on line %d
 bool(false)
 -- Testing fgetc() with unset handle --
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_basic.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/standard/tests/file/fgetc_basic.phpt
diff -u php-src/ext/standard/tests/file/fgetc_basic.phpt:1.5 
php-src/ext/standard/tests/file/fgetc_basic.phpt:1.6
--- php-src/ext/standard/tests/file/fgetc_basic.phpt:1.5Wed Oct 31 
13:39:00 2007
+++ php-src/ext/standard/tests/file/fgetc_basic.phptMon Feb 25 10:33:30 2008
@@ -69,477 +69,477 @@
 string(1) 2
 int(1)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 2 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using rb mode --
 string(1) 2
 int(1)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 3 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using rt mode --
 string(1) 2
 int(1)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 4 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using r+ mode --
 string(1) 2
 int(1)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(11) of type (stream)

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

2008-02-25 Thread Steve Seear

stevseeaMon Feb 25 10:28:43 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/filefgetc_variation2.phpt 
fgetc_basic.phpt 
  Log:
  Replace hardcoded resource ids with %d in fgetc() tests.
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_variation2.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/file/fgetc_variation2.phpt
diff -u php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.1 
php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.1   Sat Jul 
21 07:55:07 2007
+++ php-src/ext/standard/tests/file/fgetc_variation2.phpt   Mon Feb 25 
10:28:43 2008
@@ -41,20 +41,7 @@
 *** Testing fgetc() : usage variations ***
 -- Testing fgetc() with closed handle --
 
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
-bool(false)
--- Testing fgetc() with unset handle --
-
-Notice: Undefined variable: file_handle in %s on line %d
-
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on 
line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing fgetc() : usage variations ***
--- Testing fgetc() with closed handle --
-
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
+Warning: fgetc(): %d is not a valid stream resource in %s on line %d
 bool(false)
 -- Testing fgetc() with unset handle --
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_basic.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/tests/file/fgetc_basic.phpt
diff -u php-src/ext/standard/tests/file/fgetc_basic.phpt:1.1.2.3 
php-src/ext/standard/tests/file/fgetc_basic.phpt:1.1.2.4
--- php-src/ext/standard/tests/file/fgetc_basic.phpt:1.1.2.3Wed Oct 31 
13:39:14 2007
+++ php-src/ext/standard/tests/file/fgetc_basic.phptMon Feb 25 10:28:43 2008
@@ -69,475 +69,475 @@
 string(1) 2
 int(1)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 2 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using rb mode --
 string(1) 2
 int(1)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 3 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using rt mode --
 string(1) 2
 int(1)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 4 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using r+ mode --
 string(1) 2
 int(1)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 5 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using r+b mode --
 string(1) 2
 int(1)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)

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

2008-02-25 Thread Steve Seear

stevseeaMon Feb 25 10:31:18 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/filefgetc_variation2.phpt 
fgetc_basic.phpt 
  Log:
  Replace hardcoded resource ids with %d in fgetc() tests.
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_variation2.phpt?r1=1.1.2.1.2.1r2=1.1.2.1.2.2diff_format=u
Index: php-src/ext/standard/tests/file/fgetc_variation2.phpt
diff -u php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.1.2.1 
php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.1.2.2
--- php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.1.2.1   Tue Nov 
 6 17:11:57 2007
+++ php-src/ext/standard/tests/file/fgetc_variation2.phpt   Mon Feb 25 
10:31:17 2008
@@ -41,7 +41,7 @@
 *** Testing fgetc() : usage variations ***
 -- Testing fgetc() with closed handle --
 
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
+Warning: fgetc(): %d is not a valid stream resource in %s on line %d
 bool(false)
 -- Testing fgetc() with unset handle --
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_basic.phpt?r1=1.1.2.1.2.2r2=1.1.2.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/fgetc_basic.phpt
diff -u php-src/ext/standard/tests/file/fgetc_basic.phpt:1.1.2.1.2.2 
php-src/ext/standard/tests/file/fgetc_basic.phpt:1.1.2.1.2.3
--- php-src/ext/standard/tests/file/fgetc_basic.phpt:1.1.2.1.2.2Wed Oct 
31 13:39:26 2007
+++ php-src/ext/standard/tests/file/fgetc_basic.phptMon Feb 25 10:31:17 2008
@@ -69,475 +69,475 @@
 string(1) 2
 int(1)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 2 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using rb mode --
 string(1) 2
 int(1)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 3 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using rt mode --
 string(1) 2
 int(1)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 4 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using r+ mode --
 string(1) 2
 int(1)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 5 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened using r+b mode --
 string(1) 2
 int(1)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(2)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(3)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(4)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(5)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 string(1) 2
 int(6)
 bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
 -- Innerloop iteration 6 of Outerloop Iteration 1 --
 -- Testing fgetc() : file opened

Re: [PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c

2008-02-25 Thread Ilia Alshanetsky


That seems strange, I'll take a look tonight.


On 25-Feb-08, at 3:20 AM, Antony Dovgal wrote:


On 24.02.2008 19:09, Ilia Alshanetsky wrote:

iliaa   Sun Feb 24 16:09:13 2008 UTC

 Modified files:
   /php-src/ext/pdo pdo_stmt.c
 Log:

 MFB: Fixed bug #44200 (A crash in PDO when no bound targets exists  
and yet

 bound parameters are present)


The tests below are failing after this commit.

/local/qa/5_3/ext/pdo_mysql/tests/bug_39483.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/bug_36798.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/bug_39656.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_016.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_016a.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_018.phpt
# /local/qa/5_3/ext/pdo_mysql/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_024.phpt

/local/qa/5_3/ext/pdo_mysql/tests/pecl_bug_5780.phpt
/local/qa/5_3/ext/pdo_mysql/tests/pecl_bug_5802.phpt
/local/qa/5_3/ext/pdo_sqlite/tests/bug33841.phpt
/local/qa/5_3/ext/pdo_sqlite/tests/bug35336.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/bug_34630.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/bug_35671.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/bug_36798.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/bug_38394.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/bug_39398.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/bug_39656.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_016.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_016a.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_018.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_021.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_024.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_025.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_026.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_028.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_029.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_030.phpt
# /local/qa/5_3/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_031.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/bug_36798.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/bug_39656.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_016.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_016a.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_018.phpt
# /local/qa/5_3/ext/sqlite/tests/pdo/common.phpt: /local/qa/5_3/ext/ 
pdo/tests/pdo_024.phpt


--
Wbr,
Antony Dovgal

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



Ilia Alshanetsky

--
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/date/lib parse_date.c parse_date.re

2008-02-25 Thread Derick Rethans

derick  Mon Feb 25 18:26:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/date/lib   parse_date.c parse_date.re 
  Log:
  - MFH: Added a few new separation specifiers.
  - MFH: Added specifiers that can reset or default the y/m/d/h/i/s/tz values.
  - MFH: Fixed a problem with parsing timezones as part of a format.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.30.2.14.2.8r2=1.29.2.30.2.14.2.9diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.8 
php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.9
--- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.8Sun Feb 17 
18:17:28 2008
+++ php-src/ext/date/lib/parse_date.c   Mon Feb 25 18:26:16 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Sun Feb 17 19:15:32 2008 */
+/* Generated by re2c 0.12.1 on Sun Feb 24 19:24:27 2008 */
 #line 1 ext/date/lib/parse_date.re
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.29.2.30.2.14.2.8 2008/02/17 18:17:28 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.30.2.14.2.9 2008/02/25 18:26:16 derick Exp $ */
 
 #include timelib.h
 
@@ -728,7 +728,7 @@
long  value = 0;
const timelib_tz_lookup_table *tp;
 
-   while (**ptr != '\0'  **ptr != ')') {
+   while (**ptr != '\0'  **ptr != ')'  **ptr != ' ') {
++*ptr;
}
end = *ptr;
@@ -23095,6 +23095,39 @@
}
break;
 
+   case ';':
+   case ':':
+   case '/':
+   case '.':
+   case ',':
+   case '-':
+   if (*ptr == *fptr) {
+   ++ptr;
+   } else {
+   add_pbf_error(s, The separation symbol 
could not be found, string, begin);
+   }
+   break;
+
+   case '!': // reset all fields to default
+   s-time-y = 1970;
+   s-time-m = 1;
+   s-time-d = 1;
+   s-time-h = s-time-i = s-time-s = 0;
+   s-time-f = 0.0;
+   s-time-tz_info = NULL;
+   break; // break intentionally not missing
+
+   case '|': // reset all fields to default when not set
+   if (s-time-y == TIMELIB_UNSET ) s-time-y = 
1970;
+   if (s-time-m == TIMELIB_UNSET ) s-time-m = 
1;
+   if (s-time-d == TIMELIB_UNSET ) s-time-d = 
1;
+   if (s-time-h == TIMELIB_UNSET ) s-time-h = 
0;
+   if (s-time-i == TIMELIB_UNSET ) s-time-i = 
0;
+   if (s-time-s == TIMELIB_UNSET ) s-time-s = 
0;
+   if (s-time-f == TIMELIB_UNSET ) s-time-f = 
0.0;
+   
+   break; // break intentionally not missing
+
case '?': // random char
++ptr;
break;
@@ -23118,6 +23151,20 @@
add_pbf_error(s, Data missing, string, ptr);
}
 
+   // clean up a bit
+   if (s-time-h != TIMELIB_UNSET || s-time-i != TIMELIB_UNSET || 
s-time-s != TIMELIB_UNSET) {
+   if (s-time-h == TIMELIB_UNSET ) {
+   s-time-h = 0;
+   }
+   if (s-time-i == TIMELIB_UNSET ) {
+   s-time-i = 0;
+   }
+   if (s-time-s == TIMELIB_UNSET ) {
+   s-time-s = 0;
+   }
+   }
+
+
if (errors) {
*errors = in.errors;
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.26.2.27.2.12.2.7r2=1.26.2.27.2.12.2.8diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.7 
php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.8
--- php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.7   Sun Feb 17 
18:17:45 2008
+++ php-src/ext/date/lib/parse_date.re  Mon Feb 25 18:26:33 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: parse_date.re,v 1.26.2.27.2.12.2.7 2008/02/17 18:17:45 derick Exp $ */
+/* $Id: parse_date.re,v 1.26.2.27.2.12.2.8 2008/02/25 18:26:33 derick Exp $ */
 
 #include timelib.h
 
@@ -726,7 +726,7 @@
long  value = 0;
const timelib_tz_lookup_table *tp;
 
-

[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c parse_date.re

2008-02-25 Thread Derick Rethans

derick  Mon Feb 25 18:25:01 2008 UTC

  Modified files:  
/php-src/ext/date/lib   parse_date.c parse_date.re 
  Log:
  - Added a few new separation specifiers.
  - Added specifiers that can reset or default the y/m/d/h/i/s/tz values.
  - Fixed a problem with parsing timezones as part of a format.
  #- [DOC]: Added format specifiers.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.81r2=1.82diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.81 
php-src/ext/date/lib/parse_date.c:1.82
--- php-src/ext/date/lib/parse_date.c:1.81  Sun Feb 17 18:17:00 2008
+++ php-src/ext/date/lib/parse_date.c   Mon Feb 25 18:25:00 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Sun Feb 17 19:16:04 2008 */
+/* Generated by re2c 0.12.1 on Mon Feb 25 19:12:37 2008 */
 #line 1 ext/date/lib/parse_date.re
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.81 2008/02/17 18:17:00 derick Exp $ */
+/* $Id: parse_date.c,v 1.82 2008/02/25 18:25:00 derick Exp $ */
 
 #include timelib.h
 
@@ -728,7 +728,7 @@
long  value = 0;
const timelib_tz_lookup_table *tp;
 
-   while (**ptr != '\0'  **ptr != ')') {
+   while (**ptr != '\0'  **ptr != ')'  **ptr != ' ') {
++*ptr;
}
end = *ptr;
@@ -23095,6 +23095,39 @@
}
break;
 
+   case ';':
+   case ':':
+   case '/':
+   case '.':
+   case ',':
+   case '-':
+   if (*ptr == *fptr) {
+   ++ptr;
+   } else {
+   add_pbf_error(s, The separation symbol 
could not be found, string, begin);
+   }
+   break;
+
+   case '!': // reset all fields to default
+   s-time-y = 1970;
+   s-time-m = 1;
+   s-time-d = 1;
+   s-time-h = s-time-i = s-time-s = 0;
+   s-time-f = 0.0;
+   s-time-tz_info = NULL;
+   break; // break intentionally not missing
+
+   case '|': // reset all fields to default when not set
+   if (s-time-y == TIMELIB_UNSET ) s-time-y = 
1970;
+   if (s-time-m == TIMELIB_UNSET ) s-time-m = 
1;
+   if (s-time-d == TIMELIB_UNSET ) s-time-d = 
1;
+   if (s-time-h == TIMELIB_UNSET ) s-time-h = 
0;
+   if (s-time-i == TIMELIB_UNSET ) s-time-i = 
0;
+   if (s-time-s == TIMELIB_UNSET ) s-time-s = 
0;
+   if (s-time-f == TIMELIB_UNSET ) s-time-f = 
0.0;
+   
+   break; // break intentionally not missing
+
case '?': // random char
++ptr;
break;
@@ -23118,6 +23151,20 @@
add_pbf_error(s, Data missing, string, ptr);
}
 
+   // clean up a bit
+   if (s-time-h != TIMELIB_UNSET || s-time-i != TIMELIB_UNSET || 
s-time-s != TIMELIB_UNSET) {
+   if (s-time-h == TIMELIB_UNSET ) {
+   s-time-h = 0;
+   }
+   if (s-time-i == TIMELIB_UNSET ) {
+   s-time-i = 0;
+   }
+   if (s-time-s == TIMELIB_UNSET ) {
+   s-time-s = 0;
+   }
+   }
+
+
if (errors) {
*errors = in.errors;
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.72r2=1.73diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.72 
php-src/ext/date/lib/parse_date.re:1.73
--- php-src/ext/date/lib/parse_date.re:1.72 Sun Feb 17 18:17:01 2008
+++ php-src/ext/date/lib/parse_date.re  Mon Feb 25 18:25:01 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: parse_date.re,v 1.72 2008/02/17 18:17:01 derick Exp $ */
+/* $Id: parse_date.re,v 1.73 2008/02/25 18:25:01 derick Exp $ */
 
 #include timelib.h
 
@@ -726,7 +726,7 @@
long  value = 0;
const timelib_tz_lookup_table *tp;
 
-   while (**ptr != '\0'  **ptr != ')') {
+   while (**ptr != '\0'  **ptr != ')'  **ptr != ' ') {
++*ptr;
}
end = *ptr;
@@ -1867,6 +1867,39 @@

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/lib parse_date.c parse_date.re

2008-02-25 Thread Derick Rethans

derick  Mon Feb 25 18:28:28 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/date/lib   parse_date.c parse_date.re 
  Log:
  - MFH: Fixed a problem with parsing timezones as part of a format.
  #- It doesn't actually fix anything, but atleast it's consistent with HEAD.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.30.2.15r2=1.29.2.30.2.16diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.15 
php-src/ext/date/lib/parse_date.c:1.29.2.30.2.16
--- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.15Sat Jan 26 16:26:33 2008
+++ php-src/ext/date/lib/parse_date.c   Mon Feb 25 18:28:03 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Sat Jan 26 16:10:48 2008 */
+/* Generated by re2c 0.12.1 on Mon Feb 25 19:27:05 2008 */
 #line 1 ext/date/lib/parse_date.re
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.29.2.30.2.15 2008/01/26 16:26:33 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.30.2.16 2008/02/25 18:28:03 derick Exp $ */
 
 #include timelib.h
 
@@ -669,7 +669,7 @@
long  value = 0;
const timelib_tz_lookup_table *tp;
 
-   while (**ptr != '\0'  **ptr != ')') {
+   while (**ptr != '\0'  **ptr != ')'  **ptr != ' ') {
++*ptr;
}
end = *ptr;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.26.2.27.2.12r2=1.26.2.27.2.13diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12 
php-src/ext/date/lib/parse_date.re:1.26.2.27.2.13
--- php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12   Thu Jul 12 18:58:00 2007
+++ php-src/ext/date/lib/parse_date.re  Mon Feb 25 18:28:18 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: parse_date.re,v 1.26.2.27.2.12 2007/07/12 18:58:00 derick Exp $ */
+/* $Id: parse_date.re,v 1.26.2.27.2.13 2008/02/25 18:28:18 derick Exp $ */
 
 #include timelib.h
 
@@ -667,7 +667,7 @@
long  value = 0;
const timelib_tz_lookup_table *tp;
 
-   while (**ptr != '\0'  **ptr != ')') {
+   while (**ptr != '\0'  **ptr != ')'  **ptr != ' ') {
++*ptr;
}
end = *ptr;

-- 
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/date/tests bug41523-64bit.phpt bug41523.phpt mktime-3-64bit.phpt mktime-3.phpt strtotime-mysql-64bit.phpt strtotime-mysql.phpt strtotime3-64bit.phpt strtotime3.php

2008-02-25 Thread Derick Rethans

derick  Mon Feb 25 22:32:59 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/wddx/tests 001-64bit.phpt 
/php-src/ext/date/tests bug41523-64bit.phpt mktime-3-64bit.phpt 
strtotime-mysql-64bit.phpt 
strtotime3-64bit.phpt 

  Modified files:  
/php-src/ext/wddx/tests 001.phpt 
/php-src/ext/date/tests bug41523.phpt mktime-3.phpt 
strtotime-mysql.phpt strtotime3.phpt 
  Log:
  - MFH: Fixed tests on 64bit platform.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/001.phpt?r1=1.5.4.1.2.1r2=1.5.4.1.2.1.2.1diff_format=u
Index: php-src/ext/wddx/tests/001.phpt
diff -u php-src/ext/wddx/tests/001.phpt:1.5.4.1.2.1 
php-src/ext/wddx/tests/001.phpt:1.5.4.1.2.1.2.1
--- php-src/ext/wddx/tests/001.phpt:1.5.4.1.2.1 Fri May 18 11:29:55 2007
+++ php-src/ext/wddx/tests/001.phpt Mon Feb 25 22:32:59 2008
@@ -1,7 +1,8 @@
 --TEST--
-wddx deserialization test
+wddx deserialization test (32-bit)
 --SKIPIF--
 ?php if (!extension_loaded(wddx)) print skip; ?
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK ?
 --INI--
 precision=14
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41523.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: php-src/ext/date/tests/bug41523.phpt
diff -u php-src/ext/date/tests/bug41523.phpt:1.1.2.2 
php-src/ext/date/tests/bug41523.phpt:1.1.2.2.2.1
--- php-src/ext/date/tests/bug41523.phpt:1.1.2.2Thu Jul 12 18:58:00 2007
+++ php-src/ext/date/tests/bug41523.phptMon Feb 25 22:32:59 2008
@@ -1,5 +1,7 @@
 --TEST--
-Bug #41523 (strtotime('-00-00 00:00:00') is parsed as 1999-11-30)
+Bug #41523 (strtotime('-00-00 00:00:00') is parsed as 1999-11-30) (32 bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK; ?
 --FILE--
 ?php
 date_default_timezone_set(UTC);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/mktime-3.phpt?r1=1.1.2.3r2=1.1.2.3.4.1diff_format=u
Index: php-src/ext/date/tests/mktime-3.phpt
diff -u php-src/ext/date/tests/mktime-3.phpt:1.1.2.3 
php-src/ext/date/tests/mktime-3.phpt:1.1.2.3.4.1
--- php-src/ext/date/tests/mktime-3.phpt:1.1.2.3Mon Dec  5 17:27:01 2005
+++ php-src/ext/date/tests/mktime-3.phptMon Feb 25 22:32:59 2008
@@ -1,5 +1,7 @@
 --TEST--
-mktime() [3]
+mktime() [3] (32-bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK ?
 --INI--
 error_reporting=2047
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime-mysql.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u
Index: php-src/ext/date/tests/strtotime-mysql.phpt
diff -u php-src/ext/date/tests/strtotime-mysql.phpt:1.1.2.1 
php-src/ext/date/tests/strtotime-mysql.phpt:1.1.2.1.2.1
--- php-src/ext/date/tests/strtotime-mysql.phpt:1.1.2.1 Fri Jun 16 22:46:57 2006
+++ php-src/ext/date/tests/strtotime-mysql.phpt Mon Feb 25 22:32:59 2008
@@ -1,5 +1,7 @@
 --TEST--
-strtotime() and mysql timestamps
+strtotime() and mysql timestamps (32 bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK; ?
 --FILE--
 ?php
 date_default_timezone_set('UTC');
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime3.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: php-src/ext/date/tests/strtotime3.phpt
diff -u php-src/ext/date/tests/strtotime3.phpt:1.1.2.2 
php-src/ext/date/tests/strtotime3.phpt:1.1.2.2.2.1
--- php-src/ext/date/tests/strtotime3.phpt:1.1.2.2  Sat Jun 17 10:30:23 2006
+++ php-src/ext/date/tests/strtotime3.phpt  Mon Feb 25 22:32:59 2008
@@ -1,5 +1,7 @@
 --TEST--
-strtotime() function
+strtotime() function (32 bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK; ?
 --FILE--
 ?php
 date_default_timezone_set('Europe/Lisbon');

http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/001-64bit.phpt?view=markuprev=1.1
Index: php-src/ext/wddx/tests/001-64bit.phpt
+++ php-src/ext/wddx/tests/001-64bit.phpt
--TEST--
wddx deserialization test (64-bit)
--SKIPIF--
?php if (!extension_loaded(wddx)) print skip; ?
?php echo PHP_INT_SIZE != 8 ? skip 64-bit only : OK ?
--INI--
precision=14
--FILE--
?php
$path = dirname(__FILE__);
var_dump(wddx_deserialize(file_get_contents({$path}/wddx.xml)));
?
--EXPECT--
array(11) {
  [aNull]=
  NULL
  [aString]=
  string(8) a string
  [aNumber]=
  float(-12.456)
  [aDateTime]=
  int(897625932)
  [aDateTime2]=
  int(329632332)
  [aDateTime3]=
  int(2223088332)
  [aBoolean]=
  bool(true)
  [anArray]=
  array(2) {
[0]=
int(10)
[1]=
string(14) second element
  }
  [aBinary]=
  string(11) binary data
  [anObject]=
  array(2) {
[s]=
string(8) a string
[n]=
float(-12.456)
  }
  [aRecordset]=
  array(2) {
[NAME]=
array(2) {
  [0]=
  string(8) John Doe
  [1]=
  string(8) Jane Doe
}
[AGE]=
array(2) {
  [0]=
  int(34)
  [1]=
  int(31)
}
  }
}

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/tests bug41523-64bit.phpt bug41523.phpt mktime-3-64bit.phpt mktime-3.phpt strtotime-mysql-64bit.phpt strtotime-mysql.phpt strtotime3-64bit.phpt strtotime3.php

2008-02-25 Thread Derick Rethans

derick  Mon Feb 25 22:34:11 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/wddx/tests 001-64bit.phpt 
/php-src/ext/date/tests bug41523-64bit.phpt mktime-3-64bit.phpt 
strtotime-mysql-64bit.phpt 
strtotime3-64bit.phpt 

  Modified files:  
/php-src/ext/wddx/tests 001.phpt 
/php-src/ext/date/tests bug41523.phpt mktime-3.phpt 
strtotime-mysql.phpt strtotime3.phpt 
  Log:
  - MFH: Fixed tests on 64bit platform.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/001.phpt?r1=1.5.4.1.2.1r2=1.5.4.1.2.2diff_format=u
Index: php-src/ext/wddx/tests/001.phpt
diff -u php-src/ext/wddx/tests/001.phpt:1.5.4.1.2.1 
php-src/ext/wddx/tests/001.phpt:1.5.4.1.2.2
--- php-src/ext/wddx/tests/001.phpt:1.5.4.1.2.1 Fri May 18 11:29:55 2007
+++ php-src/ext/wddx/tests/001.phpt Mon Feb 25 22:34:11 2008
@@ -1,7 +1,8 @@
 --TEST--
-wddx deserialization test
+wddx deserialization test (32-bit)
 --SKIPIF--
 ?php if (!extension_loaded(wddx)) print skip; ?
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK ?
 --INI--
 precision=14
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41523.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/date/tests/bug41523.phpt
diff -u php-src/ext/date/tests/bug41523.phpt:1.1.2.2 
php-src/ext/date/tests/bug41523.phpt:1.1.2.3
--- php-src/ext/date/tests/bug41523.phpt:1.1.2.2Thu Jul 12 18:58:00 2007
+++ php-src/ext/date/tests/bug41523.phptMon Feb 25 22:34:11 2008
@@ -1,5 +1,7 @@
 --TEST--
-Bug #41523 (strtotime('-00-00 00:00:00') is parsed as 1999-11-30)
+Bug #41523 (strtotime('-00-00 00:00:00') is parsed as 1999-11-30) (32 bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK; ?
 --FILE--
 ?php
 date_default_timezone_set(UTC);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/mktime-3.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u
Index: php-src/ext/date/tests/mktime-3.phpt
diff -u php-src/ext/date/tests/mktime-3.phpt:1.1.2.3 
php-src/ext/date/tests/mktime-3.phpt:1.1.2.3.2.1
--- php-src/ext/date/tests/mktime-3.phpt:1.1.2.3Mon Dec  5 17:27:01 2005
+++ php-src/ext/date/tests/mktime-3.phptMon Feb 25 22:34:11 2008
@@ -1,5 +1,7 @@
 --TEST--
-mktime() [3]
+mktime() [3] (32-bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK ?
 --INI--
 error_reporting=2047
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime-mysql.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/date/tests/strtotime-mysql.phpt
diff -u php-src/ext/date/tests/strtotime-mysql.phpt:1.1.2.1 
php-src/ext/date/tests/strtotime-mysql.phpt:1.1.2.2
--- php-src/ext/date/tests/strtotime-mysql.phpt:1.1.2.1 Fri Jun 16 22:46:57 2006
+++ php-src/ext/date/tests/strtotime-mysql.phpt Mon Feb 25 22:34:11 2008
@@ -1,5 +1,7 @@
 --TEST--
-strtotime() and mysql timestamps
+strtotime() and mysql timestamps (32 bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK; ?
 --FILE--
 ?php
 date_default_timezone_set('UTC');
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime3.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/date/tests/strtotime3.phpt
diff -u php-src/ext/date/tests/strtotime3.phpt:1.1.2.2 
php-src/ext/date/tests/strtotime3.phpt:1.1.2.3
--- php-src/ext/date/tests/strtotime3.phpt:1.1.2.2  Sat Jun 17 10:30:23 2006
+++ php-src/ext/date/tests/strtotime3.phpt  Mon Feb 25 22:34:11 2008
@@ -1,5 +1,7 @@
 --TEST--
-strtotime() function
+strtotime() function (32 bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK; ?
 --FILE--
 ?php
 date_default_timezone_set('Europe/Lisbon');

http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/001-64bit.phpt?view=markuprev=1.1
Index: php-src/ext/wddx/tests/001-64bit.phpt
+++ php-src/ext/wddx/tests/001-64bit.phpt
--TEST--
wddx deserialization test (64-bit)
--SKIPIF--
?php if (!extension_loaded(wddx)) print skip; ?
?php echo PHP_INT_SIZE != 8 ? skip 64-bit only : OK ?
--INI--
precision=14
--FILE--
?php
$path = dirname(__FILE__);
var_dump(wddx_deserialize(file_get_contents({$path}/wddx.xml)));
?
--EXPECT--
array(11) {
  [aNull]=
  NULL
  [aString]=
  string(8) a string
  [aNumber]=
  float(-12.456)
  [aDateTime]=
  int(897625932)
  [aDateTime2]=
  int(329632332)
  [aDateTime3]=
  int(2223088332)
  [aBoolean]=
  bool(true)
  [anArray]=
  array(2) {
[0]=
int(10)
[1]=
string(14) second element
  }
  [aBinary]=
  string(11) binary data
  [anObject]=
  array(2) {
[s]=
string(8) a string
[n]=
float(-12.456)
  }
  [aRecordset]=
  array(2) {
[NAME]=
array(2) {
  [0]=
  string(8) John Doe
  [1]=
  string(8) Jane Doe
}
[AGE]=
array(2) {
  [0]=
  int(34)
  [1]=
  int(31)
}
  }
}

http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41523-64bit.phpt?view=markuprev=1.1
Index:

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard metaphone.c /ext/standard/tests/strings bug44242.phpt

2008-02-25 Thread Felipe Pena

felipe  Mon Feb 25 22:40:46 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings bug44242.phpt 

  Modified files:  
/php-src/ext/standard   metaphone.c 
/php-srcNEWS 
  Log:
  Fixed bug #44242 (metaphone(CMXFXM) crashes PHP)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.28.2.1.2.5r2=1.28.2.1.2.6diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.28.2.1.2.5 
php-src/ext/standard/metaphone.c:1.28.2.1.2.6
--- php-src/ext/standard/metaphone.c:1.28.2.1.2.5   Mon Dec 31 07:20:13 2007
+++ php-src/ext/standard/metaphone.cMon Feb 25 22:40:45 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: metaphone.c,v 1.28.2.1.2.5 2007/12/31 07:20:13 sebastian Exp $ */
+/* $Id: metaphone.c,v 1.28.2.1.2.6 2008/02/25 22:40:45 felipe Exp $ */
 
 /*
Based on CPANs Text-Metaphone-1.96 by Michael G Schwern [EMAIL 
PROTECTED] 
@@ -150,7 +150,12 @@
(*phoned_word)[p_idx++] = c; \
}
 /* Slap a null character on the end of the phoned word */
-#define End_Phoned_Word{(*phoned_word)[p_idx] = '\0';}
+#define End_Phoned_Word{ \
+   if (p_idx == 
max_buffer_len) { \
+   *phoned_word = 
erealloc(*phoned_word, max_buffer_len + 1); \
+   } \
+   (*phoned_word)[p_idx] = 
'\0'; \
+   }
 /* How long is the phoned word? */
 #define Phone_Len  (p_idx)
 
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1096r2=1.2027.2.547.2.1097diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1096 php-src/NEWS:1.2027.2.547.2.1097
--- php-src/NEWS:1.2027.2.547.2.1096Sun Feb 24 18:34:30 2008
+++ php-src/NEWSMon Feb 25 22:40:45 2008
@@ -13,6 +13,7 @@
 - Upgraded PCRE to version 7.6 (Nuno)
 
 
+- Fixed bug #44242 (metaphone('CMXFXM') crashes PHP). (Felipe)
 - Fixed bug #44216 (strftime segfaults on large negative value). (Derick)
 - Fixed bug #44200 (A crash in PDO when no bound targets exists and yet 
   bound parameters are present). (Ilia)

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug44242.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug44242.phpt
+++ php-src/ext/standard/tests/strings/bug44242.phpt

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

[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/tests bug41523-64bit.phpt bug41523.phpt mktime-3-64bit.phpt mktime-3.phpt strtotime-mysql-64bit.phpt strtotime-mysql.phpt strtotime3-64bit.phpt s

2008-02-25 Thread Derick Rethans

derick  Mon Feb 25 22:32:26 2008 UTC

  Added files: 
/php-src/ext/wddx/tests 001-64bit.phpt 
/php-src/ext/date/tests bug41523-64bit.phpt mktime-3-64bit.phpt 
strtotime-mysql-64bit.phpt 
strtotime3-64bit.phpt 

  Modified files:  
/php-src/ext/wddx/tests 001.phpt 
/php-src/ext/date   php_date.c 
/php-src/ext/date/tests bug41523.phpt mktime-3.phpt 
strtotime-mysql.phpt strtotime3.phpt 
  Log:
  - Fixed tests on 64bit platform.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/001.phpt?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/wddx/tests/001.phpt
diff -u php-src/ext/wddx/tests/001.phpt:1.9 php-src/ext/wddx/tests/001.phpt:1.10
--- php-src/ext/wddx/tests/001.phpt:1.9 Fri May 18 11:29:40 2007
+++ php-src/ext/wddx/tests/001.phpt Mon Feb 25 22:32:25 2008
@@ -1,7 +1,8 @@
 --TEST--
-wddx unserialization test
+wddx unserialization test (32-bit)
 --SKIPIF--
 ?php if (!extension_loaded(wddx)) print skip; ?
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK ?
 --INI--
 precision=14
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.166r2=1.167diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.166 php-src/ext/date/php_date.c:1.167
--- php-src/ext/date/php_date.c:1.166   Sat Feb 23 17:03:53 2008
+++ php-src/ext/date/php_date.c Mon Feb 25 22:32:26 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.166 2008/02/23 17:03:53 helly Exp $ */
+/* $Id: php_date.c,v 1.167 2008/02/25 22:32:26 derick Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -1193,7 +1193,7 @@
 
ret = php_idate(format[0], ts, 0);
if (ret == -1) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Unrecognized date 
format token.);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Unrecognized date 
format token);
RETURN_FALSE;
}
RETURN_LONG(ret);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41523.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/date/tests/bug41523.phpt
diff -u php-src/ext/date/tests/bug41523.phpt:1.2 
php-src/ext/date/tests/bug41523.phpt:1.3
--- php-src/ext/date/tests/bug41523.phpt:1.2Fri Jul 13 15:22:34 2007
+++ php-src/ext/date/tests/bug41523.phptMon Feb 25 22:32:26 2008
@@ -1,5 +1,7 @@
 --TEST--
-Bug #41523 (strtotime('-00-00 00:00:00') is parsed as 1999-11-30)
+Bug #41523 (strtotime('-00-00 00:00:00') is parsed as 1999-11-30) (32 bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK; ?
 --FILE--
 ?php
 date_default_timezone_set(UTC);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/mktime-3.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/date/tests/mktime-3.phpt
diff -u php-src/ext/date/tests/mktime-3.phpt:1.4 
php-src/ext/date/tests/mktime-3.phpt:1.5
--- php-src/ext/date/tests/mktime-3.phpt:1.4Mon Dec 19 12:57:49 2005
+++ php-src/ext/date/tests/mktime-3.phptMon Feb 25 22:32:26 2008
@@ -1,5 +1,7 @@
 --TEST--
-mktime() [3]
+mktime() [3] (32-bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK ?
 --INI--
 error_reporting=2047
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime-mysql.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/date/tests/strtotime-mysql.phpt
diff -u php-src/ext/date/tests/strtotime-mysql.phpt:1.3 
php-src/ext/date/tests/strtotime-mysql.phpt:1.4
--- php-src/ext/date/tests/strtotime-mysql.phpt:1.3 Sat Jun 17 12:48:20 2006
+++ php-src/ext/date/tests/strtotime-mysql.phpt Mon Feb 25 22:32:26 2008
@@ -1,5 +1,7 @@
 --TEST--
-strtotime() and mysql timestamps
+strtotime() and mysql timestamps (32 bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK; ?
 --FILE--
 ?php
 date_default_timezone_set('UTC');
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime3.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/date/tests/strtotime3.phpt
diff -u php-src/ext/date/tests/strtotime3.phpt:1.4 
php-src/ext/date/tests/strtotime3.phpt:1.5
--- php-src/ext/date/tests/strtotime3.phpt:1.4  Sat Jun 17 12:48:20 2006
+++ php-src/ext/date/tests/strtotime3.phpt  Mon Feb 25 22:32:26 2008
@@ -1,5 +1,7 @@
 --TEST--
-strtotime() function
+strtotime() function (32 bit)
+--SKIPIF--
+?php echo PHP_INT_SIZE == 8 ? skip 32-bit only : OK; ?
 --FILE--
 ?php
 date_default_timezone_set('Europe/Lisbon');

http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/001-64bit.phpt?view=markuprev=1.1
Index: php-src/ext/wddx/tests/001-64bit.phpt
+++ php-src/ext/wddx/tests/001-64bit.phpt
--TEST--
wddx deserialization test (64-bit)
--SKIPIF--
?php if (!extension_loaded(wddx)) print skip; ?
?php echo PHP_INT_SIZE != 8 ? skip 64-bit only : OK ?
--INI--
precision=14
--FILE--
?php
$path = dirname(__FILE__);

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard metaphone.c /ext/standard/tests/strings bug44242.phpt

2008-02-25 Thread Felipe Pena

felipe  Mon Feb 25 22:54:58 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings bug44242.phpt 

  Modified files:  
/php-src/ext/standard   metaphone.c 
  Log:
  MFB: Fixed bug #44242 (metaphone('CMXFXM') crashes PHP)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.28.2.1.2.4.2.1r2=1.28.2.1.2.4.2.2diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.28.2.1.2.4.2.1 
php-src/ext/standard/metaphone.c:1.28.2.1.2.4.2.2
--- php-src/ext/standard/metaphone.c:1.28.2.1.2.4.2.1   Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/metaphone.cMon Feb 25 22:54:57 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: metaphone.c,v 1.28.2.1.2.4.2.1 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: metaphone.c,v 1.28.2.1.2.4.2.2 2008/02/25 22:54:57 felipe Exp $ */
 
 /*
Based on CPANs Text-Metaphone-1.96 by Michael G Schwern [EMAIL 
PROTECTED] 
@@ -150,7 +150,12 @@
(*phoned_word)[p_idx++] = c; \
}
 /* Slap a null character on the end of the phoned word */
-#define End_Phoned_Word{(*phoned_word)[p_idx] = '\0';}
+#define End_Phoned_Word{ \
+   if (p_idx == 
max_buffer_len) { \
+   *phoned_word = 
erealloc(*phoned_word, max_buffer_len + 1); \
+   } \
+   (*phoned_word)[p_idx] = 
'\0'; \
+   }
 /* How long is the phoned word? */
 #define Phone_Len  (p_idx)
 

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug44242.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug44242.phpt
+++ php-src/ext/standard/tests/strings/bug44242.phpt

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

[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c

2008-02-25 Thread Rob Richards

rrichards   Mon Feb 25 22:56:06 2008 UTC

  Modified files:  
/php-src/ext/mysqlndmysqlnd_wireprotocol.c 
  Log:
  fix win32 build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.13 
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.14
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.13 Wed Feb 20 15:20:14 2008
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c  Mon Feb 25 22:56:06 2008
@@ -1672,8 +1672,10 @@
 static
 void php_mysqlnd_rowp_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
+   php_mysql_packet_row *p;
+
DBG_ENTER(php_mysqlnd_rowp_free_mem);
-   php_mysql_packet_row *p= (php_mysql_packet_row *) _packet;
+   p = (php_mysql_packet_row *) _packet;
if (p-row_buffer) {
p-row_buffer-free_chunk(p-row_buffer, TRUE TSRMLS_CC);
p-row_buffer = NULL;

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

[PHP-CVS] cvs: php-src /ext/standard metaphone.c /ext/standard/tests/strings bug44242.phpt

2008-02-25 Thread Felipe Pena

felipe  Mon Feb 25 22:56:47 2008 UTC

  Modified files:  
/php-src/ext/standard   metaphone.c 
/php-src/ext/standard/tests/strings bug44242.phpt 
  Log:
  MFB: Fixed bug #44242 (metaphone('CMXFXM') crashes PHP)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.36r2=1.37diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.36 
php-src/ext/standard/metaphone.c:1.37
--- php-src/ext/standard/metaphone.c:1.36   Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/metaphone.cMon Feb 25 22:56:47 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: metaphone.c,v 1.36 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: metaphone.c,v 1.37 2008/02/25 22:56:47 felipe Exp $ */
 
 /*
Based on CPANs Text-Metaphone-1.96 by Michael G Schwern [EMAIL 
PROTECTED] 
@@ -151,7 +151,12 @@
(*phoned_word)[p_idx++] = c; \
}
 /* Slap a null character on the end of the phoned word */
-#define End_Phoned_Word{(*phoned_word)[p_idx] = '\0';}
+#define End_Phoned_Word{ \
+   if (p_idx == 
max_buffer_len) { \
+   *phoned_word = 
erealloc(*phoned_word, max_buffer_len + 1); \
+   } \
+   (*phoned_word)[p_idx] = 
'\0'; \
+   }
 /* How long is the phoned word? */
 #define Phone_Len  (p_idx)
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug44242.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/bug44242.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/bug44242.phpt:1.2
--- /dev/null   Mon Feb 25 22:56:47 2008
+++ php-src/ext/standard/tests/strings/bug44242.phptMon Feb 25 22:56:47 2008
@@ -0,0 +1,14 @@
+--TEST--
+Bug #44242 (metaphone('CMXFXM') crashes PHP)
+--FILE--
+?php
+
+echo metaphone('CMXFXZ'), \n;
+echo metaphone('CMXFXV'), \n;
+echo metaphone('CMXFXZXZ'), \n;
+
+?
+--EXPECT--
+KMKSFKSS
+KMKSFKSF
+KMKSFKSSKSS

-- 
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/mysqlnd mysqlnd_wireprotocol.c

2008-02-25 Thread Rob Richards

rrichards   Mon Feb 25 22:57:09 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c 
  Log:
  MFH: fix win32 build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.11r2=1.4.2.12diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.11 
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.12
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.11 Wed Feb 20 15:18:17 2008
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c  Mon Feb 25 22:57:09 2008
@@ -1672,8 +1672,10 @@
 static
 void php_mysqlnd_rowp_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
+   php_mysql_packet_row *p;
+
DBG_ENTER(php_mysqlnd_rowp_free_mem);
-   php_mysql_packet_row *p= (php_mysql_packet_row *) _packet;
+   p = (php_mysql_packet_row *) _packet;
if (p-row_buffer) {
p-row_buffer-free_chunk(p-row_buffer, TRUE TSRMLS_CC);
p-row_buffer = 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) / NEWS /ext/standard metaphone.c /ext/standard/tests/strings bug44242.phpt

2008-02-25 Thread Nuno Lopes


http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.28.2.1.2.5r2=1.28.2.1.2.6diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.28.2.1.2.5 
php-src/ext/standard/metaphone.c:1.28.2.1.2.6

--- php-src/ext/standard/metaphone.c:1.28.2.1.2.5 Mon Dec 31 07:20:13 2007
+++ php-src/ext/standard/metaphone.c Mon Feb 25 22:40:45 2008
@@ -150,7 +150,12 @@
 (*phoned_word)[p_idx++] = c; \
 }
/* Slap a null character on the end of the phoned word */
-#define End_Phoned_Word {(*phoned_word)[p_idx] = '\0';}
+#define End_Phoned_Word { \
+ if (p_idx == max_buffer_len) { \
+ *phoned_word = erealloc(*phoned_word, max_buffer_len + 1); \
+ } \
+ (*phoned_word)[p_idx] = '\0'; \
+ }
/* How long is the phoned word? */
#define Phone_Len (p_idx)


uhm, this fix is a bit weird, as *phoned_word == safe_emalloc(sizeof(char), 
max_buffer_len, 1);. This means that the realloc seems to be a noop (at 
first sight, at least).
Also, you should use safe_erealloc() there instead (if you persist on this 
fix).


Nuno 


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

[PHP-CVS] cvs: php-src /ext/spl config.m4 config.w32 php_spl.c spl_heap.c spl_heap.h /ext/spl/tests heap_001.phpt heap_002.phpt heap_003.phpt heap_004.phpt heap_005.phpt heap_006.phpt heap_007.phpt h

2008-02-25 Thread Etienne Kneuss

colder  Mon Feb 25 23:36:36 2008 UTC

  Added files: 
/php-src/ext/splspl_heap.c spl_heap.h 
/php-src/ext/spl/tests  heap_001.phpt heap_002.phpt heap_003.phpt 
heap_004.phpt heap_005.phpt heap_006.phpt 
heap_007.phpt heap_008.phpt pqueue_001.phpt 
pqueue_002.phpt pqueue_003.phpt 
pqueue_004.phpt 

  Modified files:  
/php-src/ext/splconfig.m4 config.w32 php_spl.c 
  Log:
  SplHeap, SplMinHeap, SplMaxHeap, SplPriorityQueue implementation
  http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.m4?r1=1.23r2=1.24diff_format=u
Index: php-src/ext/spl/config.m4
diff -u php-src/ext/spl/config.m4:1.23 php-src/ext/spl/config.m4:1.24
--- php-src/ext/spl/config.m4:1.23  Tue Jan 15 09:37:50 2008
+++ php-src/ext/spl/config.m4   Mon Feb 25 23:36:36 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.23 2008/01/15 09:37:50 colder Exp $
+dnl $Id: config.m4,v 1.24 2008/02/25 23:36:36 colder Exp $
 dnl config.m4 for extension SPL
 
 PHP_ARG_ENABLE(spl, enable SPL suppport,
@@ -29,7 +29,7 @@
   PHP_INSTALL_HEADERS([ext/spl/])
   AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct 
_zend_object_value is packed])
   AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) 
support]) 
-  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c, no)
-  PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h 
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h 
spl_sxe.h spl_dllist.h])
+  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c spl_heap.c, no)
+  PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h 
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h 
spl_sxe.h spl_dllist.h spl_heap.h])
   PHP_ADD_EXTENSION_DEP(spl, pcre, true)
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.w32?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/spl/config.w32
diff -u php-src/ext/spl/config.w32:1.8 php-src/ext/spl/config.w32:1.9
--- php-src/ext/spl/config.w32:1.8  Tue Jan 15 09:37:50 2008
+++ php-src/ext/spl/config.w32  Mon Feb 25 23:36:36 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.8 2008/01/15 09:37:50 colder Exp $
+// $Id: config.w32,v 1.9 2008/02/25 23:36:36 colder Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(spl, SPL (Standard PHP Library) support, yes);
@@ -7,6 +7,6 @@
if (PHP_SPL_SHARED) {
ERROR(SPL cannot be compiled as a shared ext);
}
-   EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c);
+   EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c spl_heap.c);
AC_DEFINE('HAVE_SPL', 1);
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.125r2=1.126diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.125 php-src/ext/spl/php_spl.c:1.126
--- php-src/ext/spl/php_spl.c:1.125 Mon Feb  4 15:58:12 2008
+++ php-src/ext/spl/php_spl.c   Mon Feb 25 23:36:36 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_spl.c,v 1.125 2008/02/04 15:58:12 helly Exp $ */
+/* $Id: php_spl.c,v 1.126 2008/02/25 23:36:36 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -36,6 +36,7 @@
 #include spl_exceptions.h
 #include spl_observer.h
 #include spl_dllist.h
+#include spl_heap.h
 #include zend_exceptions.h
 #include zend_interfaces.h
 #include ext/standard/md5.h
@@ -151,6 +152,10 @@
SPL_ADD_CLASS(SplDoublyLinkedList, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplQueue, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplStack, z_list, sub, allow, ce_flags); \
+   SPL_ADD_CLASS(SplHeap, z_list, sub, allow, ce_flags); \
+   SPL_ADD_CLASS(SplMinHeap, z_list, sub, allow, ce_flags); \
+   SPL_ADD_CLASS(SplMaxHeap, z_list, sub, allow, ce_flags); \
+   SPL_ADD_CLASS(SplPriorityQueue, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(BadFunctionCallException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(BadMethodCallException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(CachingIterator, z_list, sub, allow, ce_flags); \
@@ -768,6 +773,7 @@
PHP_MINIT(spl_directory)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(spl_sxe)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(spl_dllist)(INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(spl_heap)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(spl_observer)(INIT_FUNC_ARGS_PASSTHRU);

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl config.m4 config.w32 php_spl.c spl_heap.c spl_heap.h /ext/spl/tests heap_001.phpt heap_002.phpt heap_003.phpt heap_004.phpt heap_005.phpt heap_006.phpt heap_0

2008-02-25 Thread Etienne Kneuss

colder  Mon Feb 25 23:39:09 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/splspl_heap.c spl_heap.h 
/php-src/ext/spl/tests  heap_001.phpt heap_002.phpt heap_003.phpt 
heap_004.phpt heap_005.phpt heap_006.phpt 
heap_007.phpt heap_008.phpt pqueue_001.phpt 
pqueue_002.phpt pqueue_003.phpt 
pqueue_004.phpt 

  Modified files:  
/php-src/ext/splconfig.m4 config.w32 php_spl.c 
  Log:
  MFH: SplHeap, SplMinHeap, SplMaxHeap, SplPriorityQueue implementation
  http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.m4?r1=1.13.2.4.2.3.2.1r2=1.13.2.4.2.3.2.2diff_format=u
Index: php-src/ext/spl/config.m4
diff -u php-src/ext/spl/config.m4:1.13.2.4.2.3.2.1 
php-src/ext/spl/config.m4:1.13.2.4.2.3.2.2
--- php-src/ext/spl/config.m4:1.13.2.4.2.3.2.1  Tue Jan 15 09:38:15 2008
+++ php-src/ext/spl/config.m4   Mon Feb 25 23:39:08 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.13.2.4.2.3.2.1 2008/01/15 09:38:15 colder Exp $
+dnl $Id: config.m4,v 1.13.2.4.2.3.2.2 2008/02/25 23:39:08 colder Exp $
 dnl config.m4 for extension SPL
 
 PHP_ARG_ENABLE(spl, enable SPL suppport,
@@ -26,7 +26,7 @@
   CPPFLAGS=$old_CPPFLAGS
   AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct 
_zend_object_value is packed])
   AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) 
support]) 
-  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c, no)
-  PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h 
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h 
spl_sxe.h spl_dllist.h])
+  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c spl_heap.c, no)
+  PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h 
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h 
spl_sxe.h spl_dllist.h spl_heap.h])
   PHP_ADD_EXTENSION_DEP(spl, pcre, true)
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.w32?r1=1.7.6.1r2=1.7.6.2diff_format=u
Index: php-src/ext/spl/config.w32
diff -u php-src/ext/spl/config.w32:1.7.6.1 php-src/ext/spl/config.w32:1.7.6.2
--- php-src/ext/spl/config.w32:1.7.6.1  Tue Jan 15 09:38:15 2008
+++ php-src/ext/spl/config.w32  Mon Feb 25 23:39:08 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7.6.1 2008/01/15 09:38:15 colder Exp $
+// $Id: config.w32,v 1.7.6.2 2008/02/25 23:39:08 colder Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(spl, SPL (Standard PHP Library) support, yes);
@@ -7,6 +7,6 @@
if (PHP_SPL_SHARED) {
ERROR(SPL cannot be compiled as a shared ext);
}
-   EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c);
+   EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c spl_heap.c);
AC_DEFINE('HAVE_SPL', 1);
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.12r2=1.52.2.28.2.17.2.13diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.12 
php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.13
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.12   Mon Feb  4 17:07:06 2008
+++ php-src/ext/spl/php_spl.c   Mon Feb 25 23:39:08 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_spl.c,v 1.52.2.28.2.17.2.12 2008/02/04 17:07:06 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.17.2.13 2008/02/25 23:39:08 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -36,6 +36,7 @@
 #include spl_exceptions.h
 #include spl_observer.h
 #include spl_dllist.h
+#include spl_heap.h
 #include zend_exceptions.h
 #include zend_interfaces.h
 #include ext/standard/md5.h
@@ -157,6 +158,10 @@
SPL_ADD_CLASS(SplDoublyLinkedList, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplQueue, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplStack, z_list, sub, allow, ce_flags); \
+   SPL_ADD_CLASS(SplHeap, z_list, sub, allow, ce_flags); \
+   SPL_ADD_CLASS(SplMinHeap, z_list, sub, allow, ce_flags); \
+   SPL_ADD_CLASS(SplMaxHeap, z_list, sub, allow, ce_flags); \
+   SPL_ADD_CLASS(SplPriorityQueue, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(BadFunctionCallException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(BadMethodCallException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(CachingIterator, z_list, sub, allow, ce_flags); \
@@ -749,6 +754,7 @@
PHP_MINIT(spl_directory)(INIT_FUNC_ARGS_PASSTHRU);

[PHP-CVS] cvs: php-src /ext/spl spl_heap.c

2008-02-25 Thread Etienne Kneuss

colder  Mon Feb 25 23:40:47 2008 UTC

  Modified files:  
/php-src/ext/splspl_heap.c 
  Log:
  Fix folding
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_heap.c?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/spl_heap.c
diff -u php-src/ext/spl/spl_heap.c:1.1 php-src/ext/spl/spl_heap.c:1.2
--- php-src/ext/spl/spl_heap.c:1.1  Mon Feb 25 23:36:36 2008
+++ php-src/ext/spl/spl_heap.c  Mon Feb 25 23:40:47 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_heap.c,v 1.1 2008/02/25 23:36:36 colder Exp $ */
+/* $Id: spl_heap.c,v 1.2 2008/02/25 23:40:47 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -1181,6 +1181,8 @@
 
return SUCCESS;
 }
+/* }}} */
+
 /*
  * Local variables:
  * tab-width: 4

-- 
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/spl spl_heap.c

2008-02-25 Thread Etienne Kneuss

colder  Mon Feb 25 23:41:04 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/splspl_heap.c 
  Log:
  MFH: Fix folding
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_heap.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/spl/spl_heap.c
diff -u php-src/ext/spl/spl_heap.c:1.1.2.2 php-src/ext/spl/spl_heap.c:1.1.2.3
--- php-src/ext/spl/spl_heap.c:1.1.2.2  Mon Feb 25 23:39:08 2008
+++ php-src/ext/spl/spl_heap.c  Mon Feb 25 23:41:04 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_heap.c,v 1.1.2.2 2008/02/25 23:39:08 colder Exp $ */
+/* $Id: spl_heap.c,v 1.1.2.3 2008/02/25 23:41:04 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -1181,6 +1181,8 @@
 
return SUCCESS;
 }
+/* }}} */
+
 /*
  * Local variables:
  * tab-width: 4

-- 
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_interface.c oci8_lob.c oci8_statement.c php_oci8_int.h /ext/oci8/tests bug43492_2.phpt bug44008.phpt bug44206.phpt lob_014.phpt lob_021.phpt

2008-02-25 Thread Christopher Jones

sixdMon Feb 25 23:49:51 2008 UTC

  Added files: 
/php-src/ext/oci8/tests bug43492_2.phpt bug44008.phpt bug44206.phpt 

  Modified files:  
/php-src/ext/oci8   oci8_interface.c oci8_lob.c oci8_statement.c 
php_oci8_int.h 
/php-src/ext/oci8/tests lob_014.phpt lob_021.phpt 
  Log:
  OCI8: fix bug #44008 (OCI-Lob-close)  bug #44206 (ref cursor leak)
  http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.35r2=1.36diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.35 
php-src/ext/oci8/oci8_interface.c:1.36
--- php-src/ext/oci8/oci8_interface.c:1.35  Tue Feb 19 01:44:29 2008
+++ php-src/ext/oci8/oci8_interface.c   Mon Feb 25 23:49:51 2008
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_interface.c,v 1.35 2008/02/19 01:44:29 sixd Exp $ */
+/* $Id: oci8_interface.c,v 1.36 2008/02/25 23:49:51 sixd Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1548,11 +1548,12 @@
}
 
PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
-   if (!statement-nested) {
-   /* nested cursors cannot be freed, they are allocated once and 
used during the fetch */
-   zend_list_delete(statement-id);
-   }
-   
+
+   zend_list_delete(statement-id);
+   if (statement-parent_stmtid) {
+   zend_list_delete(statement-parent_stmtid);
+   }   
+
RETURN_TRUE;
 }
 /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.33 php-src/ext/oci8/oci8_lob.c:1.34
--- php-src/ext/oci8/oci8_lob.c:1.33Thu Jan 24 14:08:45 2008
+++ php-src/ext/oci8/oci8_lob.c Mon Feb 25 23:49:51 2008
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_lob.c,v 1.33 2008/01/24 14:08:45 rrichards Exp $ */
+/* $Id: oci8_lob.c,v 1.34 2008/02/25 23:49:51 sixd Exp $ */
 
 
 
@@ -88,6 +88,7 @@
descriptor-buffering = PHP_OCI_LOB_BUFFER_DISABLED;
/* buffering is off by default */
descriptor-charset_form = SQLCS_IMPLICIT;  /* default value */
descriptor-charset_id = connection-charset;
+   descriptor-is_open = 0;
 
if (descriptor-type == OCI_DTYPE_LOB || descriptor-type == 
OCI_DTYPE_FILE) {
/* add Lobs  Files to hash. we'll flush them at the end */
@@ -576,7 +577,9 @@
 {
php_oci_connection *connection = descriptor-connection;

-   PHP_OCI_CALL_RETURN(connection-errcode, OCILobClose, (connection-svc, 
connection-err, descriptor-descriptor));
+   if (descriptor-is_open) {
+   PHP_OCI_CALL_RETURN(connection-errcode, OCILobClose, 
(connection-svc, connection-err, descriptor-descriptor));
+   }
 
if (connection-errcode != OCI_SUCCESS) {
php_oci_error(connection-err, connection-errcode TSRMLS_CC);
@@ -914,6 +917,8 @@
return 1;
}
 
+   descriptor-is_open = 1;
+
return php_oci_lob_write(descriptor, 0, data, data_len, bytes_written 
TSRMLS_CC);
 } /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.53r2=1.54diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.53 
php-src/ext/oci8/oci8_statement.c:1.54
--- php-src/ext/oci8/oci8_statement.c:1.53  Tue Feb 19 01:44:29 2008
+++ php-src/ext/oci8/oci8_statement.c   Mon Feb 25 23:49:51 2008
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_statement.c,v 1.53 2008/02/19 01:44:29 sixd Exp $ */
+/* $Id: oci8_statement.c,v 1.54 2008/02/25 23:49:51 sixd Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -108,7 +108,7 @@
 
statement-connection = connection;
statement-has_data = 0;
-   statement-nested = 0;
+   statement-parent_stmtid = 0;
zend_list_addref(statement-connection-rsrc_id);
 
if (OCI_G(default_prefetch)  0) {
@@ -344,6 +344,7 @@
if (!nested_stmt) {
return OCI_ERROR;
}
+   nested_stmt-parent_stmtid = 
outcol-statement-id;
zend_list_addref(outcol-statement-id);
outcol-nested_statement = nested_stmt;
outcol-stmtid = nested_stmt-id;
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.40r2=1.41diff_format=u
Index: php-src/ext/oci8/php_oci8_int.h
diff -u php-src/ext/oci8/php_oci8_int.h:1.40 
php-src/ext/oci8/php_oci8_int.h:1.41
--- php-src/ext/oci8/php_oci8_int.h:1.40Tue Feb 19 01:44:29 2008
+++ php-src/ext/oci8/php_oci8_int.h Mon Feb 25 23:49:51 2008
@@ -25,7 +25,7 @@

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 oci8_interface.c oci8_lob.c oci8_statement.c php_oci8_int.h /ext/oci8/tests bug43492_2.phpt bug44008.phpt bug44206.phpt lob_014.phpt lob_021.phpt

2008-02-25 Thread Christopher Jones

sixdMon Feb 25 23:50:52 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/oci8/tests bug43492_2.phpt bug44008.phpt bug44206.phpt 

  Modified files:  
/php-src/ext/oci8   oci8_interface.c oci8_lob.c oci8_statement.c 
php_oci8_int.h 
/php-src/ext/oci8/tests lob_014.phpt lob_021.phpt 
  Log:
  MFH: OCI8: fix bug #44008 (OCI-Lob-close)  bug #44206 (ref cursor leak)
  http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.7.2.13.2.2r2=1.8.2.7.2.13.2.3diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.13.2.2 
php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.13.2.3
--- php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.13.2.2  Thu Jan 31 01:33:29 2008
+++ php-src/ext/oci8/oci8_interface.c   Mon Feb 25 23:50:51 2008
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_interface.c,v 1.8.2.7.2.13.2.2 2008/01/31 01:33:29 sixd Exp $ */
+/* $Id: oci8_interface.c,v 1.8.2.7.2.13.2.3 2008/02/25 23:50:51 sixd Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1509,10 +1509,11 @@
}
 
PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
-   if (!statement-nested) {
-   /* nested cursors cannot be freed, they are allocated once and 
used during the fetch */
-   zend_list_delete(statement-id);
-   }
+
+   zend_list_delete(statement-id);
+   if (statement-parent_stmtid) {
+   zend_list_delete(statement-parent_stmtid);
+   } 

RETURN_TRUE;
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.7.2.6.2.14.2.3r2=1.7.2.6.2.14.2.4diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.3 
php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.4
--- php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.3Thu Jan 24 14:09:36 2008
+++ php-src/ext/oci8/oci8_lob.c Mon Feb 25 23:50:51 2008
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_lob.c,v 1.7.2.6.2.14.2.3 2008/01/24 14:09:36 rrichards Exp $ */
+/* $Id: oci8_lob.c,v 1.7.2.6.2.14.2.4 2008/02/25 23:50:51 sixd Exp $ */
 
 
 
@@ -88,6 +88,7 @@
descriptor-buffering = PHP_OCI_LOB_BUFFER_DISABLED;
/* buffering is off by default */
descriptor-charset_form = SQLCS_IMPLICIT;  /* default value */
descriptor-charset_id = connection-charset;
+   descriptor-is_open = 0;
 
if (descriptor-type == OCI_DTYPE_LOB || descriptor-type == 
OCI_DTYPE_FILE) {
/* add Lobs  Files to hash. we'll flush them at the end */
@@ -571,7 +572,9 @@
 {
php_oci_connection *connection = descriptor-connection;

-   PHP_OCI_CALL_RETURN(connection-errcode, OCILobClose, (connection-svc, 
connection-err, descriptor-descriptor));
+   if (descriptor-is_open) {
+   PHP_OCI_CALL_RETURN(connection-errcode, OCILobClose, 
(connection-svc, connection-err, descriptor-descriptor));
+   }
 
if (connection-errcode != OCI_SUCCESS) {
php_oci_error(connection-err, connection-errcode TSRMLS_CC);
@@ -909,6 +912,8 @@
return 1;
}
 
+   descriptor-is_open = 1;
+
return php_oci_lob_write(descriptor, 0, data, data_len, bytes_written 
TSRMLS_CC);
 } /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.14.2.28.2.3r2=1.7.2.14.2.28.2.4diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.3 
php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.4
--- php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.3 Thu Jan 31 01:33:29 2008
+++ php-src/ext/oci8/oci8_statement.c   Mon Feb 25 23:50:51 2008
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_statement.c,v 1.7.2.14.2.28.2.3 2008/01/31 01:33:29 sixd Exp $ */
+/* $Id: oci8_statement.c,v 1.7.2.14.2.28.2.4 2008/02/25 23:50:51 sixd Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -106,7 +106,7 @@
 
statement-connection = connection;
statement-has_data = 0;
-   statement-nested = 0;
+   statement-parent_stmtid = 0;
zend_list_addref(statement-connection-rsrc_id);
 
if (OCI_G(default_prefetch)  0) {
@@ -336,6 +336,7 @@
if (!nested_stmt) {
return OCI_ERROR;
}
+   nested_stmt-parent_stmtid = 
outcol-statement-id;
zend_list_addref(outcol-statement-id);
outcol-nested_statement = nested_stmt;
outcol-stmtid = nested_stmt-id;

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 oci8_interface.c oci8_lob.c oci8_statement.c php_oci8_int.h /ext/oci8/tests bug43492_2.phpt bug44008.phpt bug44206.phpt lob_014.phpt lob_021.phpt

2008-02-25 Thread Christopher Jones

sixdMon Feb 25 23:52:10 2008 UTC

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

  Modified files:  
/php-src/ext/oci8   oci8_interface.c oci8_lob.c oci8_statement.c 
php_oci8_int.h 
/php-src/ext/oci8/tests lob_014.phpt lob_021.phpt 
  Log:
  OCI8: fix bug #44008 (OCI-Lob-close)  bug #44206 (ref cursor leak)
  http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.7.2.14r2=1.8.2.7.2.15diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.14 
php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.15
--- php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.14  Mon Dec 31 07:20:09 2007
+++ php-src/ext/oci8/oci8_interface.c   Mon Feb 25 23:52:10 2008
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_interface.c,v 1.8.2.7.2.14 2007/12/31 07:20:09 sebastian Exp $ */
+/* $Id: oci8_interface.c,v 1.8.2.7.2.15 2008/02/25 23:52:10 sixd Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1509,10 +1509,11 @@
}
 
PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
-   if (!statement-nested) {
-   /* nested cursors cannot be freed, they are allocated once and 
used during the fetch */
-   zend_list_delete(statement-id);
-   }
+
+   zend_list_delete(statement-id);
+   if (statement-parent_stmtid) {
+   zend_list_delete(statement-parent_stmtid);
+   } 

RETURN_TRUE;
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.7.2.6.2.17r2=1.7.2.6.2.18diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.17 
php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.18
--- php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.17Thu Jan 24 14:10:21 2008
+++ php-src/ext/oci8/oci8_lob.c Mon Feb 25 23:52:10 2008
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_lob.c,v 1.7.2.6.2.17 2008/01/24 14:10:21 rrichards Exp $ */
+/* $Id: oci8_lob.c,v 1.7.2.6.2.18 2008/02/25 23:52:10 sixd Exp $ */
 
 
 
@@ -88,6 +88,7 @@
descriptor-buffering = PHP_OCI_LOB_BUFFER_DISABLED;
/* buffering is off by default */
descriptor-charset_form = SQLCS_IMPLICIT;  /* default value */
descriptor-charset_id = connection-charset;
+   descriptor-is_open = 0;
 
if (descriptor-type == OCI_DTYPE_LOB || descriptor-type == 
OCI_DTYPE_FILE) {
/* add Lobs  Files to hash. we'll flush them at the end */
@@ -571,7 +572,9 @@
 {
php_oci_connection *connection = descriptor-connection;

-   PHP_OCI_CALL_RETURN(connection-errcode, OCILobClose, (connection-svc, 
connection-err, descriptor-descriptor));
+   if (descriptor-is_open) {
+   PHP_OCI_CALL_RETURN(connection-errcode, OCILobClose, 
(connection-svc, connection-err, descriptor-descriptor));
+   }
 
if (connection-errcode != OCI_SUCCESS) {
php_oci_error(connection-err, connection-errcode TSRMLS_CC);
@@ -908,6 +911,8 @@
return 1;
}
 
+   descriptor-is_open = 1;
+
return php_oci_lob_write(descriptor, 0, data, data_len, bytes_written 
TSRMLS_CC);
 } /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.14.2.31r2=1.7.2.14.2.32diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.31 
php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.32
--- php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.31 Thu Jan 31 00:26:43 2008
+++ php-src/ext/oci8/oci8_statement.c   Mon Feb 25 23:52:10 2008
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_statement.c,v 1.7.2.14.2.31 2008/01/31 00:26:43 sixd Exp $ */
+/* $Id: oci8_statement.c,v 1.7.2.14.2.32 2008/02/25 23:52:10 sixd Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -106,7 +106,7 @@
 
statement-connection = connection;
statement-has_data = 0;
-   statement-nested = 0;
+   statement-parent_stmtid = 0;
zend_list_addref(statement-connection-rsrc_id);
 
if (OCI_G(default_prefetch)  0) {
@@ -336,6 +336,7 @@
if (!nested_stmt) {
return OCI_ERROR;
}
+   nested_stmt-parent_stmtid = 
outcol-statement-id;
zend_list_addref(outcol-statement-id);
outcol-nested_statement = nested_stmt;
outcol-stmtid = nested_stmt-id;
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.11.2.6.2.23r2=1.11.2.6.2.24diff_format=u
Index: php-src/ext/oci8/php_oci8_int.h
diff -u

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2008-02-25 Thread Christopher Jones

sixdTue Feb 26 00:04:19 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  Add recent OCI8 bug fixes
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1097r2=1.2027.2.547.2.1098diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1097 php-src/NEWS:1.2027.2.547.2.1098
--- php-src/NEWS:1.2027.2.547.2.1097Mon Feb 25 22:40:45 2008
+++ php-src/NEWSTue Feb 26 00:04:18 2008
@@ -19,6 +19,8 @@
   bound parameters are present). (Ilia)
 - Fixed bug #44209 (strtotime() doesn't support 64 bit timestamps on 64 bit
   platforms). (Derick)
+- Fixed bug #44206 (OCI8 selecting ref cursors leads to ORA-1000 maximum
+  open cursors reached). (Oracle Corp.)
 - Fixed bug #44197 (socket array keys lost on socket_select). (Felipe)
 - Fixed bug #44191 (preg_grep messes up array index). (Felipe)
 - Fixed bug #44189 (PDO setAttribute() does not properly validate values for 
@@ -30,6 +32,8 @@
 - Fixed bug #44152 (Possible crash with syslog logging on ZTS builds). (Ilia)
 - Fixed bug #44141 (private parent constructor callable through static
   function). (Dmitry)
+- Fixed bug #44113 (OCI8 new collection creation can fail with OCI-22303).
+  (Oracle Corp.)
 - Fixed bug #44069 (Huge memory usage with concatenation using . instead of
   .=). (Dmitry)
 - Fixed bug #44046 (crash inside array_slice() function with an invalid
@@ -37,6 +41,8 @@
 - Fixed bug #44028 (crash inside stream_socket_enable_crypto() when enabling
   encryption without crypto type). (Ilia)
 - Fixed bug #44018 (RecursiveDirectoryIterator options inconsistancy). (Marcus)
+- Fixed bug #44008 (OCI8 incorrect usage of OCI-Lob-close crashes PHP).
+  (Oracle Corp.)
 - Fixed bug #43998 (Two error messages returned for incorrect encoding for
   mb_strto[upper|lower]). (Rui)
 - Fixed bug #43994 (mb_ereg 'successfully' matching incorrect). (Rui)
@@ -243,6 +249,8 @@
   64-bit PHP). (Derick)
 - Fixed bug #42506 (php_pgsql_convert() timezone parse bug) (nonunnet at
   gmail dot com, Ilia)
+- Fixed bug #42496 (OCI8 cursor is not closed when using 2 clobs in a select
+  query). (Oracle Corp.)
 - Fixed bug #42462 (Segmentation when trying to set an attribute in a
   DOMElement). (Rob)
 - Fixed bug #42453 (CGI SAPI does not shut down cleanly with -i/-m/-v cmdline

-- 
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/pdo pdo_stmt.c /ext/pdo_pgsql pgsql_statement.c

2008-02-25 Thread Ilia Alshanetsky

iliaa   Tue Feb 26 00:14:04 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdopdo_stmt.c 
/php-src/ext/pdo_pgsql  pgsql_statement.c 
  Log:
  
  MFB: Better fix for bug #44189
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.33r2=1.118.2.38.2.34diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.33 
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.34
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.33  Sun Feb 24 16:09:05 2008
+++ php-src/ext/pdo/pdo_stmt.c  Tue Feb 26 00:14:04 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.33 2008/02/24 16:09:05 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.34 2008/02/26 00:14:04 iliaa Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -166,10 +166,6 @@
 
ht = stmt-bound_params;
 
-   if (ht  !stmt-bound_param_map) {
-   return 0;
-   }
-
 iterate:
if (ht) {
zend_hash_internal_pointer_reset(ht);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.12.2.10r2=1.31.2.12.2.11diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.10 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.11
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.10  Mon Dec 31 
07:20:10 2007
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Tue Feb 26 00:14:04 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.31.2.12.2.10 2007/12/31 07:20:10 sebastian Exp $ 
*/
+/* $Id: pgsql_statement.c,v 1.31.2.12.2.11 2008/02/26 00:14:04 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -250,6 +250,9 @@
return 1;
 
case PDO_PARAM_EVT_EXEC_PRE:
+   if (!stmt-bound_param_map) {
+   return 0;
+   }
if (!S-param_values) {
S-param_values = ecalloc(

zend_hash_num_elements(stmt-bound_param_map),

-- 
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/pdo pdo_stmt.c /ext/pdo_pgsql pgsql_statement.c

2008-02-25 Thread Ilia Alshanetsky

iliaa   Tue Feb 26 00:13:57 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdopdo_stmt.c 
/php-src/ext/pdo_pgsql  pgsql_statement.c 
  Log:
  
  Better fix for bug #44189
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.12r2=1.118.2.38.2.24.2.13diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.12 
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.13
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.12 Sun Feb 24 16:08:32 2008
+++ php-src/ext/pdo/pdo_stmt.c  Tue Feb 26 00:13:57 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.12 2008/02/24 16:08:32 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.13 2008/02/26 00:13:57 iliaa Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -166,10 +166,6 @@
 
ht = stmt-bound_params;
 
-   if (ht  !stmt-bound_param_map) {
-   return 0;
-   }
-
 iterate:
if (ht) {
zend_hash_internal_pointer_reset(ht);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.12.2.7.2.4r2=1.31.2.12.2.7.2.5diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.4 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.5
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.4   Tue Jan 29 
01:17:30 2008
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Tue Feb 26 00:13:57 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.31.2.12.2.7.2.4 2008/01/29 01:17:30 iliaa Exp $ 
*/
+/* $Id: pgsql_statement.c,v 1.31.2.12.2.7.2.5 2008/02/26 00:13:57 iliaa Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -250,6 +250,9 @@
return 1;
 
case PDO_PARAM_EVT_EXEC_PRE:
+   if (!stmt-bound_param_map) {
+   return 0;
+   }
if (!S-param_values) {
S-param_values = ecalloc(

zend_hash_num_elements(stmt-bound_param_map),

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

[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c /ext/pdo_pgsql pgsql_statement.c

2008-02-25 Thread Ilia Alshanetsky

iliaa   Tue Feb 26 00:14:25 2008 UTC

  Modified files:  
/php-src/ext/pdopdo_stmt.c 
/php-src/ext/pdo_pgsql  pgsql_statement.c 
  Log:
  
  MFB: Better fix for bug #44189
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.187r2=1.188diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.187 php-src/ext/pdo/pdo_stmt.c:1.188
--- php-src/ext/pdo/pdo_stmt.c:1.187Sun Feb 24 16:09:13 2008
+++ php-src/ext/pdo/pdo_stmt.c  Tue Feb 26 00:14:25 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_stmt.c,v 1.187 2008/02/24 16:09:13 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.188 2008/02/26 00:14:25 iliaa Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -142,10 +142,6 @@
 
ht = stmt-bound_params;
 
-   if (ht  !stmt-bound_param_map) {
-   return 0;
-   }
-
 iterate:
if (ht) {
zend_hash_internal_pointer_reset(ht);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.46r2=1.47diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.46 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.47
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.46Mon Dec 31 07:12:13 2007
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Tue Feb 26 00:14:25 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.46 2007/12/31 07:12:13 sebastian Exp $ */
+/* $Id: pgsql_statement.c,v 1.47 2008/02/26 00:14:25 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -183,6 +183,9 @@
break;
 
case PDO_PARAM_EVT_EXEC_PRE:
+   if (!stmt-bound_param_map) {
+   return 0;
+   }
if (!S-param_values) {
S-param_values = ecalloc(

zend_hash_num_elements(stmt-bound_param_map),

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

[PHP-CVS] cvs: php-src /ext/oci8/tests lob_039.phpt

2008-02-25 Thread Christopher Jones

sixdTue Feb 26 01:04:35 2008 UTC

  Modified files:  
/php-src/ext/oci8/tests lob_039.phpt 
  Log:
  fix test noise
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/lob_039.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/oci8/tests/lob_039.phpt
diff -u php-src/ext/oci8/tests/lob_039.phpt:1.1 
php-src/ext/oci8/tests/lob_039.phpt:1.2
--- php-src/ext/oci8/tests/lob_039.phpt:1.1 Thu Mar  1 23:28:51 2007
+++ php-src/ext/oci8/tests/lob_039.phpt Tue Feb 26 01:04:35 2008
@@ -57,9 +57,27 @@
 [0]=
 string(11) clob test 1
 [1]=
-string(11) clob test 2
+string(22)clob test 2
 [2]=
-string(11) clob test 3
+string(33)   clob test 3
+  }
+}
+Done
+--UEXPECT--
+Test 1: CLOB
+int(11)
+int(11)
+int(11)
+bool(true)
+array(1) {
+  [uCLOB]=
+  array(3) {
+[0]=
+unicode(11) clob test 1
+[1]=
+unicode(22)clob test 2
+[2]=
+unicode(33)   clob test 3
   }
 }
 Done

-- 
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/oci8/tests bug27303.phpt bug27303_2.phpt bug27303_4.phpt lob_039.phpt

2008-02-25 Thread Christopher Jones

sixdTue Feb 26 01:06:00 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/oci8/tests bug27303.phpt bug27303_2.phpt 
bug27303_4.phpt lob_039.phpt 
  Log:
  Fix test noise
  http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bug27303.phpt?r1=1.1.2.3.2.2r2=1.1.2.3.2.2.2.1diff_format=u
Index: php-src/ext/oci8/tests/bug27303.phpt
diff -u php-src/ext/oci8/tests/bug27303.phpt:1.1.2.3.2.2 
php-src/ext/oci8/tests/bug27303.phpt:1.1.2.3.2.2.2.1
--- php-src/ext/oci8/tests/bug27303.phpt:1.1.2.3.2.2Mon May  7 18:02:59 2007
+++ php-src/ext/oci8/tests/bug27303.phptTue Feb 26 01:05:59 2008
@@ -49,7 +49,7 @@
 
 echo Done\n;
 ?
---EXPECTF--
+--EXPECT-- 
 string(1) 1
 string(1) 2
 string(1) 3
@@ -59,194 +59,194 @@
 string(1) 7
 string(1) 8
 string(1) 9
-string(2) 10
-string(2) 11
-string(2) 12
-string(2) 13
-string(2) 14
-string(2) 15
-string(2) 16
-string(2) 17
-string(2) 18
-string(2) 19
-string(2) 20
-string(2) 21
-string(2) 22
-string(2) 23
-string(2) 24
-string(2) 25
-string(2) 26
-string(2) 27
-string(2) 28
-string(2) 29
-string(2) 30
-string(2) 31
-string(2) 32
-string(2) 33
-string(2) 34
-string(2) 35
-string(2) 36
-string(2) 37
-string(2) 38
-string(2) 39
-string(2) 40
-string(2) 41
-string(2) 42
-string(2) 43
-string(2) 44
-string(2) 45
-string(2) 46
-string(2) 47
-string(2) 48
-string(2) 49
-string(2) 50
-string(2) 51
-string(2) 52
-string(2) 53
-string(2) 54
-string(2) 55
-string(2) 56
-string(2) 57
-string(2) 58
-string(2) 59
-string(2) 60
-string(2) 61
-string(2) 62
-string(2) 63
-string(2) 64
-string(2) 65
-string(2) 66
-string(2) 67
-string(2) 68
-string(2) 69
-string(2) 70
-string(2) 71
-string(2) 72
-string(2) 73
-string(2) 74
-string(2) 75
-string(2) 76
-string(2) 77
-string(2) 78
-string(2) 79
-string(2) 80
-string(2) 81
-string(2) 82
-string(2) 83
-string(2) 84
-string(2) 85
-string(2) 86
-string(2) 87
-string(2) 88
-string(2) 89
-string(2) 90
-string(2) 91
-string(2) 92
-string(2) 93
-string(2) 94
-string(2) 95
-string(2) 96
-string(2) 97
-string(2) 98
-string(2) 99
-string(3) 100
-string(3) 101
-string(3) 102
-string(3) 103
-string(3) 104
-string(3) 105
-string(3) 106
-string(3) 107
-string(3) 108
-string(3) 109
-string(3) 110
-string(3) 111
-string(3) 112
-string(3) 113
-string(3) 114
-string(3) 115
-string(3) 116
-string(3) 117
-string(3) 118
-string(3) 119
-string(3) 120
-string(3) 121
-string(3) 122
-string(3) 123
-string(3) 124
-string(3) 125
-string(3) 126
-string(3) 127
-string(3) 128
-string(3) 129
-string(3) 130
-string(3) 131
-string(3) 132
-string(3) 133
-string(3) 134
-string(3) 135
-string(3) 136
-string(3) 137
-string(3) 138
-string(3) 139
-string(3) 140
-string(3) 141
-string(3) 142
-string(3) 143
-string(3) 144
-string(3) 145
-string(3) 146
-string(3) 147
-string(3) 148
-string(3) 149
-string(3) 150
-string(3) 151
-string(3) 152
-string(3) 153
-string(3) 154
-string(3) 155
-string(3) 156
-string(3) 157
-string(3) 158
-string(3) 159
-string(3) 160
-string(3) 161
-string(3) 162
-string(3) 163
-string(3) 164
-string(3) 165
-string(3) 166
-string(3) 167
-string(3) 168
-string(3) 169
-string(3) 170
-string(3) 171
-string(3) 172
-string(3) 173
-string(3) 174
-string(3) 175
-string(3) 176
-string(3) 177
-string(3) 178
-string(3) 179
-string(3) 180
-string(3) 181
-string(3) 182
-string(3) 183
-string(3) 184
-string(3) 185
-string(3) 186
-string(3) 187
-string(3) 188
-string(3) 189
-string(3) 190
-string(3) 191
-string(3) 192
-string(3) 193
-string(3) 194
-string(3) 195
-string(3) 196
-string(3) 197
-string(3) 198
-string(3) 199
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8/tests bug27303.phpt bug27303_2.phpt bug27303_4.phpt lob_039.phpt

2008-02-25 Thread Christopher Jones

sixdTue Feb 26 01:06:37 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/oci8/tests bug27303.phpt bug27303_2.phpt 
bug27303_4.phpt lob_039.phpt 
  Log:
  Fix test noise
  http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bug27303.phpt?r1=1.1.2.3.2.2r2=1.1.2.3.2.3diff_format=u
Index: php-src/ext/oci8/tests/bug27303.phpt
diff -u php-src/ext/oci8/tests/bug27303.phpt:1.1.2.3.2.2 
php-src/ext/oci8/tests/bug27303.phpt:1.1.2.3.2.3
--- php-src/ext/oci8/tests/bug27303.phpt:1.1.2.3.2.2Mon May  7 18:02:59 2007
+++ php-src/ext/oci8/tests/bug27303.phptTue Feb 26 01:06:37 2008
@@ -49,7 +49,7 @@
 
 echo Done\n;
 ?
---EXPECTF--
+--EXPECT-- 
 string(1) 1
 string(1) 2
 string(1) 3
@@ -59,194 +59,194 @@
 string(1) 7
 string(1) 8
 string(1) 9
-string(2) 10
-string(2) 11
-string(2) 12
-string(2) 13
-string(2) 14
-string(2) 15
-string(2) 16
-string(2) 17
-string(2) 18
-string(2) 19
-string(2) 20
-string(2) 21
-string(2) 22
-string(2) 23
-string(2) 24
-string(2) 25
-string(2) 26
-string(2) 27
-string(2) 28
-string(2) 29
-string(2) 30
-string(2) 31
-string(2) 32
-string(2) 33
-string(2) 34
-string(2) 35
-string(2) 36
-string(2) 37
-string(2) 38
-string(2) 39
-string(2) 40
-string(2) 41
-string(2) 42
-string(2) 43
-string(2) 44
-string(2) 45
-string(2) 46
-string(2) 47
-string(2) 48
-string(2) 49
-string(2) 50
-string(2) 51
-string(2) 52
-string(2) 53
-string(2) 54
-string(2) 55
-string(2) 56
-string(2) 57
-string(2) 58
-string(2) 59
-string(2) 60
-string(2) 61
-string(2) 62
-string(2) 63
-string(2) 64
-string(2) 65
-string(2) 66
-string(2) 67
-string(2) 68
-string(2) 69
-string(2) 70
-string(2) 71
-string(2) 72
-string(2) 73
-string(2) 74
-string(2) 75
-string(2) 76
-string(2) 77
-string(2) 78
-string(2) 79
-string(2) 80
-string(2) 81
-string(2) 82
-string(2) 83
-string(2) 84
-string(2) 85
-string(2) 86
-string(2) 87
-string(2) 88
-string(2) 89
-string(2) 90
-string(2) 91
-string(2) 92
-string(2) 93
-string(2) 94
-string(2) 95
-string(2) 96
-string(2) 97
-string(2) 98
-string(2) 99
-string(3) 100
-string(3) 101
-string(3) 102
-string(3) 103
-string(3) 104
-string(3) 105
-string(3) 106
-string(3) 107
-string(3) 108
-string(3) 109
-string(3) 110
-string(3) 111
-string(3) 112
-string(3) 113
-string(3) 114
-string(3) 115
-string(3) 116
-string(3) 117
-string(3) 118
-string(3) 119
-string(3) 120
-string(3) 121
-string(3) 122
-string(3) 123
-string(3) 124
-string(3) 125
-string(3) 126
-string(3) 127
-string(3) 128
-string(3) 129
-string(3) 130
-string(3) 131
-string(3) 132
-string(3) 133
-string(3) 134
-string(3) 135
-string(3) 136
-string(3) 137
-string(3) 138
-string(3) 139
-string(3) 140
-string(3) 141
-string(3) 142
-string(3) 143
-string(3) 144
-string(3) 145
-string(3) 146
-string(3) 147
-string(3) 148
-string(3) 149
-string(3) 150
-string(3) 151
-string(3) 152
-string(3) 153
-string(3) 154
-string(3) 155
-string(3) 156
-string(3) 157
-string(3) 158
-string(3) 159
-string(3) 160
-string(3) 161
-string(3) 162
-string(3) 163
-string(3) 164
-string(3) 165
-string(3) 166
-string(3) 167
-string(3) 168
-string(3) 169
-string(3) 170
-string(3) 171
-string(3) 172
-string(3) 173
-string(3) 174
-string(3) 175
-string(3) 176
-string(3) 177
-string(3) 178
-string(3) 179
-string(3) 180
-string(3) 181
-string(3) 182
-string(3) 183
-string(3) 184
-string(3) 185
-string(3) 186
-string(3) 187
-string(3) 188
-string(3) 189
-string(3) 190
-string(3) 191
-string(3) 192
-string(3) 193
-string(3) 194
-string(3) 195
-string(3) 196
-string(3) 197
-string(3) 198
-string(3) 199
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 2
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 3
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 4
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 5
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 6
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 7
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 8
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 9
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1
+string(1) 1

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

2008-02-25 Thread Christopher Jones

sixdTue Feb 26 02:18:16 2008 UTC

  Modified files:  
/php-src/ext/oci8   oci8.c 
  Log:
  Use STD_PHP_INI_BOOLEAN.  Fix whitespace.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.343r2=1.344diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.343 php-src/ext/oci8/oci8.c:1.344
--- php-src/ext/oci8/oci8.c:1.343   Tue Feb 19 01:44:29 2008
+++ php-src/ext/oci8/oci8.c Tue Feb 26 02:18:16 2008
@@ -26,7 +26,7 @@
+--+
 */
 
-/* $Id: oci8.c,v 1.343 2008/02/19 01:44:29 sixd Exp $ */
+/* $Id: oci8.c,v 1.344 2008/02/26 02:18:16 sixd Exp $ */
 /* TODO
  *
  * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() 
with OCI_ATTR_LOBEMPTY
@@ -395,15 +395,15 @@
 
 /* {{{ PHP_INI */
 PHP_INI_BEGIN()
-STD_PHP_INI_ENTRY(oci8.max_persistent,   -1,   PHP_INI_SYSTEM, 
ONUPDATELONGFUNC,   max_persistent, 
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.persistent_timeout,   -1,   PHP_INI_SYSTEM, 
ONUPDATELONGFUNC,   persistent_timeout, 
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.ping_interval,60,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   ping_interval,  
zend_oci_globals,   oci_globals)
-STD_PHP_INI_BOOLEAN(oci8.privileged_connect, 0,PHP_INI_SYSTEM, 
OnUpdateBool,   privileged_connect, 
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.statement_cache_size, 20,   PHP_INI_SYSTEM, 
ONUPDATELONGFUNC,   statement_cache_size,   
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.default_prefetch, 10,   PHP_INI_SYSTEM, 
ONUPDATELONGFUNC,   default_prefetch,   
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.old_oci_close_semantics, 0, PHP_INI_SYSTEM, 
OnUpdateBool,   
old_oci_close_semantics,zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.connection_class,  ,PHP_INI_ALL,
OnUpdateUTF8String, connection_class,   
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.events,   0 ,   
PHP_INI_SYSTEM, OnUpdateBool,   events, 
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.max_persistent,  -1,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   max_persistent, 
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.persistent_timeout,  -1,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   persistent_timeout, 
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.ping_interval,   60,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   ping_interval,  
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_BOOLEAN(oci8.privileged_connect,  0,
PHP_INI_SYSTEM, OnUpdateBool,   privileged_connect, 
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.statement_cache_size,20,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   statement_cache_size,   
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.default_prefetch,10,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   default_prefetch,   
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_BOOLEAN(oci8.old_oci_close_semantics, 0,
PHP_INI_SYSTEM, OnUpdateBool,   
old_oci_close_semantics,zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.connection_class,, 
PHP_INI_ALL,OnUpdateUTF8String, connection_class,   
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_BOOLEAN(oci8.events,  
0,PHP_INI_SYSTEM, OnUpdateBool,   events, 
zend_oci_globals,   oci_globals)
 PHP_INI_END()
 /* }}} */
 
@@ -671,7 +671,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, 1.3.1 Beta);
-   php_info_print_table_row(2, Revision, $Revision: 1.343 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.344 $);
 
snprintf(buf, sizeof(buf), %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);

-- 
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/oci8 oci8.c

2008-02-25 Thread Christopher Jones

sixdTue Feb 26 02:21:04 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/oci8   oci8.c 
  Log:
  MFH: Use STD_PHP_INI_BOOLEAN.  Fix whitespace.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.8r2=1.269.2.16.2.38.2.9diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.8 
php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.9
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.8 Sat Feb 16 01:20:22 2008
+++ php-src/ext/oci8/oci8.c Tue Feb 26 02:21:04 2008
@@ -26,7 +26,7 @@
+--+
 */
 
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.8 2008/02/16 01:20:22 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.9 2008/02/26 02:21:04 sixd Exp $ */
 /* TODO
  *
  * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() 
with OCI_ATTR_LOBEMPTY
@@ -423,15 +423,15 @@
 
 /* {{{ PHP_INI */
 PHP_INI_BEGIN()
-STD_PHP_INI_ENTRY(oci8.max_persistent,   -1,   PHP_INI_SYSTEM, 
ONUPDATELONGFUNC,   max_persistent, 
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.persistent_timeout,   -1,   PHP_INI_SYSTEM, 
ONUPDATELONGFUNC,   persistent_timeout, 
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.ping_interval,60,   PHP_INI_SYSTEM, 
ONUPDATELONGFUNC,   ping_interval,  
zend_oci_globals,   oci_globals)
-STD_PHP_INI_BOOLEAN(oci8.privileged_connect, 0,PHP_INI_SYSTEM, 
OnUpdateBool,   privileged_connect, zend_oci_globals,   
oci_globals)
-STD_PHP_INI_ENTRY(oci8.statement_cache_size, 20,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   statement_cache_size,   
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.default_prefetch, 10,   PHP_INI_SYSTEM, 
ONUPDATELONGFUNC,   default_prefetch,   
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.old_oci_close_semantics,  0,
PHP_INI_SYSTEM, OnUpdateBool,   old_oci_close_semantics,
zend_oci_globals,   oci_globals)
-STD_PHP_INI_ENTRY(oci8.connection_class,   ,PHP_INI_ALL,   
  OnUpdateString, connection_class, zend_oci_globals, oci_globals)
-STD_PHP_INI_ENTRY(oci8.events,  0 ,PHP_INI_SYSTEM, 
OnUpdateBool, events, zend_oci_globals, oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.max_persistent,  -1,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   max_persistent, 
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.persistent_timeout,  -1,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   persistent_timeout, 
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.ping_interval,   60,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   ping_interval,  
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_BOOLEAN(oci8.privileged_connect,  0,
PHP_INI_SYSTEM, OnUpdateBool,   privileged_connect, 
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.statement_cache_size,20,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   statement_cache_size,   
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.default_prefetch,10,   
PHP_INI_SYSTEM, ONUPDATELONGFUNC,   default_prefetch,   
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_BOOLEAN(oci8.old_oci_close_semantics, 0,
PHP_INI_SYSTEM, OnUpdateBool,   
old_oci_close_semantics,zend_oci_globals,   oci_globals)
+   STD_PHP_INI_ENTRY(  oci8.connection_class,, 
PHP_INI_ALL,OnUpdateString, connection_class,   
zend_oci_globals,   oci_globals)
+   STD_PHP_INI_BOOLEAN(oci8.events,  
0,PHP_INI_SYSTEM, OnUpdateBool,   events, 
zend_oci_globals,   oci_globals)
 PHP_INI_END()
 /* }}} */
 
@@ -710,7 +710,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, 1.3.1 Beta);
-   php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.38.2.8 
$);
+   php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.38.2.9 
$);
 
snprintf(buf, sizeof(buf), %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);

-- 
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 /ext/pdo pdo_stmt.c

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

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

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

Re: [PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib parse_date.c parse_date.re

[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c parse_date.re

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/lib parse_date.c parse_date.re

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/tests bug41523-64bit.phpt bug41523.phpt mktime-3-64bit.phpt mktime-3.phpt strtotime-mysql-64bit.phpt strtotime-mysql.phpt strtotime3-64bit.phpt strtotime3.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/tests bug41523-64bit.phpt bug41523.phpt mktime-3-64bit.phpt mktime-3.phpt strtotime-mysql-64bit.phpt strtotime-mysql.phpt strtotime3-64bit.phpt strtotime3.php

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard metaphone.c /ext/standard/tests/strings bug44242.phpt

[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/tests bug41523-64bit.phpt bug41523.phpt mktime-3-64bit.phpt mktime-3.phpt strtotime-mysql-64bit.phpt strtotime-mysql.phpt strtotime3-64bit.phpt s

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard metaphone.c /ext/standard/tests/strings bug44242.phpt

[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c

[PHP-CVS] cvs: php-src /ext/standard metaphone.c /ext/standard/tests/strings bug44242.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c

Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard metaphone.c /ext/standard/tests/strings bug44242.phpt

[PHP-CVS] cvs: php-src /ext/spl config.m4 config.w32 php_spl.c spl_heap.c spl_heap.h /ext/spl/tests heap_001.phpt heap_002.phpt heap_003.phpt heap_004.phpt heap_005.phpt heap_006.phpt heap_007.phpt h

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl config.m4 config.w32 php_spl.c spl_heap.c spl_heap.h /ext/spl/tests heap_001.phpt heap_002.phpt heap_003.phpt heap_004.phpt heap_005.phpt heap_006.phpt heap_0

[PHP-CVS] cvs: php-src /ext/spl spl_heap.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_heap.c

[PHP-CVS] cvs: php-src /ext/oci8 oci8_interface.c oci8_lob.c oci8_statement.c php_oci8_int.h /ext/oci8/tests bug43492_2.phpt bug44008.phpt bug44206.phpt lob_014.phpt lob_021.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 oci8_interface.c oci8_lob.c oci8_statement.c php_oci8_int.h /ext/oci8/tests bug43492_2.phpt bug44008.phpt bug44206.phpt lob_014.phpt lob_021.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 oci8_interface.c oci8_lob.c oci8_statement.c php_oci8_int.h /ext/oci8/tests bug43492_2.phpt bug44008.phpt bug44206.phpt lob_014.phpt lob_021.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo_stmt.c /ext/pdo_pgsql pgsql_statement.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c /ext/pdo_pgsql pgsql_statement.c

[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c /ext/pdo_pgsql pgsql_statement.c

[PHP-CVS] cvs: php-src /ext/oci8/tests lob_039.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8/tests bug27303.phpt bug27303_2.phpt bug27303_4.phpt lob_039.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8/tests bug27303.phpt bug27303_2.phpt bug27303_4.phpt lob_039.phpt

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 oci8.c

34 matches

Site Navigation

Mail list logo

Footer information