[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri May 8 01:33:04 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3396r2=1.3397diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3396 php-src/ChangeLog:1.3397 --- php-src/ChangeLog:1.3396Thu May 7 01:32:55 2009 +++ php-src/ChangeLog Fri May 8 01:33:03 2009 @@ -1,3 +1,119 @@ +2009-05-07 Matteo Beccati mat...@beccati.com + +* (PHP_5_3) + NEWS + ext/pdo_sqlite/sqlite_statement.c: + MFH + - Fixed bug #48185 removing no-op code + +* ext/pdo_sqlite/sqlite_statement.c: + - Fixed bug #48185 removing no-op code + +2009-05-07 Felipe Pena felipe...@gmail.com + +* ext/sqlite3/sqlite3.c + ext/sqlite3/sqlite3.c: + - Fix build + +2009-05-07 Scott MacVicar sc...@macvicar.net + +* (PHP_5_3) + NEWS + NEWS: + BFN + +* ext/sqlite3/sqlite3.c: + MFB Print warning when using loadExtension on non cli, cgi and embeded + +* ext/sqlite3/sqlite3.c: + Some unicode updates for sqlite3 + +* (PHP_5_3) + ext/sqlite3/sqlite3.c: + Print warning when using loadExtension on non cli, cgi and embeded + +2009-05-07 Jani Taskinen jani.taski...@sci.fi + +* tests/lang/bug45392.phpt: + - Missed one line + +* (PHP_5_2) + NEWS + tests/lang/bug45392.phpt: + - Bug 45392 was never fixed in PHP_5_2 + +* tests/lang/bug45392.phpt: + - Fix test to actually test for the bug + +2009-05-07 Ilia Alshanetsky i...@prohost.org + +* ext/sqlite3/libsqlite/sqlite3.c: + MFB: fixed compiler warning + +* (PHP_5_3) + ext/sqlite3/libsqlite/sqlite3.c: + + Fixed compiler warning + +2009-05-07 Felipe Pena felipe...@gmail.com + +* ZendEngine2/tests/bug47714.phpt + ZendEngine2/tests/bug47714.phpt: + - Missing title + +* (PHP_5_3) + ZendEngine2/zend_builtin_functions.c + ZendEngine2/tests/017.phpt: + - MFH: Parameter parsing changes for get_defined_constants() (Kalle) + +2009-05-07 Scott MacVicar sc...@macvicar.net + +* ext/sqlite3/libsqlite/sqlite3.c + ext/sqlite3/libsqlite/sqlite3.h + ext/sqlite3/libsqlite/sqlite3ext.h: + Update bundled libsqlite to 3.6.14 + +2009-05-07 Zoe Slattery zoe.slatt...@googlemail.com + +* scripts/dev/generate-phpt.phar + scripts/dev/generate-phpt.phar + scripts/dev/generate_phpt.php: + + file generate-phpt.phar was initially added on branch PHP_5_3. + +2009-05-07 Hannes Magnusson hannes.magnus...@gmail.com + +* ext/standard/tests/misc/browsernames.inc + ext/standard/tests/misc/browsernames.php + ext/standard/tests/misc/get_browser_basic.phpt + ext/standard/tests/misc/get_browser_error.phpt + ext/standard/tests/misc/get_browser_variation1.phpt: + MFB5.3: Fix tests + +* ext/standard/tests/misc/browsernames.inc + ext/standard/tests/misc/browsernames.inc + ext/standard/tests/misc/browsernames.php + ext/standard/tests/misc/get_browser_basic.phpt + ext/standard/tests/misc/get_browser_error.phpt + ext/standard/tests/misc/get_browser_variation1.phpt: + + file browsernames.inc was initially added on branch PHP_5_3. + +2009-05-07 Kalle Sommer Nielsen kalle@gmail.com + +* (PHP_5_3) + UPGRADING: + use have been a keyword in a forever, thanks Greg + +* (PHP_5_3) + UPGRADING: + Windows ME is not supported either as of 5.3 + +* (PHP_5_3) + UPGRADING: + - use is a reserved keyword + * notes to Windows section + 2009-05-06 Jani Taskinen jani.taski...@sci.fi * (PHP_5_3) @@ -38685,7 +38801,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3396 2009/05/07 01:32:55 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3397 2009/05/08 01:33:03 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src /ext/standard/tests/misc browsernames.inc browsernames.php get_browser_basic.phpt get_browser_error.phpt get_browser_variation1.phpt
bjori Thu May 7 08:09:36 2009 UTC Removed files: /php-src/ext/standard/tests/miscbrowsernames.php Modified files: /php-src/ext/standard/tests/miscbrowsernames.inc get_browser_basic.phpt get_browser_error.phpt get_browser_variation1.phpt Log: MFB5.3: Fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/browsernames.inc?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/misc/browsernames.inc diff -u /dev/null php-src/ext/standard/tests/misc/browsernames.inc:1.2 --- /dev/null Thu May 7 08:09:36 2009 +++ php-src/ext/standard/tests/misc/browsernames.incThu May 7 08:09:36 2009 @@ -0,0 +1,51 @@ +?php + +/** + * Common browser names. Used with: get_browser() +*/ +return array( + Opera/7.11 (Windows NT 5.1; U) [en], + Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 5.0) Opera 7.02 Bork-edition [en], + Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 4.0) Opera 7.0 [en], + Mozilla/4.0 (compatible; MSIE 5.0; Windows 2000) Opera 6.0 [en], + Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC) Opera 5.0 [en], + Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) Opera 8.60 [en], + Opera/9.00 (Windows NT 5.1; U; en), + Opera/9.26 (Macintosh; PPC Mac OS X; U; en), + + Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; Q312461), + Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.0.3705), + Mozilla/4.0 (compatible; MSIE 5.22; Mac_PowerPC), + Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC; e504460WanadooNL), + Mozilla/4.0 (Mozilla/4.0; MSIE 7.0; Windows NT 5.1; FDM; SV1; .NET CLR 3.0.04506.30), + Mozilla/4.0 (Mozilla/4.0; MSIE 7.0; Windows NT 5.1; FDM; SV1), + Mozilla/4.0 (compatible;MSIE 7.0;Windows NT 6.0), + + Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/74 (KHTML, like Gecko) Safari/74, + Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/51 (like Gecko) Safari/51, + Mozilla/5.0 (Windows; U; Windows NT 6.0; en) AppleWebKit/522.11.3 (KHTML, like Gecko) Version/3.0 Safari/522.11.3, + Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1C28 Safari/419.3, + Mozilla/5.0 (iPod; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/3A100a Safari/419.3, + Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_4_11; ru-ru) AppleWebKit/525.18 (KHTML, like Gecko) Version/3.1.1 Safari/525.18, + Mozilla/5.0 (Windows; U; Windows NT 5.1; en) AppleWebKit/526.9 (KHTML, like Gecko) Version/4.0dp1 Safari/526.8, + Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en; rv:1.8.1.12) Gecko/20080206 Camino/1.5.5, + + Mozilla/5.0 (compatible; Konqueror/3.1; Linux; X11; i686), + Mozilla/5.0 (compatible; Konqueror/3.1; Linux 2.4.19-32mdkenterprise; X11; i686; ar, en_US), + Mozilla/5.0 (compatible; Konqueror/2.1.1; X11), + + Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.4b) Gecko/20030504 Mozilla, + Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.2a) Gecko/20020910, + Mozilla/5.0 (X11; U; Linux 2.4.3-20mdk i586; en-US; rv:0.9.1) Gecko/20010611, + Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.9) Gecko/20050711, + Mozilla/5.0 (Windows; U; Windows NT 5.1; cs; rv:1.9) Gecko/2008052906, + + Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.3a) Gecko/20021207 Phoenix/0.5, + Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4b) Gecko/20030516 Mozilla Firebird/0.6, + Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4a) Gecko/20030423 Firebird Browser/0.6, + Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6) Gecko/20040206 Firefox/0.8, + Mozilla/5.0 (Windows 98; U; en; rv:1.8.0) Gecko/20060728 Firefox/1.5.0, + Mozilla/5.0 (Macintosh; PPC Mac OS X; U; en; rv:1.8.0) Gecko/20060728 Firefox/1.5.0, + Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.8.1.12) Gecko/20080210 Firefox/2.0.0.12, + Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.1.12) Gecko/20080214 Firefox/2.0.0.12, +); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/get_browser_basic.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/misc/get_browser_basic.phpt diff -u php-src/ext/standard/tests/misc/get_browser_basic.phpt:1.2 php-src/ext/standard/tests/misc/get_browser_basic.phpt:1.3 --- php-src/ext/standard/tests/misc/get_browser_basic.phpt:1.2 Sat Sep 6 23:20:53 2008 +++ php-src/ext/standard/tests/misc/get_browser_basic.phpt Thu May 7 08:09:36 2009 @@ -25,7 +25,7 @@ * Alias to functions: */ -$browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'browsernames.php'; +$browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR .
[PHP-CVS] cvs: php-src(PHP_5_3) /scripts/dev generate-phpt.phar generate_phpt.php /scripts/dev/generate-phpt build.xml gtPackage.php /scripts/dev/generate-phpt/src generate-phpt.php gtAutoload.php g
zoe Thu May 7 09:21:44 2009 UTC Added files: (Branch: PHP_5_3) /php-src/scripts/dev/generate-phpt/src/texts testTypeNotSpecified.txt help.txt unknownClass.txt functionOrMethodNotSpecified.txt unknownFunction.txt unknownMethod.txt methodNotSpecified.txt /php-src/scripts/dev/generate-phpt/src/testcase gtVariationContainer.php gtBasicTestCaseFunction.php gtBasicTestCase.php gtErrorTestCaseMethod.php gtVariationContainerMethod.php gtBasicTestCaseMethod.php gtErrorTestCaseFunction.php gtErrorTestCase.php gtVariationTestCaseFunction.php gtVariationTestCase.php gtVariationTestCaseMethod.php gtTestCase.php gtVariationContainerFunction.php /php-src/scripts/devgenerate-phpt.phar /php-src/scripts/dev/generate-phpt/src/setup/exceptions gtUnknownSectionException.php gtMissingOptionsException.php gtMissingArgumentException.php gtUnknownOptionException.php /php-src/scripts/dev/generate-phpt/src/setup/preconditions gtIsSpecifiedFunctionOrMethod.php gtIsValidFunction.php gtIsValidMethod.php gtIfClassHasMethod.php gtIsValidClass.php gtIsSpecifiedTestType.php /php-src/scripts/dev/generate-phpt/tests gtBasicTestCaseMethodTest.php gtIsSpecifiedTestTypeTest.php gtIsValidMethodTest.php gtFunctionTest.php gtErrorTestCaseFunctionTest.php gtVariationTestCaseFunctionTest.php gtVariationTestCaseMethodTest.php gtCommandLineOptionsTest.php gtIfClassHasMethodTest.php gtIsSpecifiedFunctionOrMethodTest.php gtBasicTestCaseFunctionTest.php gtIsValidFunctionTest.php gtCodeSnippetTest.php gtMethodTest.php gtIsValidClassTest.php gtErrorTestCaseMethodTest.php gtOptionalSectionsTest.php /php-src/scripts/dev/generate-phpt/src gtText.php gtCodeSnippet.php gtClassMap.php generate-phpt.php gtFunction.php gtMethod.php gtTestCaseWriter.php gtTestSubject.php gtAutoload.php /php-src/scripts/dev/generate-phpt/src/codeSnippets commentEnd.txt array.txt
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
scottmacThu May 7 11:29:32 2009 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.588r2=1.2027.2.547.2.965.2.589diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.588 php-src/NEWS:1.2027.2.547.2.965.2.589 --- php-src/NEWS:1.2027.2.547.2.965.2.588 Wed May 6 18:57:45 2009 +++ php-src/NEWSThu May 7 11:29:32 2009 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.3.0 RC 3 +- Upgraded bundled sqlite to version 3.6.14. (Scott) 07 May 2009, PHP 5.3.0 RC 2 - Upgraded bundled sqlite to version 3.6.13. (Ilia) -- 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/sqlite3/libsqlite sqlite3.c
iliaa Thu May 7 12:40:05 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3/libsqlite sqlite3.c Log: Fixed compiler warning http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.20r2=1.1.2.21diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.20 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.21 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.20Thu May 7 11:27:22 2009 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Thu May 7 12:39:26 2009 @@ -45,7 +45,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -74,7 +74,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ /* @@ -532,7 +532,7 @@ ** the version number) and changes its name to sqlite3.h as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -6052,7 +6052,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -6635,7 +6635,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -6867,7 +6867,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -7259,7 +7259,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ #ifndef _PAGER_H_ @@ -7427,7 +7427,7 @@ ** This header file defines the interface that the sqlite page cache ** subsystem. ** -** @(#) $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ #ifndef _PCACHE_H_ @@ -7595,7 +7595,7 @@ ** This header file is #include-ed by sqliteInt.h and thus ends up ** being included by every source file. ** -** $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ #ifndef _SQLITE_OS_H_ #define _SQLITE_OS_H_ @@ -7655,6 +7655,7 @@ # define SQLITE_OS_WINCE 0 #endif +#include ctype.h /* ** Define the maximum size of a temporary filename @@ -7870,7 +7871,7 @@ ** Source files should #include the sqliteInt.h file and let that file ** include this one indirectly. ** -** $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ @@ -10184,7 +10185,7 @@ ** ** This file contains definitions of global variables and contants. ** -** $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ @@ -10377,7 +10378,7 @@ ** This module implements the sqlite3_status() interface and related ** functionality. ** -** $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ /* @@ -10504,7 +10505,7 @@ ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ ** ** SQLite processes all times and dates as Julian Day numbers. The ** dates and times are stored as the number of days since noon @@ -11609,7 +11610,7 @@ ** This file contains OS interface code that is common to all ** architectures. ** -** $Id: sqlite3.c,v 1.1.2.20 2009/05/07 11:27:22 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ */ #define _SQLITE_OS_C_ 1 #undef _SQLITE_OS_C_ @@ -11889,7 +11890,7 @@ **
[PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite sqlite3.c
iliaa Thu May 7 12:41:26 2009 UTC Modified files: /php-src/ext/sqlite3/libsqlite sqlite3.c Log: MFB: fixed compiler warning http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.21r2=1.22diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.21 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.22 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.21Thu May 7 11:24:18 2009 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Thu May 7 12:41:25 2009 @@ -45,7 +45,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -74,7 +74,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ /* @@ -532,7 +532,7 @@ ** the version number) and changes its name to sqlite3.h as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -6052,7 +6052,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -6635,7 +6635,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -6867,7 +6867,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -7259,7 +7259,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ #ifndef _PAGER_H_ @@ -7427,7 +7427,7 @@ ** This header file defines the interface that the sqlite page cache ** subsystem. ** -** @(#) $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ #ifndef _PCACHE_H_ @@ -7595,7 +7595,7 @@ ** This header file is #include-ed by sqliteInt.h and thus ends up ** being included by every source file. ** -** $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ #ifndef _SQLITE_OS_H_ #define _SQLITE_OS_H_ @@ -7655,6 +7655,7 @@ # define SQLITE_OS_WINCE 0 #endif +#include ctype.h /* ** Define the maximum size of a temporary filename @@ -7870,7 +7871,7 @@ ** Source files should #include the sqliteInt.h file and let that file ** include this one indirectly. ** -** $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ @@ -10184,7 +10185,7 @@ ** ** This file contains definitions of global variables and contants. ** -** $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ @@ -10377,7 +10378,7 @@ ** This module implements the sqlite3_status() interface and related ** functionality. ** -** $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ /* @@ -10504,7 +10505,7 @@ ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ ** ** SQLite processes all times and dates as Julian Day numbers. The ** dates and times are stored as the number of days since noon @@ -11609,7 +11610,7 @@ ** This file contains OS interface code that is common to all ** architectures. ** -** $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ #define _SQLITE_OS_C_ 1 #undef _SQLITE_OS_C_ @@ -11889,7 +11890,7 @@ ** * ** -** $Id: sqlite3.c,v 1.21 2009/05/07 11:24:18 scottmac Exp $ +** $Id: sqlite3.c,v 1.22 2009/05/07 12:41:25 iliaa Exp $ */ /* @@
[PHP-CVS] cvs: php-src(PHP_5_3) /scripts/dev/generate-phpt/src/testcase gtBasicTestCase.php gtErrorTestCase.php
zoe Thu May 7 13:26:00 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/scripts/dev/generate-phpt/src/testcase gtErrorTestCase.php
gtBasicTestCase.php
Log:
fixing missing semi-colon
http://cvs.php.net/viewvc.cgi/php-src/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php
diff -u
php-src/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php:1.1.2.1
php-src/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php:1.1.2.2
--- php-src/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php:1.1.2.1
Thu May 7 09:21:42 2009
+++ php-src/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php Thu May
7 13:26:00 2009
@@ -45,7 +45,7 @@
}
public function addErrorEcho() {
-$this-testCase[] = echo \*** Test by calling method or function with
incorrect numbers of arguments ***\\n\;
+$this-testCase[] = echo \*** Test by calling method or function with
incorrect numbers of arguments ***\\n\;;
$this-testCase = gtCodeSnippet::appendBlankLines(1, $this-testCase );
}
}
http://cvs.php.net/viewvc.cgi/php-src/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php
diff -u
php-src/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php:1.1.2.1
php-src/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php:1.1.2.2
--- php-src/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php:1.1.2.1
Thu May 7 09:21:42 2009
+++ php-src/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php Thu May
7 13:26:00 2009
@@ -30,7 +30,7 @@
}
public function addBasicEcho() {
-$this-testCase[] = echo \*** Test by calling method or function with
its expected arguments ***\\n\;
+$this-testCase[] = echo \*** Test by calling method or function with
its expected arguments ***\\n\;;
$this-testCase = gtCodeSnippet::appendBlankLines(1, $this-testCase );
}
}
--
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/sqlite3 sqlite3.c
scottmacThu May 7 16:49:27 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3sqlite3.c
Log:
Print warning when using loadExtension on non cli, cgi and embeded
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.35r2=1.1.2.36diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.35
php-src/ext/sqlite3/sqlite3.c:1.1.2.36
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.35 Mon Apr 27 18:16:46 2009
+++ php-src/ext/sqlite3/sqlite3.c Thu May 7 16:49:26 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.1.2.35 2009/04/27 18:16:46 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.36 2009/05/07 16:49:26 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -308,6 +308,15 @@
return;
}
+#ifdef ZTS
+ if ((strncmp(sapi_module.name, cgi, 3) != 0)
+ (strcmp(sapi_module.name, cli) != 0)
+ (strncmp(sapi_module.name, embed, 5) != 0)
+ ) { php_sqlite3_error(db_obj, Not supported in
multithreaded Web servers);
+ RETURN_FALSE;
+ }
+#endif
+
if (!SQLITE3G(extension_dir)) {
php_sqlite3_error(db_obj, SQLite Extension are disabled);
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 sqlite3.c
scottmacThu May 7 16:50:54 2009 UTC
Modified files:
/php-src/ext/sqlite3sqlite3.c
Log:
Some unicode updates for sqlite3
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.38r2=1.39diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.38 php-src/ext/sqlite3/sqlite3.c:1.39
--- php-src/ext/sqlite3/sqlite3.c:1.38 Mon Apr 27 18:15:54 2009
+++ php-src/ext/sqlite3/sqlite3.c Thu May 7 16:50:54 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.38 2009/04/27 18:15:54 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.39 2009/05/07 16:50:54 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -94,7 +94,8 @@
{
php_sqlite3_db_object *db_obj;
zval *object = getThis();
- char *filename, *encryption_key, *fullpath;
+ zstr filename;
+ char *encryption_key, *fullpath;
zend_uchar filename_type;
int filename_len, encryption_key_len = 0;
long flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
@@ -116,17 +117,17 @@
}
if (filename_type == IS_UNICODE) {
- if (php_stream_path_encode(NULL, filename, filename_len,
(UChar *)filename, filename_len, REPORT_ERRORS, FG(default_context)) ==
FAILURE) {
+ if (php_stream_path_encode(NULL, filename.s, filename_len,
filename.u, filename_len, REPORT_ERRORS, FG(default_context)) == FAILURE) {
zend_throw_exception(zend_exception_get_default(TSRMLS_C), Unable to decode
filepath, 0 TSRMLS_CC);
return;
}
}
- if (strncmp(filename, :memory:, 8) != 0) {
- if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
+ if (strncmp(filename.s, :memory:, 8) != 0) {
+ if (!(fullpath = expand_filepath(filename.s, NULL TSRMLS_CC))) {
zend_throw_exception(zend_exception_get_default(TSRMLS_C), Unable to expand
filepath, 0 TSRMLS_CC);
if (filename_type == IS_UNICODE) {
- efree(filename);
+ efree(filename.s);
}
return;
}
@@ -134,17 +135,17 @@
if (php_check_open_basedir(fullpath TSRMLS_CC)) {
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC,
open_basedir prohibits opening %s, fullpath);
if (filename_type == IS_UNICODE) {
- efree(filename);
+ efree(filename.s);
}
efree(fullpath);
return;
}
} else {
- fullpath = estrdup(filename);
+ fullpath = estrdup(filename.s);
}
if (filename_type == IS_UNICODE) {
- efree(filename);
+ efree(filename.s);
}
#if SQLITE_VERSION_NUMBER = 3005000
@@ -1264,7 +1265,7 @@
}
/* }}} */
-/* {{{ proto bool SQLite3Stmt::bindParam(int parameter_number, mixed parameter
[, int type])
+/* {{{ proto bool SQLite3Stmt::bindParam(mixed parameter_number, mixed
parameter [, int type]) U
Bind Paramater to a stmt variable. */
PHP_METHOD(sqlite3stmt, bindParam)
{
@@ -1295,7 +1296,7 @@
}
/* }}} */
-/* {{{ proto bool SQLite3Stmt::bindValue(inte parameter_number, mixed
parameter [, int type])
+/* {{{ proto bool SQLite3Stmt::bindValue(mixed parameter_number, mixed
parameter [, int type]) U
Bind Value of a parameter to a stmt variable. */
PHP_METHOD(sqlite3stmt, bindValue)
{
@@ -1654,7 +1655,7 @@
}
/* }}} */
-/* {{{ proto int SQLite3Result::__construct()
+/* {{{ proto int SQLite3Result::__construct() U
__constructor for SQLite3Result. */
PHP_METHOD(sqlite3result, __construct)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 sqlite3.c
scottmacThu May 7 16:52:40 2009 UTC
Modified files:
/php-src/ext/sqlite3sqlite3.c
Log:
MFB Print warning when using loadExtension on non cli, cgi and embeded
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.39r2=1.40diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.39 php-src/ext/sqlite3/sqlite3.c:1.40
--- php-src/ext/sqlite3/sqlite3.c:1.39 Thu May 7 16:50:54 2009
+++ php-src/ext/sqlite3/sqlite3.c Thu May 7 16:52:40 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.39 2009/05/07 16:50:54 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.40 2009/05/07 16:52:40 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -324,6 +324,16 @@
return;
}
+#ifdef ZTS
+ if ((strncmp(sapi_module.name, cgi, 3) != 0)
+ (strcmp(sapi_module.name, cli) != 0)
+ (strncmp(sapi_module.name, embed, 5) != 0)
+ ) {
+ php_sqlite3_error(db_obj, Not supported in multithreaded Web
servers);
+ RETURN_FALSE;
+ }
+#endif
+
if (!SQLITE3G(extension_dir)) {
php_sqlite3_error(db_obj, SQLite Extension are disabled);
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
scottmacThu May 7 16:56:19 2009 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.589r2=1.2027.2.547.2.965.2.590diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.589 php-src/NEWS:1.2027.2.547.2.965.2.590 --- php-src/NEWS:1.2027.2.547.2.965.2.589 Thu May 7 11:29:32 2009 +++ php-src/NEWSThu May 7 16:56:18 2009 @@ -3,6 +3,8 @@ ?? ??? 2009, PHP 5.3.0 RC 3 - Upgraded bundled sqlite to version 3.6.14. (Scott) +- Disabled SQLite3::loadExtension for threaded SAPIs. (Scott) + 07 May 2009, PHP 5.3.0 RC 2 - Upgraded bundled sqlite to version 3.6.13. (Ilia) - Upgraded bundled PCRE to version 7.9. (Nuno) -- 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_3) /ext/sqlite3 sqlite3.c
Hi Scott, scottmac Thu May 7 16:49:27 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3 sqlite3.c Log: Print warning when using loadExtension on non cli, cgi and embeded Just did a cvs up of my local PHP_5_3 copy and got a compile failure: /root/compile/php-5.3/ext/sqlite3/sqlite3.c:312: error: `sapi_module' undeclared Adding an #include SAPI.h as suggested by Philip on IRC fixed the issue. Cheers -- M. -- 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/sqlite3 sqlite3.c
felipe Thu May 7 22:42:46 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3sqlite3.c Log: - Fix build http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.36r2=1.1.2.37diff_format=u Index: php-src/ext/sqlite3/sqlite3.c diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.36 php-src/ext/sqlite3/sqlite3.c:1.1.2.37 --- php-src/ext/sqlite3/sqlite3.c:1.1.2.36 Thu May 7 16:49:26 2009 +++ php-src/ext/sqlite3/sqlite3.c Thu May 7 22:42:46 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: sqlite3.c,v 1.1.2.36 2009/05/07 16:49:26 scottmac Exp $ */ +/* $Id: sqlite3.c,v 1.1.2.37 2009/05/07 22:42:46 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -27,6 +27,7 @@ #include ext/standard/info.h #include php_sqlite3.h #include php_sqlite3_structs.h +#include main/SAPI.h #include sqlite3.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 sqlite3.c
felipe Thu May 7 22:44:37 2009 UTC Modified files: /php-src/ext/sqlite3sqlite3.c Log: - Fix build http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.40r2=1.41diff_format=u Index: php-src/ext/sqlite3/sqlite3.c diff -u php-src/ext/sqlite3/sqlite3.c:1.40 php-src/ext/sqlite3/sqlite3.c:1.41 --- php-src/ext/sqlite3/sqlite3.c:1.40 Thu May 7 16:52:40 2009 +++ php-src/ext/sqlite3/sqlite3.c Thu May 7 22:44:37 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: sqlite3.c,v 1.40 2009/05/07 16:52:40 scottmac Exp $ */ +/* $Id: sqlite3.c,v 1.41 2009/05/07 22:44:37 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -28,6 +28,7 @@ #include ext/standard/file.h #include php_sqlite3.h #include php_sqlite3_structs.h +#include main/SAPI.h #include sqlite3.h -- 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
mbeccatiThu May 7 23:04:02 2009 UTC
Modified files:
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
- Fixed bug #48185 removing no-op code
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.31r2=1.32diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.31
php-src/ext/pdo_sqlite/sqlite_statement.c:1.32
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.31 Wed Apr 1 14:34:21 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Thu May 7 23:04:02 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.31 2009/04/01 14:34:21 indeyets Exp $ */
+/* $Id: sqlite_statement.c,v 1.32 2009/05/07 23:04:02 mbeccati Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -265,11 +265,6 @@
case SQLITE3_TEXT:
*ptr = (char*)sqlite3_column_text(S-stmt, colno);
*len = sqlite3_column_bytes(S-stmt, colno);
- if (*len) {
- /* sqlite3.h says the NUL terminator is
included in the byte count
-* for TEXT values */
- *len--;
- }
return 1;
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pdo_sqlite sqlite_statement.c
That's not a NOP code, it actually needed, the length is a pointer to
an integer that is being modified.
Ilia Alshanetsky
On 7-May-09, at 7:04 PM, Matteo Beccati wrote:
mbeccatiThu May 7 23:04:02 2009 UTC
Modified files:
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
- Fixed bug #48185 removing no-op code
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.31r2=1.32diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.31 php-src/ext/
pdo_sqlite/sqlite_statement.c:1.32
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.31 Wed Apr 1
14:34:21 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Thu May 7 23:04:02 2009
@@ -16,7 +16,7 @@
+
--+
*/
-/* $Id: sqlite_statement.c,v 1.31 2009/04/01 14:34:21 indeyets Exp
$ */
+/* $Id: sqlite_statement.c,v 1.32 2009/05/07 23:04:02 mbeccati Exp
$ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -265,11 +265,6 @@
case SQLITE3_TEXT:
*ptr = (char*)sqlite3_column_text(S-stmt, colno);
*len = sqlite3_column_bytes(S-stmt, colno);
- if (*len) {
-/* sqlite3.h says the NUL terminator is included in the byte
count
-* for TEXT values */
- *len--;
- }
return 1;
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pdo_sqlite sqlite_statement.c
Ilia Alshanetsky ha scritto: That's not a NOP code, it actually needed, the length is a pointer to an integer that is being modified. Shouldn't it be (*len)-- in that case? Cheers -- M. -- 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 /ext/pdo_sqlite sqlite_statement.c
mbeccatiThu May 7 23:29:55 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite sqlite_statement.c
/php-srcNEWS
Log:
MFH
- Fixed bug #48185 removing no-op code
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4.2.3.2.6r2=1.18.2.4.2.3.2.7diff_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.6
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.7
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.6 Wed Apr 1
14:35:24 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Thu May 7 23:29:54 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.6 2009/04/01 14:35:24 indeyets Exp
$ */
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.7 2009/05/07 23:29:54 mbeccati Exp
$ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -265,11 +265,6 @@
case SQLITE3_TEXT:
*ptr = (char*)sqlite3_column_text(S-stmt, colno);
*len = sqlite3_column_bytes(S-stmt, colno);
- if (*len) {
- /* sqlite3.h says the NUL terminator is
included in the byte count
-* for TEXT values */
- *len--;
- }
return 1;
default:
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.590r2=1.2027.2.547.2.965.2.591diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.590
php-src/NEWS:1.2027.2.547.2.965.2.591
--- php-src/NEWS:1.2027.2.547.2.965.2.590 Thu May 7 16:56:18 2009
+++ php-src/NEWSThu May 7 23:29:54 2009
@@ -33,6 +33,8 @@
- Added ability to throw exceptions from SQLite3 instead of warnings. (Scott)
- Added startup notices for deprecated ini settings. (Kalle)
+- Fixed bug #48185 (warning: value computed is not used in
+ pdo_sqlite_stmt_get_col line 271). (Matteo)
- Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)
- Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
- Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
stasThu May 7 21:26:20 2009 UTC Modified files: /CVSROOTavail Log: RB module access for Kirti Velankar http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1524r2=1.1525diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1524 CVSROOT/avail:1.1525 --- CVSROOT/avail:1.1524Wed May 6 18:25:03 2009 +++ CVSROOT/avail Thu May 7 21:26:19 2009 @@ -275,6 +275,7 @@ avail|va|pecl/yami avail|msaraujo,mansion|pecl/lua avail|merletenney,kirtig,harveyrd,kuntakinte14,ebatutis,tex,vsavchuk|pecl/intl,pecl/unicode,phpdoc/en/reference/intl,php-src/ext/intl +avail|kirtig|pecl/rb avail|lucas|pecl/apd avail|rotsenmarcello|pecl/puno avail|lwe|pecl/pdo_firebird,php-src/ext/pdo_firebird -- 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/curl interface.c
shire Fri May 8 03:33:06 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl interface.c Log: MFH: Add missing #ifdef for curl version that does not have FTP_FILEMETHOD or IPRESOLVE options. related to fix for bug #39637 http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.38r2=1.62.2.14.2.27.2.39diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.38 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.39 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.38Mon May 4 14:11:45 2009 +++ php-src/ext/curl/interface.cFri May 8 03:33:06 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.38 2009/05/04 14:11:45 pajoye Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.39 2009/05/08 03:33:06 shire Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -449,10 +449,12 @@ of options and which version they were introduced */ /* Constants for curl_setopt() */ +#if LIBCURL_VERSION_NUM 0x070a07 /* CURLOPT_IPRESOLVE is available since curl 7.10.8 */ REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE); REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER); REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V4); REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V6); +#endif REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE); REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT); REGISTER_CURL_CONSTANT(CURLOPT_PORT); @@ -1528,8 +1530,12 @@ case CURLOPT_REDIR_PROTOCOLS: case CURLOPT_PROTOCOLS: #endif +#if LIBCURL_VERSION_NUM 0x070a07 /* CURLOPT_IPRESOLVE is available since curl 7.10.8 */ case CURLOPT_IPRESOLVE: +#endif +#if LIBCURL_VERSION_NUM = 0x070f01 case CURLOPT_FTP_FILEMETHOD: +#endif convert_to_long_ex(zvalue); error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue)); break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
