[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Mar 8 01:31:31 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2980r2=1.2981diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2980 php-src/ChangeLog:1.2981 --- php-src/ChangeLog:1.2980Fri Mar 7 01:31:33 2008 +++ php-src/ChangeLog Sat Mar 8 01:31:31 2008 @@ -1,3 +1,468 @@ +2008-03-07 Gwynne Raskind [EMAIL PROTECTED] + +* (PHP_5_3) + ext/session/tests/bug32330.phpt: + Forgot one file in last commit + +* (PHP_5_3) + ext/session/mod_user.c + ext/session/mod_user.h + ext/session/php_session.h + ext/session/session.c: + MFH: fix bug #32330 (session_destroy, Failed to initialize storage + module, custom session handler) + +* ext/session/mod_user.c + ext/session/mod_user.h + ext/session/php_session.h + ext/session/session.c + ext/session/tests/bug32330.phpt + ext/session/tests/bug32330.phpt: + Fix bug #32330 (session_destroy, Failed to initialize storage module, + custom session handler) + +2008-03-07 Johannes Schlüter [EMAIL PROTECTED] + +* sapi/cli/tests/018.phpt + sapi/cli/tests/018.phpt + sapi/cli/tests/019.phpt + sapi/cli/tests/019.phpt + sapi/cli/tests/020.phpt + sapi/cli/tests/020.phpt: + + - New tests + +2008-03-07 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/exif/exif.c: + - MFB: #44355compilation breaks due illegal const usage + +* (PHP_5_2) + ext/exif/exif.c: + - #44355, compilation breaks due illegal const usage (Guenter Knauf) +I suppose it must break on other platform, it is not used anywhere else +but here, and it was introduced after 5.2.5 (why no news) + +2008-03-07 Scott MacVicar [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS: + BFN. + +* ext/pdo_sqlite/sqlite_statement.c: + MFB: + Fixed bug #41135 (When binding as binary data use sqlite3_bind_blob() to + stop errors with null bytes.) + Fixed bug #42443 (Bind integers and booleans as integers rather than + strings.) + +* (PHP_5_3) + ext/pdo_sqlite/sqlite_statement.c: + Fixed bug #41135 (When binding as binary data use sqlite3_bind_blob() to + stop errors with null bytes.) + Fixed bug #42443 (Bind integers and booleans as integers rather than + strings.) + +2008-03-07 Josie Messa [EMAIL PROTECTED] + +* ext/standard/tests/dir/closedir_variation3.phpt + ext/standard/tests/dir/closedir_variation3.phpt + ext/standard/tests/dir/readdir_variation7.phpt + ext/standard/tests/dir/readdir_variation7.phpt + ext/standard/tests/dir/rewinddir_variation3.phpt + ext/standard/tests/dir/rewinddir_variation3.phpt: + - Tests awaiting fix of bug #44246 + +* ext/standard/tests/dir/closedir_variation3.phpt + ext/standard/tests/dir/closedir_variation3.phpt + ext/standard/tests/dir/closedir_variation3.phpt + ext/standard/tests/dir/readdir_variation7.phpt + ext/standard/tests/dir/readdir_variation7.phpt + ext/standard/tests/dir/readdir_variation7.phpt + ext/standard/tests/dir/rewinddir_variation3.phpt + ext/standard/tests/dir/rewinddir_variation3.phpt + ext/standard/tests/dir/rewinddir_variation3.phpt: +1.1.4; + file closedir_variation3.phpt was initially added on branch PHP_5_2. + +* ext/standard/tests/dir/rewinddir_basic.phpt + ext/standard/tests/dir/rewinddir_basic.phpt + ext/standard/tests/dir/rewinddir_error.phpt + ext/standard/tests/dir/rewinddir_error.phpt + ext/standard/tests/dir/rewinddir_variation1.phpt + ext/standard/tests/dir/rewinddir_variation1.phpt + ext/standard/tests/dir/rewinddir_variation2.phpt + ext/standard/tests/dir/rewinddir_variation2.phpt: + - New tests for rewinddir() function + +* ext/standard/tests/dir/rewinddir_basic.phpt + ext/standard/tests/dir/rewinddir_basic.phpt + ext/standard/tests/dir/rewinddir_basic.phpt + ext/standard/tests/dir/rewinddir_error.phpt + ext/standard/tests/dir/rewinddir_error.phpt + ext/standard/tests/dir/rewinddir_error.phpt + ext/standard/tests/dir/rewinddir_variation1.phpt + ext/standard/tests/dir/rewinddir_variation1.phpt + ext/standard/tests/dir/rewinddir_variation1.phpt + ext/standard/tests/dir/rewinddir_variation2.phpt + ext/standard/tests/dir/rewinddir_variation2.phpt + ext/standard/tests/dir/rewinddir_variation2.phpt: +1.1.4; + file rewinddir_basic.phpt was initially added on branch PHP_5_2. + +* ext/standard/tests/dir/opendir_variation5.phpt: + fix test + +* ext/standard/tests/dir/closedir_basic.phpt + ext/standard/tests/dir/closedir_basic.phpt + ext/standard/tests/dir/closedir_error.phpt + ext/standard/tests/dir/closedir_error.phpt + ext/standard/tests/dir/closedir_variation1.phpt
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sat Mar 8 01:31:35 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1255r2=1.1256diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1255 ZendEngine2/ChangeLog:1.1256 --- ZendEngine2/ChangeLog:1.1255Fri Mar 7 01:31:36 2008 +++ ZendEngine2/ChangeLog Sat Mar 8 01:31:34 2008 @@ -1,3 +1,11 @@ +2008-03-07 Felipe Pena [EMAIL PROTECTED] + +* zend_compile.c + zend_execute_API.c + zend_vm_def.h + zend_vm_execute.h: + Better readability (USTR_BYTES) + 2008-03-06 Antony Dovgal [EMAIL PROTECTED] * (PHP_5_2) @@ -21753,7 +21761,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1255 2008/03/07 01:31:36 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1256 2008/03/08 01:31:34 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -23477,7 +23485,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1255 2008/03/07 01:31:36 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1256 2008/03/08 01:31:34 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/standard php_rand.h
gwynne Fri Mar 7 08:51:06 2008 UTC Modified files: /php-src/ext/standard php_rand.h Log: Fix build (one too many right parenthesis in last commit for non-Windows builds) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_rand.h?r1=1.32r2=1.33diff_format=u Index: php-src/ext/standard/php_rand.h diff -u php-src/ext/standard/php_rand.h:1.32 php-src/ext/standard/php_rand.h:1.33 --- php-src/ext/standard/php_rand.h:1.32Fri Mar 7 03:39:29 2008 +++ php-src/ext/standard/php_rand.h Fri Mar 7 08:51:05 2008 @@ -20,7 +20,7 @@ | Based on code from: Shawn Cokus [EMAIL PROTECTED] | +--+ */ -/* $Id: php_rand.h,v 1.32 2008/03/07 03:39:29 stas Exp $ */ +/* $Id: php_rand.h,v 1.33 2008/03/07 08:51:05 gwynne Exp $ */ #ifndef PHP_RAND_H #definePHP_RAND_H @@ -49,7 +49,7 @@ #ifdef PHP_WIN32 #define GENERATE_SEED() (((long) (time(0) * GetCurrentProcessId())) ^ ((long) (100.0 * php_combined_lcg(TSRMLS_C #else -#define GENERATE_SEED() (((long) (time(0) * getpid())) ^ ((long) (100.0 * php_combined_lcg(TSRMLS_C) +#define GENERATE_SEED() (((long) (time(0) * getpid())) ^ ((long) (100.0 * php_combined_lcg(TSRMLS_C #endif PHPAPI void php_srand(long seed TSRMLS_DC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard php_rand.h
tony2001Fri Mar 7 08:56:45 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard php_rand.h Log: fix build http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_rand.h?r1=1.28.2.1.2.3r2=1.28.2.1.2.4diff_format=u Index: php-src/ext/standard/php_rand.h diff -u php-src/ext/standard/php_rand.h:1.28.2.1.2.3 php-src/ext/standard/php_rand.h:1.28.2.1.2.4 --- php-src/ext/standard/php_rand.h:1.28.2.1.2.3Fri Mar 7 03:34:47 2008 +++ php-src/ext/standard/php_rand.h Fri Mar 7 08:56:45 2008 @@ -20,7 +20,7 @@ | Based on code from: Shawn Cokus [EMAIL PROTECTED] | +--+ */ -/* $Id: php_rand.h,v 1.28.2.1.2.3 2008/03/07 03:34:47 stas Exp $ */ +/* $Id: php_rand.h,v 1.28.2.1.2.4 2008/03/07 08:56:45 tony2001 Exp $ */ #ifndef PHP_RAND_H #definePHP_RAND_H @@ -49,7 +49,7 @@ #ifdef PHP_WIN32 #define GENERATE_SEED() (((long) (time(0) * GetCurrentProcessId())) ^ ((long) (100.0 * php_combined_lcg(TSRMLS_C #else -#define GENERATE_SEED() (((long) (time(0) * getpid())) ^ ((long) (100.0 * php_combined_lcg(TSRMLS_C) +#define GENERATE_SEED() (((long) (time(0) * getpid())) ^ ((long) (100.0 * php_combined_lcg(TSRMLS_C #endif PHPAPI void php_srand(long seed TSRMLS_DC); -- 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_sqlite/sqlite VERSION
scottmacFri Mar 7 10:38:33 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo_sqlite/sqlite VERSION Log: Typo, bundled version is really 3.3.7 http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite/VERSION?r1=1.3.2.3.2.6r2=1.3.2.3.2.7diff_format=u Index: php-src/ext/pdo_sqlite/sqlite/VERSION diff -u php-src/ext/pdo_sqlite/sqlite/VERSION:1.3.2.3.2.6 php-src/ext/pdo_sqlite/sqlite/VERSION:1.3.2.3.2.7 --- php-src/ext/pdo_sqlite/sqlite/VERSION:1.3.2.3.2.6 Wed May 16 21:04:46 2007 +++ php-src/ext/pdo_sqlite/sqlite/VERSION Fri Mar 7 10:38:33 2008 @@ -1 +1 @@ -3.3.17 +3.3.7 -- 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) / NEWS
scottmacFri Mar 7 12:19:57 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.123r2=1.2027.2.547.2.965.2.124diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.123 php-src/NEWS:1.2027.2.547.2.965.2.124 --- php-src/NEWS:1.2027.2.547.2.965.2.123 Wed Mar 5 13:34:11 2008 +++ php-src/NEWSFri Mar 7 12:19:56 2008 @@ -118,6 +118,7 @@ . Added support for OpenSSL cipher functions . Added access to internal values of DSA, RSA and DH keys - Improved md5() implementation (Solar Designer, Dmitry) +- Upgraded bundled sqlite to version 3.5.6 (Scott) - Fixed html_entity_decode() incorrectly converting numeric html entities to different characters with cp1251 and cp866. (Scott) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Fri Mar 7 12:46:19 2008 UTC Modified files: /CVSROOTavail Log: - karma for systems (for myself) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1365r2=1.1366diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1365 CVSROOT/avail:1.1366 --- CVSROOT/avail:1.1365Wed Mar 5 19:42:06 2008 +++ CVSROOT/avail Fri Mar 7 12:46:19 2008 @@ -131,7 +131,7 @@ avail|changelog|php-src,php-gtk,Zend,ZendEngine2,smarty # Some people have access to change the day-to-day code on the various php.net machines -avail|imajes,edink,derick,sfox,wez,goba,mj|systems +avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye|systems # Finally, there are various people with access to various bits and # pieces of other CVS modules. -- 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) / NEWS
janiFri Mar 7 14:40:08 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: style http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.124r2=1.2027.2.547.2.965.2.125diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.124 php-src/NEWS:1.2027.2.547.2.965.2.125 --- php-src/NEWS:1.2027.2.547.2.965.2.124 Fri Mar 7 12:19:56 2008 +++ php-src/NEWSFri Mar 7 14:40:08 2008 @@ -1,8 +1,10 @@ PHPNEWS ||| ?? ??? 20??, PHP 5.3.0 -- Add new error mode E_DEPRECATED that informs about stuff that gets dropped in - later PHP versions. (Lars Strojny, Felipe, Marcus) +- Removed the experimental RPL (master/slave) functions from mysqli. (Andrey) + +- Added new error mode E_DEPRECATED which is used to inform about stuff to be + dropped in future PHP versions. (Lars Strojny, Felipe, Marcus) - Added and improved PHP syntax and semantics: . Added NOWDOC. (Gwynne Raskind, Stas, Dmitry) . Added ?: operator. (Marcus) @@ -15,7 +17,6 @@ . Added __DIR__ constant. (Lars Strojny) . Added PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants (Pierre) - - Added new date/time functionality: (Derick) . date_parse_from_format(): Parse date/time strings according to a format. . date_create_from_format()/DateTime::createFromFormat(): Create a date/time @@ -45,11 +46,10 @@ . Added FilesystemIterator. (Marcus) . Added GlobIterator. (Marcus) . Added SplHeap, SplMinHeap, SplMaxHeap, SplPriorityQueue classes. (Etienne) -- Add the ReflectionProperty::setAccessible() method that allows non-public +- Added ReflectionProperty::setAccessible() method that allows non-public property's values to be read through ::getValue(). (Derick) - Added ability to use Traversable objects instead of plain arrays in ext/soap. (Joshua Reese, Dmitry) -- Added stream_supports_lock() function. (Benjamin Schulz) - Added msg_queue_exists() function. (Benjamin Schulz) - Added 3 Firebird specific attributes that can be set via PDO::setAttribute() to control formatting of date/timestamp columns: PDO::FB_ATTR_DATE_FORMAT, @@ -75,8 +75,6 @@ - Added OCI8 SQLT_AFC (aka CHAR datatype) support to oci_bind_by_name (Chris Jones) -- Removed the experimental RPL (master/slave) functions from mysqli. (Andrey) - - Improved PHP runtime speed and memory usage: . Added garbage collector. (David Wang, Dmitry). . Improved PHP binary size and startup speed with GCC4 visibility control. @@ -108,6 +106,7 @@ . Added CGI SAPI -T option which can be used to measure execution time of script repeated several times. (Dmitry) - Improved streams: + . Added stream_supports_lock() function. (Benjamin Schulz) . Added ignore_errors option to http fopen wrapper. (David Zulke, Sara) . Added context parameter for copy() function. (Sara) . Added glob stream wrapper. (Marcus) @@ -117,14 +116,15 @@ . Added support for OpenSSL digest functions . Added support for OpenSSL cipher functions . Added access to internal values of DSA, RSA and DH keys -- Improved md5() implementation (Solar Designer, Dmitry) -- Upgraded bundled sqlite to version 3.5.6 (Scott) +- Improved md5() implementation. (Solar Designer, Dmitry) + +- Upgraded bundled sqlite to version 3.5.6. (Scott) - Fixed html_entity_decode() incorrectly converting numeric html entities to different characters with cp1251 and cp866. (Scott) - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf) - - Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle Corp.) + - Fixed bug #43960 (strtotime() returns timestamp in the future when given a bogus string). - Fixed bug #43808 (date_create never fails (even when it should)). (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/dir closedir_basic.phpt closedir_error.phpt closedir_variation1.phpt closedir_variation2.phpt
jmessa Fri Mar 7 15:58:39 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/dir closedir_error.phpt closedir_variation2.phpt closedir_variation1.phpt closedir_basic.phpt Log: - New tests for closedir() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/closedir_error.phpt +++ php-src/ext/standard/tests/dir/closedir_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/closedir_variation2.phpt +++ php-src/ext/standard/tests/dir/closedir_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/closedir_variation1.phpt +++ php-src/ext/standard/tests/dir/closedir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/closedir_basic.phpt +++ php-src/ext/standard/tests/dir/closedir_basic.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/dir closedir_basic.phpt closedir_error.phpt closedir_variation1.phpt closedir_variation2.phpt
jmessa Fri Mar 7 16:00:24 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/dir closedir_variation2.phpt closedir_variation1.phpt closedir_error.phpt closedir_basic.phpt Log: - New tests for closedir() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/closedir_variation2.phpt +++ php-src/ext/standard/tests/dir/closedir_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/closedir_variation1.phpt +++ php-src/ext/standard/tests/dir/closedir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/closedir_error.phpt +++ php-src/ext/standard/tests/dir/closedir_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/closedir_basic.phpt +++ php-src/ext/standard/tests/dir/closedir_basic.phpt -- 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/dir closedir_basic.phpt closedir_error.phpt closedir_variation1.phpt closedir_variation2.phpt
jmessa Fri Mar 7 16:02:42 2008 UTC
Modified files:
/php-src/ext/standard/tests/dir closedir_variation1.phpt
closedir_basic.phpt
closedir_error.phpt
closedir_variation2.phpt
Log:
- New tests for closedir() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/dir/closedir_variation1.phpt
diff -u /dev/null php-src/ext/standard/tests/dir/closedir_variation1.phpt:1.2
--- /dev/null Fri Mar 7 16:02:42 2008
+++ php-src/ext/standard/tests/dir/closedir_variation1.phpt Fri Mar 7
16:02:42 2008
@@ -0,0 +1,335 @@
+--TEST--
+Test closedir() function : usage variations - different data types as
$dir_handle arg
+--FILE--
+?php
+/* Prototype : void closedir([resource $dir_handle])
+ * Description: Close directory connection identified by the dir_handle
+ * Source code: ext/standard/dir.c
+ * Alias to functions: close
+ */
+
+/*
+ * Pass different data types as $dir_handle argument to closedir() to test
behaviour
+ */
+
+echo *** Testing closedir() : usage variations ***\n;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+ public function __toString() {
+return Class A object;
+ }
+}
+
+// heredoc string
+$heredoc = EOT
+hello world
+EOT;
+
+// unexpected values to be passed to $dir_handle argument
+$inputs = array(
+
+ // int data
+/*1*/ 0,
+ 1,
+ 12345,
+ -2345,
+
+ // float data
+/*5*/ 10.5,
+ -10.5,
+ 12.3456789000e10,
+ 12.3456789000E-10,
+ .5,
+
+ // null data
+/*10*/ NULL,
+ null,
+
+ // boolean data
+/*12*/ true,
+ false,
+ TRUE,
+ FALSE,
+
+ // empty data
+/*16*/ ,
+ '',
+ array(),
+
+ // string data
+/*19*/ string,
+ 'string',
+ $heredoc,
+
+ // object data
+/*22*/ new classA(),
+
+ // undefined data
+/*23*/ @$undefined_var,
+
+ // unset data
+/*24*/ @$unset_var,
+);
+
+// loop through each element of $inputs to check the behavior of closedir()
+$iterator = 1;
+foreach($inputs as $input) {
+ echo \n-- Iteration $iterator --\n;
+ var_dump( closedir($input) );
+ $iterator++;
+};
+
+?
+===DONE===
+--EXPECTF--
+*** Testing closedir() : usage variations ***
+
+-- Iteration 1 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 2 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 3 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 4 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 5 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 6 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 7 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 8 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 9 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 10 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 11 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 12 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 13 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 14 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 15 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 16 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 17 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 18 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 19 --
+
+Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
+bool(false)
+
+-- Iteration 20 --
+
+Warning: closedir(): supplied argument is not a
[PHP-CVS] cvs: php-src /ext/standard/tests/dir opendir_variation5.phpt
jmessa Fri Mar 7 16:07:34 2008 UTC Modified files: /php-src/ext/standard/tests/dir opendir_variation5.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation5.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation5.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.3 php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.4 --- php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.3 Tue Mar 4 11:16:22 2008 +++ php-src/ext/standard/tests/dir/opendir_variation5.phpt Fri Mar 7 16:07:34 2008 @@ -102,7 +102,7 @@ bool(false) ===DONE=== --UEXPECTF-- -*** Testing opendir() : usage variations *** +*** Testing opendir() : usage variations *** -- After restricting 1st level parent directory -- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/dir rewinddir_basic.phpt rewinddir_error.phpt rewinddir_variation1.phpt rewinddir_variation2.phpt
jmessa Fri Mar 7 16:08:58 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/dir rewinddir_basic.phpt rewinddir_variation1.phpt rewinddir_variation2.phpt rewinddir_error.phpt Log: - New tests for rewinddir() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/rewinddir_basic.phpt +++ php-src/ext/standard/tests/dir/rewinddir_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/rewinddir_variation1.phpt +++ php-src/ext/standard/tests/dir/rewinddir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/rewinddir_variation2.phpt +++ php-src/ext/standard/tests/dir/rewinddir_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/rewinddir_error.phpt +++ php-src/ext/standard/tests/dir/rewinddir_error.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/dir rewinddir_basic.phpt rewinddir_error.phpt rewinddir_variation1.phpt rewinddir_variation2.phpt
jmessa Fri Mar 7 16:12:03 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/dir rewinddir_variation1.phpt rewinddir_error.phpt rewinddir_basic.phpt rewinddir_variation2.phpt Log: - New tests for rewinddir() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/rewinddir_variation1.phpt +++ php-src/ext/standard/tests/dir/rewinddir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/rewinddir_error.phpt +++ php-src/ext/standard/tests/dir/rewinddir_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/rewinddir_basic.phpt +++ php-src/ext/standard/tests/dir/rewinddir_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/rewinddir_variation2.phpt +++ php-src/ext/standard/tests/dir/rewinddir_variation2.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/dir closedir_variation3.phpt readdir_variation7.phpt rewinddir_variation3.phpt
jmessa Fri Mar 7 16:19:39 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/dir readdir_variation7.phpt closedir_variation3.phpt rewinddir_variation3.phpt Log: - Tests awaiting fix of bug #44246 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/readdir_variation7.phpt +++ php-src/ext/standard/tests/dir/readdir_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/closedir_variation3.phpt +++ php-src/ext/standard/tests/dir/closedir_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/rewinddir_variation3.phpt +++ php-src/ext/standard/tests/dir/rewinddir_variation3.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/dir closedir_variation3.phpt readdir_variation7.phpt rewinddir_variation3.phpt
jmessa Fri Mar 7 16:20:16 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/dir rewinddir_variation3.phpt readdir_variation7.phpt closedir_variation3.phpt Log: - Tests awaiting fix of bug #44246 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/rewinddir_variation3.phpt +++ php-src/ext/standard/tests/dir/rewinddir_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/readdir_variation7.phpt +++ php-src/ext/standard/tests/dir/readdir_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/closedir_variation3.phpt +++ php-src/ext/standard/tests/dir/closedir_variation3.phpt -- 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/dir closedir_variation3.phpt readdir_variation7.phpt rewinddir_variation3.phpt
jmessa Fri Mar 7 16:21:30 2008 UTC
Modified files:
/php-src/ext/standard/tests/dir rewinddir_variation3.phpt
closedir_variation3.phpt
readdir_variation7.phpt
Log:
- Tests awaiting fix of bug #44246
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation3.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/dir/rewinddir_variation3.phpt
diff -u /dev/null php-src/ext/standard/tests/dir/rewinddir_variation3.phpt:1.2
--- /dev/null Fri Mar 7 16:21:30 2008
+++ php-src/ext/standard/tests/dir/rewinddir_variation3.phptFri Mar 7
16:21:30 2008
@@ -0,0 +1,51 @@
+--TEST--
+Test rewinddir() function : usage variations - file pointers
+--FILE--
+?php
+/* Prototype : void rewinddir([resource $dir_handle])
+ * Description: Rewind dir_handle back to the start
+ * Source code: ext/standard/dir.c
+ * Alias to functions: rewind
+ */
+
+/*
+ * Pass a file pointer to rewinddir() to test behaviour
+ */
+
+echo *** Testing rewinddir() : usage variations ***\n;
+
+echo \n-- Open a file using fopen --\n;
+var_dump($fp = fopen(__FILE__, 'r'));
+
+$result1 = fread($fp, 5);
+var_dump(rewinddir($fp));
+$result2 = fread($fp, 5);
+
+echo \n-- Check if rewinddir() has repositioned the file pointer --\n;
+if ($result1 === $result2) {
+ echo rewinddir() works on file pointers\n;
+} else {
+ echo rewinddir() does not work on file pointers\n;
+}
+?
+===DONE===
+--EXPECTF--
+*** Testing rewinddir() : usage variations ***
+
+-- Open a file using fopen --
+resource(%d) of type (stream)
+NULL
+
+-- Check if rewinddir() has repositioned the file pointer --
+rewinddir() does not work on file pointers
+===DONE===
+--UEXPECTF--
+*** Testing rewinddir() : usage variations ***
+
+-- Open a file using fopen --
+resource(%d) of type (stream)
+NULL
+
+-- Check if rewinddir() has repositioned the file pointer --
+rewinddir() does not work on file pointers
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation3.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/dir/closedir_variation3.phpt
diff -u /dev/null php-src/ext/standard/tests/dir/closedir_variation3.phpt:1.2
--- /dev/null Fri Mar 7 16:21:30 2008
+++ php-src/ext/standard/tests/dir/closedir_variation3.phpt Fri Mar 7
16:21:30 2008
@@ -0,0 +1,54 @@
+--TEST--
+Test closedir() function : usage variations - close a file pointer
+--FILE--
+?php
+/* Prototype : void closedir([resource $dir_handle])
+ * Description: Close directory connection identified by the dir_handle
+ * Source code: ext/standard/dir.c
+ * Alias to functions: close
+ */
+
+/*
+ * Create a file pointer using fopen() then try to close it using closedir()
+ */
+
+echo *** Testing closedir() : usage variations ***\n;
+
+echo \n-- Open a file using fopen() --\n;
+var_dump($fp = fopen(__FILE__, 'r'));
+
+echo \n-- Try to close the file pointer using closedir() --\n;
+var_dump(closedir($fp));
+
+echo \n-- Check file pointer: --\n;
+var_dump($fp);
+
+if(is_resource($fp)) {
+ fclose($fp);
+}
+?
+===DONE===
+--EXPECTF--
+*** Testing closedir() : usage variations ***
+
+-- Open a file using fopen() --
+resource(%d) of type (stream)
+
+-- Try to close the file pointer using closedir() --
+Warning: closedir(): %d is not a valid Directory resource in %s on line %d
+
+-- Check file pointer: --
+resource(%d) of type (stream)
+===DONE===
+--UEXPECTF--
+*** Testing closedir() : usage variations ***
+
+-- Open a file using fopen() --
+resource(%d) of type (stream)
+
+-- Try to close the file pointer using closedir() --
+Warning: closedir(): %d is not a valid Directory resource in %s on line %d
+
+-- Check file pointer: --
+resource(%d) of type (stream)
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation7.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/dir/readdir_variation7.phpt
diff -u /dev/null php-src/ext/standard/tests/dir/readdir_variation7.phpt:1.2
--- /dev/null Fri Mar 7 16:21:30 2008
+++ php-src/ext/standard/tests/dir/readdir_variation7.phpt Fri Mar 7
16:21:30 2008
@@ -0,0 +1,42 @@
+--TEST--
+Test readdir() function : usage variations - use file pointers
+--FILE--
+?php
+/* Prototype : string readdir([resource $dir_handle])
+ * Description: Read directory entry from dir_handle
+ * Source code: ext/standard/dir.c
+ */
+
+/*
+ * Open a file pointer using fopen and pass to readdir() to test behaviour
+ */
+
+echo *** Testing readdir() : usage variations ***\n;
+
+// get a resource variable
+var_dump($fp = fopen(__FILE__, r));
+var_dump( readdir($fp) );
+
+// get file length over 256 characters
+EOT
+123456789012345678901234567890
+123456789012345678901234567890
+123456789012345678901234567890
+123456789012345678901234567890
+123456789012345678901234567890
+EOT;
+?
+===DONE===
+--EXPECTF--
+*** Testing readdir() : usage variations ***
[PHP-CVS] cvs: CVSROOT / avail
philip Fri Mar 7 16:50:06 2008 UTC Modified files: /CVSROOTavail Log: - phpdoc karma for Daniel Brown (danbrown) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1366r2=1.1367diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1366 CVSROOT/avail:1.1367 --- CVSROOT/avail:1.1366Fri Mar 7 12:46:19 2008 +++ CVSROOT/avail Fri Mar 7 16:50:06 2008 @@ -45,7 +45,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,c! hief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,! abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,h win,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj! ,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,lsmith,tessus,gavinfo,rant,ramsey,arkadius,bjori,erinet,omar,sixd,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,mkoppanen,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,felipe,asbjornit,philippe,sezer,ka! lle,rmlr,hradtke,alan,danielc|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,php doc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_sqlite sqlite_statement.c
scottmacFri Mar 7 16:58:55 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
Fixed bug #41135 (When binding as binary data use sqlite3_bind_blob() to stop
errors with null bytes.)
Fixed bug #42443 (Bind integers and booleans as integers rather than strings.)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4.2.3.2.1r2=1.18.2.4.2.3.2.2diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.1
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.2
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.1 Mon Dec 31
07:17:12 2007
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Fri Mar 7 16:58:55 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.1 2007/12/31 07:17:12 sebastian
Exp $ */
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.2 2008/03/07 16:58:55 scottmac Exp
$ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -104,6 +104,21 @@
pdo_sqlite_error_stmt(stmt);
return 0;
+ case PDO_PARAM_INT:
+ case PDO_PARAM_BOOL:
+ if (Z_TYPE_P(param-parameter)
== IS_NULL) {
+ if
(sqlite3_bind_null(S-stmt, param-paramno + 1) == SQLITE_OK) {
+ return 1;
+ }
+ } else {
+
convert_to_long(param-parameter);
+ if (SQLITE_OK ==
sqlite3_bind_int(S-stmt, param-paramno + 1, Z_LVAL_P(param-parameter))) {
+ return 1;
+ }
+ }
+ pdo_sqlite_error_stmt(stmt);
+ return 0;
+
case PDO_PARAM_LOB:
if (Z_TYPE_P(param-parameter)
== IS_RESOURCE) {
php_stream *stm;
@@ -117,9 +132,25 @@
pdo_raise_impl_error(stmt-dbh, stmt, HY105, Expected a stream resource
TSRMLS_CC);
return 0;
}
+ } else if
(Z_TYPE_P(param-parameter) == IS_NULL) {
+ if
(sqlite3_bind_null(S-stmt, param-paramno + 1) == SQLITE_OK) {
+ return 1;
+ }
+
pdo_sqlite_error_stmt(stmt);
+ return 0;
+ } else {
+
convert_to_string(param-parameter);
}
- /* fall through */
-
+
+ if (SQLITE_OK ==
sqlite3_bind_blob(S-stmt, param-paramno + 1,
+
Z_STRVAL_P(param-parameter),
+
Z_STRLEN_P(param-parameter),
+ SQLITE_STATIC))
{
+ return 1;
+ }
+ pdo_sqlite_error_stmt(stmt);
+ return 0;
+
case PDO_PARAM_STR:
default:
if (Z_TYPE_P(param-parameter)
== IS_NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite sqlite_statement.c
scottmacFri Mar 7 17:02:48 2008 UTC
Modified files:
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
MFB:
Fixed bug #41135 (When binding as binary data use sqlite3_bind_blob() to stop
errors with null bytes.)
Fixed bug #42443 (Bind integers and booleans as integers rather than strings.)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.24r2=1.25diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.24
php-src/ext/pdo_sqlite/sqlite_statement.c:1.25
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.24 Mon Dec 31 07:12:13 2007
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Fri Mar 7 17:02:48 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.24 2007/12/31 07:12:13 sebastian Exp $ */
+/* $Id: sqlite_statement.c,v 1.25 2008/03/07 17:02:48 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -103,13 +103,28 @@
}
pdo_sqlite_error_stmt(stmt);
return 0;
-
+
+ case PDO_PARAM_INT:
+ case PDO_PARAM_BOOL:
+ if (Z_TYPE_P(param-parameter)
== IS_NULL) {
+ if
(sqlite3_bind_null(S-stmt, param-paramno + 1) == SQLITE_OK) {
+ return 1;
+ }
+ } else {
+
convert_to_long(param-parameter);
+ if (SQLITE_OK ==
sqlite3_bind_int(S-stmt, param-paramno + 1, Z_LVAL_P(param-parameter))) {
+ return 1;
+ }
+ }
+ pdo_sqlite_error_stmt(stmt);
+ return 0;
+
case PDO_PARAM_LOB:
if (Z_TYPE_P(param-parameter)
== IS_RESOURCE) {
php_stream *stm;
php_stream_from_zval_no_verify(stm, param-parameter);
if (stm) {
-
SEPARATE_ZVAL_IF_NOT_REF(param-parameter);
+
SEPARATE_ZVAL(param-parameter);
Z_TYPE_P(param-parameter) = IS_STRING;
Z_STRLEN_P(param-parameter) = php_stream_copy_to_mem(stm,
Z_STRVAL_P(param-parameter), PHP_STREAM_COPY_ALL, 0);
@@ -117,9 +132,25 @@
pdo_raise_impl_error(stmt-dbh, stmt, HY105, Expected a stream resource
TSRMLS_CC);
return 0;
}
+ } else if
(Z_TYPE_P(param-parameter) == IS_NULL) {
+ if
(sqlite3_bind_null(S-stmt, param-paramno + 1) == SQLITE_OK) {
+ return 1;
+ }
+
pdo_sqlite_error_stmt(stmt);
+ return 0;
+ } else {
+
convert_to_string(param-parameter);
}
- /* fall through */
-
+
+ if (SQLITE_OK ==
sqlite3_bind_blob(S-stmt, param-paramno + 1,
+
Z_STRVAL_P(param-parameter),
+
Z_STRLEN_P(param-parameter),
+ SQLITE_STATIC))
{
+ return 1;
+
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
scottmacFri Mar 7 17:17:00 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.125r2=1.2027.2.547.2.965.2.126diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.125 php-src/NEWS:1.2027.2.547.2.965.2.126 --- php-src/NEWS:1.2027.2.547.2.965.2.125 Fri Mar 7 14:40:08 2008 +++ php-src/NEWSFri Mar 7 17:17:00 2008 @@ -152,6 +152,8 @@ - Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran) - Fixed bug #42548 (mysqli PROCEDURE calls can't return result sets). (hartmut) - Fixed bug #42509 (gmp leaks memory when gmp_init() not used). (Stas) +- Fixed bug #42443 (PDO SQLite driver binds integers and booleans as strings). + (Scott) - Fixed bug #42284 (duplicate of #39700). (Lars W) - Fixed bug #42190 (Constructing DateTime with TimeZone Indicator invalidates DateTimeZone). (Derick) @@ -160,6 +162,8 @@ - Fixed bug #41599 (setTime() fails after modify() is used). (Derick) - Fixed bug #41522 (PDO firebird driver returns null if it fails to connect). (Lars W) +- Fixed bug #41135 (PDO SQLite driver binds blobs as strings, + use sqlite3_bind_blob() to stop errors with null bytes). (Scott) - Fixed bug #41069 (OCI8: Seg fault with query over DB link) (Chris Jones) - Fixed bug #39822 (new PDO() doesn't work with firebird). (Lars W) - Fixed bug #39700 (NUMERIC error when result precision are 7,8 or 12-14 ). -- 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/exif exif.c
pajoye Fri Mar 7 18:41:02 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/exif exif.c
Log:
- #44355, compilation breaks due illegal const usage (Guenter Knauf)
I suppose it must break on other platform, it is not used anywhere else
but here, and it was introduced after 5.2.5 (why no news)
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.23r2=1.173.2.5.2.24diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.23
php-src/ext/exif/exif.c:1.173.2.5.2.24
--- php-src/ext/exif/exif.c:1.173.2.5.2.23 Mon Dec 31 07:20:06 2007
+++ php-src/ext/exif/exif.c Fri Mar 7 18:41:02 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.173.2.5.2.23 2007/12/31 07:20:06 sebastian Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.24 2008/03/07 18:41:02 pajoye Exp $ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.23 2007/12/31 07:20:06
sebastian Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.24 2008/03/07 18:41:02
pajoye Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -242,7 +242,7 @@
/* }}} */
/* {{{ exif dependencies */
-static const zend_module_dep exif_module_deps[] = {
+static zend_module_dep exif_module_deps[] = {
ZEND_MOD_REQUIRED(standard)
#if EXIF_USE_MBSTRING
ZEND_MOD_REQUIRED(mbstring)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/exif exif.c
pajoye Fri Mar 7 18:41:59 2008 UTC
Modified files:
/php-src/ext/exif exif.c
Log:
- MFB: #44355 compilation breaks due illegal const usage
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.199r2=1.200diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.199 php-src/ext/exif/exif.c:1.200
--- php-src/ext/exif/exif.c:1.199 Mon Dec 31 07:12:09 2007
+++ php-src/ext/exif/exif.c Fri Mar 7 18:41:59 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.199 2007/12/31 07:12:09 sebastian Exp $ */
+/* $Id: exif.c,v 1.200 2008/03/07 18:41:59 pajoye Exp $ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.199 2007/12/31 07:12:09 sebastian
Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.200 2008/03/07 18:41:59 pajoye Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -242,7 +242,7 @@
/* }}} */
/* {{{ exif dependencies */
-static const zend_module_dep exif_module_deps[] = {
+static zend_module_dep exif_module_deps[] = {
ZEND_MOD_REQUIRED(standard)
#if EXIF_USE_MBSTRING
ZEND_MOD_REQUIRED(mbstring)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli/tests 018.phpt 019.phpt 020.phpt
johannesFri Mar 7 21:32:53 2008 UTC
Added files:
/php-src/sapi/cli/tests 018.phpt 019.phpt 020.phpt
Log:
- New tests
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/018.phpt?view=markuprev=1.1
Index: php-src/sapi/cli/tests/018.phpt
+++ php-src/sapi/cli/tests/018.phpt
--TEST--
CLI php -m
--SKIPIF--
?php
include skipif.inc;
if (substr(PHP_OS, 0, 3) == 'WIN') {
die (skip not for Windows);
}
?
--FILE--
?php
$php = getenv('TEST_PHP_EXECUTABLE');
echo `$php -n -m`;
echo Done\n;
?
--EXPECTF--
[PHP Modules]
%a
standard
%a
[Zend Modules]
%aDone
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/019.phpt?view=markuprev=1.1
Index: php-src/sapi/cli/tests/019.phpt
+++ php-src/sapi/cli/tests/019.phpt
--TEST--
CLI php -i
--SKIPIF--
?php
include skipif.inc;
if (substr(PHP_OS, 0, 3) == 'WIN') {
die (skip not for Windows);
}
?
--FILE--
?php
$php = getenv('TEST_PHP_EXECUTABLE');
echo `$php -n -i`;
echo \nDone\n;
?
--EXPECTF--
phpinfo()
PHP Version = %s
%a
PHP License
This program is free software; you can redistribute it and/or modify
it under the terms of the PHP License as published by the PHP Group
and included in the distribution in the file: LICENSE
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
If you did not receive a copy of the PHP license, or have any
questions about PHP licensing, please contact [EMAIL PROTECTED]
Done
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/020.phpt?view=markuprev=1.1
Index: php-src/sapi/cli/tests/020.phpt
+++ php-src/sapi/cli/tests/020.phpt
--TEST--
CLI php --ri
--SKIPIF--
?php
include skipif.inc;
if (substr(PHP_OS, 0, 3) == 'WIN') {
die (skip not for Windows);
}
?
--FILE--
?php
$php = getenv('TEST_PHP_EXECUTABLE');
echo `$php -n --ri this_extension_does_not_exist_568537753423`;
echo `$php -n --ri standard`;
echo \nDone\n;
?
--EXPECTF--
Extension 'this_extension_does_not_exist_568537753423' not present.
standard
%a
Directive = Local Value = Master Value
%a
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) /sapi/cli/tests 018.phpt 019.phpt 020.phpt
johannesFri Mar 7 21:33:17 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/sapi/cli/tests 018.phpt 019.phpt 020.phpt
Log:
- MFH: New tests
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/018.phpt?view=markuprev=1.1
Index: php-src/sapi/cli/tests/018.phpt
+++ php-src/sapi/cli/tests/018.phpt
--TEST--
CLI php -m
--SKIPIF--
?php
include skipif.inc;
if (substr(PHP_OS, 0, 3) == 'WIN') {
die (skip not for Windows);
}
?
--FILE--
?php
$php = getenv('TEST_PHP_EXECUTABLE');
echo `$php -n -m`;
echo Done\n;
?
--EXPECTF--
[PHP Modules]
%a
standard
%a
[Zend Modules]
%aDone
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/019.phpt?view=markuprev=1.1
Index: php-src/sapi/cli/tests/019.phpt
+++ php-src/sapi/cli/tests/019.phpt
--TEST--
CLI php -i
--SKIPIF--
?php
include skipif.inc;
if (substr(PHP_OS, 0, 3) == 'WIN') {
die (skip not for Windows);
}
?
--FILE--
?php
$php = getenv('TEST_PHP_EXECUTABLE');
echo `$php -n -i`;
echo \nDone\n;
?
--EXPECTF--
phpinfo()
PHP Version = %s
%a
PHP License
This program is free software; you can redistribute it and/or modify
it under the terms of the PHP License as published by the PHP Group
and included in the distribution in the file: LICENSE
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
If you did not receive a copy of the PHP license, or have any
questions about PHP licensing, please contact [EMAIL PROTECTED]
Done
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/020.phpt?view=markuprev=1.1
Index: php-src/sapi/cli/tests/020.phpt
+++ php-src/sapi/cli/tests/020.phpt
--TEST--
CLI php --ri
--SKIPIF--
?php
include skipif.inc;
if (substr(PHP_OS, 0, 3) == 'WIN') {
die (skip not for Windows);
}
?
--FILE--
?php
$php = getenv('TEST_PHP_EXECUTABLE');
echo `$php -n --ri this_extension_does_not_exist_568537753423`;
echo `$php -n --ri standard`;
echo \nDone\n;
?
--EXPECTF--
Extension 'this_extension_does_not_exist_568537753423' not present.
standard
%a
Directive = Local Value = Master Value
%a
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session mod_user.c mod_user.h php_session.h session.c /ext/session/tests bug32330.phpt
gwynne Fri Mar 7 23:20:15 2008 UTC
Added files:
/php-src/ext/session/tests bug32330.phpt
Modified files:
/php-src/ext/sessionmod_user.c mod_user.h php_session.h session.c
Log:
Fix bug #32330 (session_destroy, Failed to initialize storage module,
custom session handler)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_user.c?r1=1.34r2=1.35diff_format=u
Index: php-src/ext/session/mod_user.c
diff -u php-src/ext/session/mod_user.c:1.34 php-src/ext/session/mod_user.c:1.35
--- php-src/ext/session/mod_user.c:1.34 Mon Dec 31 07:12:14 2007
+++ php-src/ext/session/mod_user.c Fri Mar 7 23:20:15 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mod_user.c,v 1.34 2007/12/31 07:12:14 sebastian Exp $ */
+/* $Id: mod_user.c,v 1.35 2008/03/07 23:20:15 gwynne Exp $ */
#include php.h
#include php_session.h
@@ -65,13 +65,16 @@
return retval;
}
-#define STDVARS\
+#define STDVARS1 \
zval *retval; \
- int ret = FAILURE; \
- ps_user *mdata = PS_GET_MOD_DATA(); \
+ int ret = FAILURE
+
+#define STDVARS
\
+ STDVARS1;
\
+ char *mdata = PS_GET_MOD_DATA();\
if (!mdata) { return FAILURE; }
-#define PSF(a) mdata-name.ps_##a
+#define PSF(a) PS(mod_user_names).name.ps_##a
#define FINISH
\
if (retval) { \
@@ -84,29 +87,32 @@
PS_OPEN_FUNC(user)
{
zval *args[2];
- STDVARS;
+ static char dummy = 0;
+ STDVARS1;
SESS_ZVAL_STRING((char*)save_path, args[0]);
SESS_ZVAL_STRING((char*)session_name, args[1]);
retval = ps_call_handler(PSF(open), 2, args TSRMLS_CC);
+ if (retval) {
+ /* This is necessary to fool the session module. Yes, it's safe
to
+* use a static. Neither mod_user nor the session module itself
will
+* ever touch this pointer. It could be set to 0xDEADBEEF for
all the
+* difference it makes, but for the sake of paranoia it's set
to some
+* valid value.
+ */
+ PS_SET_MOD_DATA(dummy);
+ }
FINISH;
}
PS_CLOSE_FUNC(user)
{
- int i;
- STDVARS;
+ STDVARS1;
retval = ps_call_handler(PSF(close), 0, NULL TSRMLS_CC);
- for (i = 0; i 6; i++) {
- zval_ptr_dtor(mdata-names[i]);
- }
-
- efree(mdata);
-
PS_SET_MOD_DATA(NULL);
FINISH;
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_user.h?r1=1.17r2=1.18diff_format=u
Index: php-src/ext/session/mod_user.h
diff -u php-src/ext/session/mod_user.h:1.17 php-src/ext/session/mod_user.h:1.18
--- php-src/ext/session/mod_user.h:1.17 Mon Dec 31 07:12:14 2007
+++ php-src/ext/session/mod_user.h Fri Mar 7 23:20:15 2008
@@ -16,23 +16,11 @@
+--+
*/
-/* $Id: mod_user.h,v 1.17 2007/12/31 07:12:14 sebastian Exp $ */
+/* $Id: mod_user.h,v 1.18 2008/03/07 23:20:15 gwynne Exp $ */
#ifndef MOD_USER_H
#define MOD_USER_H
-typedef union {
- zval *names[6];
- struct {
- zval *ps_open;
- zval *ps_close;
- zval *ps_read;
- zval *ps_write;
- zval *ps_destroy;
- zval *ps_gc;
- } name;
-} ps_user;
-
extern ps_module ps_mod_user;
#define ps_user_ptr ps_mod_user
http://cvs.php.net/viewvc.cgi/php-src/ext/session/php_session.h?r1=1.115r2=1.116diff_format=u
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.115
php-src/ext/session/php_session.h:1.116
--- php-src/ext/session/php_session.h:1.115 Mon Dec 31 07:12:14 2007
+++ php-src/ext/session/php_session.h Fri Mar 7 23:20:15 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_session.h,v 1.115 2007/12/31 07:12:14 sebastian Exp $ */
+/* $Id: php_session.h,v 1.116 2008/03/07 23:20:15 gwynne Exp $ */
#ifndef PHP_SESSION_H
#define PHP_SESSION_H
@@ -116,6 +116,17 @@
long gc_maxlifetime;
int module_number;
long cache_expire;
+ union {
+ zval *names[6];
+ struct {
+ zval *ps_open;
+ zval *ps_close;
+ zval *ps_read;
+ zval *ps_write;
+ zval
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session mod_user.c mod_user.h php_session.h session.c
gwynne Fri Mar 7 23:20:32 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sessionmod_user.c mod_user.h php_session.h session.c
Log:
MFH: fix bug #32330 (session_destroy, Failed to initialize storage module,
custom session handler)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_user.c?r1=1.29.2.1.2.1.2.1r2=1.29.2.1.2.1.2.2diff_format=u
Index: php-src/ext/session/mod_user.c
diff -u php-src/ext/session/mod_user.c:1.29.2.1.2.1.2.1
php-src/ext/session/mod_user.c:1.29.2.1.2.1.2.2
--- php-src/ext/session/mod_user.c:1.29.2.1.2.1.2.1 Mon Dec 31 07:17:13 2007
+++ php-src/ext/session/mod_user.c Fri Mar 7 23:20:32 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mod_user.c,v 1.29.2.1.2.1.2.1 2007/12/31 07:17:13 sebastian Exp $ */
+/* $Id: mod_user.c,v 1.29.2.1.2.1.2.2 2008/03/07 23:20:32 gwynne Exp $ */
#include php.h
#include php_session.h
@@ -70,14 +70,17 @@
return retval;
}
-#define STDVARS\
+#define STDVARS1 \
zval *retval; \
- int ret = FAILURE; \
- ps_user *mdata = PS_GET_MOD_DATA(); \
+ int ret = FAILURE
+
+#define STDVARS
\
+ STDVARS1;
\
+ char *mdata = PS_GET_MOD_DATA();\
if (!mdata) \
return FAILURE
-#define PSF(a) mdata-name.ps_##a
+#define PSF(a) PS(mod_user_names).name.ps_##a
#define FINISH
\
if (retval) { \
@@ -90,27 +93,32 @@
PS_OPEN_FUNC(user)
{
zval *args[2];
- STDVARS;
+ static char dummy = 0;
+ STDVARS1;
SESS_ZVAL_STRING(save_path, args[0]);
SESS_ZVAL_STRING(session_name, args[1]);
retval = ps_call_handler(PSF(open), 2, args TSRMLS_CC);
+ if (retval) {
+ /* This is necessary to fool the session module. Yes, it's safe
to
+* use a static. Neither mod_user nor the session module itself
will
+* ever touch this pointer. It could be set to 0xDEADBEEF for
all the
+* difference it makes, but for the sake of paranoia it's set
to some
+* valid value.
+ */
+ PS_SET_MOD_DATA(dummy);
+ }
FINISH;
}
PS_CLOSE_FUNC(user)
{
- int i;
- STDVARS;
+ STDVARS1;
retval = ps_call_handler(PSF(close), 0, NULL TSRMLS_CC);
- for (i = 0; i 6; i++)
- zval_ptr_dtor(mdata-names[i]);
- efree(mdata);
-
PS_SET_MOD_DATA(NULL);
FINISH;
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_user.h?r1=1.14.2.1.2.1.2.1r2=1.14.2.1.2.1.2.2diff_format=u
Index: php-src/ext/session/mod_user.h
diff -u php-src/ext/session/mod_user.h:1.14.2.1.2.1.2.1
php-src/ext/session/mod_user.h:1.14.2.1.2.1.2.2
--- php-src/ext/session/mod_user.h:1.14.2.1.2.1.2.1 Mon Dec 31 07:17:13 2007
+++ php-src/ext/session/mod_user.h Fri Mar 7 23:20:32 2008
@@ -16,23 +16,11 @@
+--+
*/
-/* $Id: mod_user.h,v 1.14.2.1.2.1.2.1 2007/12/31 07:17:13 sebastian Exp $ */
+/* $Id: mod_user.h,v 1.14.2.1.2.1.2.2 2008/03/07 23:20:32 gwynne Exp $ */
#ifndef MOD_USER_H
#define MOD_USER_H
-typedef union {
- zval *names[6];
- struct {
- zval *ps_open;
- zval *ps_close;
- zval *ps_read;
- zval *ps_write;
- zval *ps_destroy;
- zval *ps_gc;
- } name;
-} ps_user;
-
extern ps_module ps_mod_user;
#define ps_user_ptr ps_mod_user
http://cvs.php.net/viewvc.cgi/php-src/ext/session/php_session.h?r1=1.101.2.2.2.5.2.1r2=1.101.2.2.2.5.2.2diff_format=u
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.101.2.2.2.5.2.1
php-src/ext/session/php_session.h:1.101.2.2.2.5.2.2
--- php-src/ext/session/php_session.h:1.101.2.2.2.5.2.1 Mon Dec 31 07:17:13 2007
+++ php-src/ext/session/php_session.h Fri Mar 7 23:20:32 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_session.h,v 1.101.2.2.2.5.2.1 2007/12/31 07:17:13 sebastian Exp $
*/
+/* $Id: php_session.h,v 1.101.2.2.2.5.2.2 2008/03/07 23:20:32 gwynne Exp $ */
#ifndef PHP_SESSION_H
#define PHP_SESSION_H
@@ -112,6 +112,17 @@
long gc_maxlifetime;
int module_number;
long cache_expire;
+ union {
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session/tests bug32330.phpt
gwynne Fri Mar 7 23:20:54 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/session/tests bug32330.phpt
Log:
Forgot one file in last commit
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/bug32330.phpt?view=markuprev=1.1
Index: php-src/ext/session/tests/bug32330.phpt
+++ php-src/ext/session/tests/bug32330.phpt
--TEST--
Bug #32330 (session_destroy, Failed to initialize storage module, custom
session handler)
--SKIPIF--
?php include('skipif.inc'); ?
--INI--
session.use_trans_sid=0
session.use_cookies=1
session.name=sid
session.save_path=/
session.gc_probability=1
session.gc_divisor=1
--FILE--
?php
error_reporting(E_ALL);
function sOpen($path, $name)
{
echo open: path = {$path}, name = {$name}\n;
return TRUE;
}
function sClose()
{
echo close\n;
return TRUE;
}
function sRead($id)
{
echo read: id = {$id}\n;
return '';
}
function sWrite($id, $data)
{
echo write: id = {$id}, data = {$data}\n;
return TRUE;
}
function sDestroy($id)
{
echo destroy: id = {$id}\n;
return TRUE;
}
function sGC($maxlifetime)
{
echo gc: maxlifetime = {$maxlifetime}\n;
return TRUE;
}
session_set_save_handler( 'sOpen', 'sClose', 'sRead', 'sWrite', 'sDestroy',
'sGC' );
// without output buffering, the debug messages will cause all manner of
warnings
ob_start();
session_start();
$_SESSION['A'] = 'B';
session_write_close();
session_start();
$_SESSION['C'] = 'D';
session_destroy();
session_start();
$_SESSION['E'] = 'F';
// Don't try to destroy this time!
?
--EXPECTF--
open: path = /, name = sid
read: id = %s
gc: maxlifetime = %d
write: id = %s, data = A|S:1:B;
close
open: path = /, name = sid
read: id = %s
gc: maxlifetime = %d
destroy: id = %s
close
open: path = /, name = sid
read: id = %s
gc: maxlifetime = %d
write: id = %s, data = E|S:1:F;
close
--UEXPECTF--
open: path = /, name = sid
read: id = %s
gc: maxlifetime = %d
write: id = %s, data = A|U:1:B;
close
open: path = /, name = sid
read: id = %s
gc: maxlifetime = %d
destroy: id = %s
close
open: path = /, name = sid
read: id = %s
gc: maxlifetime = %d
write: id = %s, data = E|U:1:F;
close
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
scottmacSat Mar 8 04:17:30 2008 UTC
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Fixed bug #42203 (Clear SQLite result sets before closing database.)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.206r2=1.207diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.206 php-src/ext/sqlite/sqlite.c:1.207
--- php-src/ext/sqlite/sqlite.c:1.206 Thu Feb 28 14:16:14 2008
+++ php-src/ext/sqlite/sqlite.c Sat Mar 8 04:17:30 2008
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.206 2008/02/28 14:16:14 felipe Exp $
+ $Id: sqlite.c,v 1.207 2008/03/08 04:17:30 scottmac Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -449,6 +449,17 @@
efree(res);
}
+static int _clean_unfinished_results(zend_rsrc_list_entry *le, void *db
TSRMLS_DC)
+{
+ if (Z_TYPE_P(le) == le_sqlite_result) {
+ struct php_sqlite_result *res = (struct php_sqlite_result
*)le-ptr;
+ if (res-db-rsrc_id == ((struct php_sqlite_db*)db)-rsrc_id) {
+ real_result_dtor(res TSRMLS_CC);
+ }
+ }
+ return 0;
+}
+
static ZEND_RSRC_DTOR_FUNC(php_sqlite_result_dtor)
{
struct php_sqlite_result *res = (struct php_sqlite_result *)rsrc-ptr;
@@ -1220,7 +1231,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.206 2008/02/28 14:16:14 felipe
Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.207 2008/03/08 04:17:30 scottmac
Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1515,6 +1526,10 @@
DB_FROM_ZVAL(db, zdb);
}
+ zend_hash_apply_with_argument(EG(regular_list),
+ (apply_func_arg_t) _clean_unfinished_results,
+ db TSRMLS_CC);
+
zend_list_delete(Z_RESVAL_P(zdb));
}
/* }}} */
--
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/sqlite sqlite.c
scottmacSat Mar 8 04:18:30 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite sqlite.c
Log:
MFB: Fixed bug #42203 (Clear SQLite result sets before closing database.)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.9.2.3r2=1.166.2.13.2.9.2.4diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.3
php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.4
--- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.3 Mon Dec 31 07:17:14 2007
+++ php-src/ext/sqlite/sqlite.c Sat Mar 8 04:18:29 2008
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.166.2.13.2.9.2.3 2007/12/31 07:17:14 sebastian Exp $
+ $Id: sqlite.c,v 1.166.2.13.2.9.2.4 2008/03/08 04:18:29 scottmac Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -403,6 +403,17 @@
efree(res);
}
+static int _clean_unfinished_results(zend_rsrc_list_entry *le, void *db
TSRMLS_DC)
+{
+ if (Z_TYPE_P(le) == le_sqlite_result) {
+ struct php_sqlite_result *res = (struct php_sqlite_result
*)le-ptr;
+ if (res-db-rsrc_id == ((struct php_sqlite_db*)db)-rsrc_id) {
+ real_result_dtor(res TSRMLS_CC);
+ }
+ }
+ return 0;
+}
+
static ZEND_RSRC_DTOR_FUNC(php_sqlite_result_dtor)
{
struct php_sqlite_result *res = (struct php_sqlite_result *)rsrc-ptr;
@@ -1128,7 +1139,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.13.2.9.2.3 2007/12/31
07:17:14 sebastian Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.13.2.9.2.4 2008/03/08
04:18:29 scottmac Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1423,6 +1434,10 @@
DB_FROM_ZVAL(db, zdb);
}
+ zend_hash_apply_with_argument(EG(regular_list),
+ (apply_func_arg_t) _clean_unfinished_results,
+ db TSRMLS_CC);
+
zend_list_delete(Z_RESVAL_P(zdb));
}
/* }}} */
--
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) / NEWS
scottmacSat Mar 8 04:20:03 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.126r2=1.2027.2.547.2.965.2.127diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.126 php-src/NEWS:1.2027.2.547.2.965.2.127 --- php-src/NEWS:1.2027.2.547.2.965.2.126 Fri Mar 7 17:17:00 2008 +++ php-src/NEWSSat Mar 8 04:20:02 2008 @@ -155,6 +155,7 @@ - Fixed bug #42443 (PDO SQLite driver binds integers and booleans as strings). (Scott) - Fixed bug #42284 (duplicate of #39700). (Lars W) +- Fixed bug #42203 (Clear SQLite result sets before closing database). (Scott) - Fixed bug #42190 (Constructing DateTime with TimeZone Indicator invalidates DateTimeZone). (Derick) - Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
