[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Aug 28 20:31:39 2003 EDT Modified files: /php-srcChangeLog Log: ChangeLog update Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1371 php-src/ChangeLog:1.1372 --- php-src/ChangeLog:1.1371Wed Aug 27 20:31:57 2003 +++ php-src/ChangeLog Thu Aug 28 20:31:38 2003 @@ -1,3 +1,428 @@ +2003-08-28 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_default_classes.c: + Add public read access to protected + +* ext/sqlite/sqlite.c: + Need to check if we got any value before destroying it + +* ext/sqlite/tests/sqlite_024.phpt + ext/sqlite/tests/sqlite_oo_024.phpt: + Match expected class and instantiated class + +* ext/sqlite/php_sqlite.h + ext/sqlite/sqlite.c + ext/sqlite/tests/sqlite_024.phpt + ext/sqlite/tests/sqlite_oo_024.phpt: + Add sqlite_fetch_object() + +* ext/sqlite/tests/sqlite_oo_014.phpt + ext/sqlite/tests/sqlite_oo_021.phpt + ext/sqlite/tests/sqlite_oo_022.phpt: + Error messages show the class now + +* ext/pgsql/pgsql.c: + format string fix and number of arguments + +* ZendEngine2/zend_default_classes.c + ZendEngine2/zend_default_classes.h: + Add zend_throw_exception_ex() which allows to format exception messages. + +* ZendEngine2/zend.c: + Classe tables work this way + +2003-08-28 Ard Biesheuvel [EMAIL PROTECTED] + +* ext/interbase/interbase.c: + Prototype fixes + Return number of affected rows by ibase_query() and ibase_execute() if 0 + +2003-08-28 Andrey Hristov [EMAIL PROTECTED] + +* ext/pgsql/pgsql.c: + this is the right parameter + +* ext/db/db.c + ext/dbase/dbase.c + ext/filepro/filepro.c + ext/gd/gd.c + ext/msql/php_msql.c + ext/mssql/php_mssql.c + ext/mysqli/mysqli_api.c + ext/odbc/birdstep.c + ext/pgsql/pgsql.c + ext/pspell/pspell.c + ext/sybase/php_sybase_db.c + ext/sybase/php_sybase_db.c: + format string fixes + +* ext/mysqli/mysqli_profiler.c: + misplaced quote + +* ext/session/session.c + ext/session/session.c: + \n at the end of the message is not needed + +2003-08-28 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_builtin_functions.c + ZendEngine2/zend_builtin_functions.h + ZendEngine2/zend_default_classes.c: + - Split debug_backtrace() into lowlevel c function and php function wrapper + - Add trace property to default method based on new + zend_fetch_debug_backtrace + +2003-08-28 Andrey Hristov [EMAIL PROTECTED] + +* (PHP_4_3) + ext/sybase_ct/php_sybase_ct.c: + format string fix and \n at the end of the message is not needed + +* (PHP_4_3) + ext/gd/gd.c: + format string fix + +2003-08-28 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + ext/iconv/iconv.c: + One more warning fix. + +* (PHP_4_3) + ext/calendar/calendar.c + ext/db/db.c + ext/dio/dio.c + ext/filepro/filepro.c + ext/hyperwave/hw.c + ext/ldap/ldap.c + ext/mssql/php_mssql.c + ext/pspell/pspell.c + ext/sockets/sockets.c + ext/sysvsem/sysvsem.c + ext/sysvshm/sysvshm.c + ext/xmlrpc/xmlrpc-epi-php.c + ext/xslt/sablot.c + ext/zlib/zlib.c: + Compiler warning fixes. + +* ext/ftp/php_ftp.c + ext/imap/php_imap.c + ext/mysql/php_mysql.c + main/streams/cast.c: + Fixed compiler warnings. + +* ext/dba/dba.c: + Fixed format error. + +* (PHP_4_3) + ext/pgsql/pgsql.c: + Fixed format errors warning. + +* sapi/apache/php_apache.c: + Fixed format bug + +2003-08-28 Sascha Schumann [EMAIL PROTECTED] + +* ext/session/session.c + ext/session/session.c: + format string fix + +* (PHP_4_3) + Zend/zend.h + ZendEngine2/zend.h: + older gccs don't understand attribute((format)) on function pointers + +2003-08-28 Jani Taskinen [EMAIL PROTECTED] + +* win32/php_modules.dsw: + - added mcve to the modules workspace + +2003-08-28 Sascha Schumann [EMAIL PROTECTED] + +* (PHP_4_3) + ext/pcre/php_pcre.c: + fix error message + +2003-08-28 Rasmus Lerdorf [EMAIL PROTECTED] + +* (PHP_4_3) + ext/mcve/config.m4: + Fix the build + The DOS line endings in this file caused buildconf to build a broken + configure script on fbsd + +2003-08-28 Sascha Schumann [EMAIL PROTECTED] + +* ext/pcre/php_pcre.c: + Fix error message + +* (PHP_4_3) + Zend/zend.h + ZendEngine2/zend.h: + ZEND_GCC_VERSION should always be defined to a number so we can use + simple comparisons all the time. + +* ext/standard/assert.c + ext/standard/assert.c + ext/standard/exec.c + ext/standard/file.c + ext/standard/filters.c + ext/standard/fsock.c + ext/standard/fsock.c + ext/standard/math.c + ext/standard/math.c +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Aug 28 20:31:41 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.288 ZendEngine2/ChangeLog:1.289 --- ZendEngine2/ChangeLog:1.288 Wed Aug 27 20:32:00 2003 +++ ZendEngine2/ChangeLog Thu Aug 28 20:31:41 2003 @@ -1,3 +1,54 @@ +2003-08-28 Marcus Boerger [EMAIL PROTECTED] + +* zend_default_classes.c: + Add public read access to protected + +* zend_default_classes.c + zend_default_classes.h: + Add zend_throw_exception_ex() which allows to format exception messages. + +* zend.c: + Classe tables work this way + +* zend_builtin_functions.c + zend_builtin_functions.h + zend_default_classes.c: + - Split debug_backtrace() into lowlevel c function and php function wrapper + - Add trace property to default method based on new + zend_fetch_debug_backtrace + +2003-08-28 Sascha Schumann [EMAIL PROTECTED] + +* zend.h: + older gccs don't understand attribute((format)) on function pointers + +* zend.h: + ZEND_GCC_VERSION should always be defined to a number so we can use + simple comparisons all the time. + +* zend.h + zend_alloc.c + zend_builtin_functions.c + zend_compile.c + zend_execute.c: + Add format attribute to a number of functions + + Kill a few warnings + +* zend.h + zend_alloc.h: + cleanup centralize ZEND_GCC_VERSION and ZEND_ATTRIBUTE_MALLOC so that + they can be used by downstream applications + +* zend_alloc.h: + Enable attribute((malloc)) for GCC 2.96 + +* zend_alloc.h: + GCC 2 does not know about malloc yet. + +* zend_alloc.h: + provide attribute((malloc)) where appropiate + 2003-08-27 Marcus Boerger [EMAIL PROTECTED] * zend_reflection_api.c: @@ -1233,7 +1284,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.288 2003/08/28 00:32:00 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.289 2003/08/29 00:31:41 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -2957,7 +3008,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.288 2003/08/28 00:32:00 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.289 2003/08/29 00:31:41 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c
helly Thu Aug 28 19:04:27 2003 EDT
Modified files:
/php-src/ext/pgsql pgsql.c
Log:
format string fix and number of arguments
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.293 php-src/ext/pgsql/pgsql.c:1.294
--- php-src/ext/pgsql/pgsql.c:1.293 Thu Aug 28 17:06:44 2003
+++ php-src/ext/pgsql/pgsql.c Thu Aug 28 19:04:27 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.293 2003/08/28 21:06:44 andrey Exp $ */
+/* $Id: pgsql.c,v 1.294 2003/08/28 23:04:27 helly Exp $ */
#include stdlib.h
@@ -576,12 +576,12 @@
if (PGG(max_links)!=-1 PGG(num_links)=PGG(max_links)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
-Cannot create new
link. Too many open links (%d), PGG(num_links));
+Cannot create new
link. Too many open links (%ld), PGG(num_links));
goto err;
}
if (PGG(max_persistent)!=-1
PGG(num_persistent)=PGG(max_persistent)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
-Cannot create new
link. Too many open persistent links (%d), PGG(num_persistent));
+Cannot create new
link. Too many open persistent links (%ld), PGG(num_persistent));
goto err;
}
@@ -678,7 +678,7 @@
}
}
if (PGG(max_links)!=-1 PGG(num_links)=PGG(max_links)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create new
link. Too many open links (%d), PGG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create new
link. Too many open links (%ld), PGG(num_links));
goto err;
}
if (connstring) {
@@ -2312,7 +2312,7 @@
}
else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC,
lsr,
oid_long, file_out, name_len, pgsql_link) == SUCCESS) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, %s(): Old API is used);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Old API is used);
if (oid_long = InvalidOid) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Invalid OID
specified);
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/sqlite/tests sqlite_oo_014.phpt sqlite_oo_021.phpt sqlite_oo_022.phpt
helly Thu Aug 28 19:18:39 2003 EDT
Modified files:
/php-src/ext/sqlite/tests sqlite_oo_014.phpt sqlite_oo_021.phpt
sqlite_oo_022.phpt
Log:
Error messages show the class now
Index: php-src/ext/sqlite/tests/sqlite_oo_014.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.1
php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.2
--- php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.1 Sun Jun 22 13:19:46 2003
+++ php-src/ext/sqlite/tests/sqlite_oo_014.phpt Thu Aug 28 19:18:38 2003
@@ -59,7 +59,7 @@
}
}
-Notice: fetch_all(): One or more rowsets were already returned in %ssqlite_oo_014.php
on line %d
+Notice: sqlite_ub_query::fetch_all(): One or more rowsets were already returned in
%ssqlite_oo_014.php on line %d
array(0) {
}
unbuffered with fetch_array
Index: php-src/ext/sqlite/tests/sqlite_oo_021.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_021.phpt:1.1
php-src/ext/sqlite/tests/sqlite_oo_021.phpt:1.2
--- php-src/ext/sqlite/tests/sqlite_oo_021.phpt:1.1 Wed Jun 25 12:59:24 2003
+++ php-src/ext/sqlite/tests/sqlite_oo_021.phpt Thu Aug 28 19:18:38 2003
@@ -38,7 +38,7 @@
string(1) 4
}
-Warning: single_query(): no such table: test in %s on line %d
+Warning: sqlite_db::single_query(): no such table: test in %s on line %d
bool(false)
NULL
array(1) {
Index: php-src/ext/sqlite/tests/sqlite_oo_022.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_022.phpt:1.1
php-src/ext/sqlite/tests/sqlite_oo_022.phpt:1.2
--- php-src/ext/sqlite/tests/sqlite_oo_022.phpt:1.1 Wed Jul 9 12:55:07 2003
+++ php-src/ext/sqlite/tests/sqlite_oo_022.phpt Thu Aug 28 19:18:38 2003
@@ -38,7 +38,7 @@
--EXPECTF--
SEEK:-1
-Warning: seek(): row -1 out of range in %ssqlite_oo_022.php on line %d
+Warning: sqlite_query::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d
array(1) {
[0]=
string(3) one
@@ -60,7 +60,7 @@
}
SEEK:3
-Warning: seek(): row 3 out of range in %ssqlite_oo_022.php on line %d
+Warning: sqlite_query::seek(): row 3 out of range in %ssqlite_oo_022.php on line %d
array(1) {
[0]=
string(5) three
@@ -68,7 +68,7 @@
AGAIN
SEEK:-1
-Warning: seek(): row -1 out of range in %ssqlite_oo_022.php on line %d
+Warning: sqlite_query::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d
array(1) {
[0]=
string(5) three
@@ -90,7 +90,7 @@
}
SEEK:3
-Warning: seek(): row 3 out of range in %ssqlite_oo_022.php on line %d
+Warning: sqlite_query::seek(): row 3 out of range in %ssqlite_oo_022.php on line %d
array(1) {
[0]=
string(5) three
--
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
helly Thu Aug 28 19:36:47 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Need to check if we got any value before destroying it
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.85 php-src/ext/sqlite/sqlite.c:1.86
--- php-src/ext/sqlite/sqlite.c:1.85Thu Aug 28 19:19:51 2003
+++ php-src/ext/sqlite/sqlite.c Thu Aug 28 19:36:46 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.85 2003/08/28 23:19:51 helly Exp $
+ $Id: sqlite.c,v 1.86 2003/08/28 23:36:46 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -941,7 +941,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.85 2003/08/28 23:19:51 helly Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.86 2003/08/28 23:36:46 helly 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();
@@ -1735,7 +1735,9 @@
if (zend_call_function(fci, fcc TSRMLS_CC) == FAILURE) {
zend_throw_exception_ex(sqlite_ce_exception, 0 TSRMLS_CC,
Could not execute %s::%s(), class_name, ce-constructor-common.function_name);
} else {
- zval_ptr_dtor(retval_ptr);
+ if (retval_ptr) {
+ zval_ptr_dtor(retval_ptr);
+ }
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php.h
helly Thu Aug 28 20:22:37 2003 EDT Modified files: /php-src/main php.h Log: Add define to reset error handling more easily Index: php-src/main/php.h diff -u php-src/main/php.h:1.196 php-src/main/php.h:1.197 --- php-src/main/php.h:1.196Thu Aug 28 12:49:43 2003 +++ php-src/main/php.h Thu Aug 28 20:22:36 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.196 2003/08/28 16:49:43 sas Exp $ */ +/* $Id: php.h,v 1.197 2003/08/29 00:22:36 helly Exp $ */ #ifndef PHP_H #define PHP_H @@ -296,6 +296,7 @@ BEGIN_EXTERN_C(); PHPAPI void php_set_error_handling(error_handling_t error_handling, zend_class_entry *exception_class TSRMLS_DC); +#define php_std_error_handling() php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC) PHPAPI void php_verror(const char *docref, const char *params, int type, const char *format, va_list args TSRMLS_DC) PHP_ATTRIBUTE_FORMAT(printf, 4, 0); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mcve mcve.c
sniper Thu Aug 28 20:53:16 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mcve mcve.c Log: fix build Index: php-src/ext/mcve/mcve.c diff -u php-src/ext/mcve/mcve.c:1.14.2.7 php-src/ext/mcve/mcve.c:1.14.2.8 --- php-src/ext/mcve/mcve.c:1.14.2.7Thu Aug 28 10:36:49 2003 +++ php-src/ext/mcve/mcve.c Thu Aug 28 20:53:15 2003 @@ -17,16 +17,17 @@ +--+ */ -/* $Id: mcve.c,v 1.14.2.7 2003/08/28 14:36:49 sniper Exp $ */ +/* $Id: mcve.c,v 1.14.2.8 2003/08/29 00:53:15 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include config.h #endif -#ifdef HAVE_MCVE +#include php.h + +#if HAVE_MCVE /* standard php include(s) */ -#include php.h #include ext/standard/head.h #include ext/standard/php_standard.h #include ext/standard/info.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /tests/lang bug25145.phpt
sniper Fri Aug 29 05:05:27 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/tests/lang bug25145.phpt
Log:
MFH
Index: php-src/tests/lang/bug25145.phpt
diff -u php-src/tests/lang/bug25145.phpt:1.1.2.1
php-src/tests/lang/bug25145.phpt:1.1.2.2
--- php-src/tests/lang/bug25145.phpt:1.1.2.1Tue Aug 19 18:50:38 2003
+++ php-src/tests/lang/bug25145.phptFri Aug 29 05:05:27 2003
@@ -1,21 +1,22 @@
--TEST--
Bug #25145 (SEGV on recpt of form input with name like 123[])
+--SKIPIF--
+?php if (php_sapi_name() == 'cli') echo 'skip'; ?
--GET--
123[]=SEGV
--FILE--
?php
-print_r($_REQUEST);
+var_dump($_REQUEST);
echo Done\n;
?
--EXPECT--
-Array
-(
-[123] = Array
-(
-[0] = SEGV
-)
-
-)
+array(1) {
+ [123]=
+ array(1) {
+[0]=
+string(4) SEGV
+ }
+}
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
sniper Fri Aug 29 10:41:09 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.364 php-src/NEWS:1.1247.2.365 --- php-src/NEWS:1.1247.2.364 Thu Aug 28 12:05:17 2003 +++ php-src/NEWSFri Aug 29 10:41:08 2003 @@ -4,6 +4,7 @@ - Made MCVE extension available on win32. (Jani) - Fixed disk_total_space() and disk_free_space() under FreeBSD. (Jon Parise) - Fixed crash bug when non-existing save/serializer handler was used. (Jani) +- Fixed bug #25307 (Crash with WDDX serializer). (Sascha, Jani) - Fixed bug #25239 (ftp_fopen_wrapper not RFC compliant). (Sara) - Fixed bug #25166 (WDDX serializer handler missing in win32). (Jani) - Fixed bug #25109 (Possible crash when fetching field names in pgsql). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/domxml php_domxml.c
rrichards Fri Aug 29 11:29:25 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/domxml php_domxml.c
Log:
workaround for bug #25268. libxslt issue with xsl:key
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.28
php-src/ext/domxml/php_domxml.c:1.218.2.29
--- php-src/ext/domxml/php_domxml.c:1.218.2.28 Thu Aug 7 12:44:11 2003
+++ php-src/ext/domxml/php_domxml.c Fri Aug 29 11:29:24 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_domxml.c,v 1.218.2.28 2003/08/07 16:44:11 zeev Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.29 2003/08/29 15:29:24 rrichards Exp $ */
/* TODO
* - Support Notation Nodes
@@ -5349,7 +5349,7 @@
xmlDocPtr xmldocp;
xmlDocPtr docp;
char **params = NULL;
- int ret;
+ int ret, clone = 0;
char *filename;
int filename_len = 0;
@@ -5361,7 +5361,7 @@
RETURN_FALSE;
}
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, o|abs, idxml,
idparams, xpath_params, filename, filename_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, o|a!b!s!l, idxml,
idparams, xpath_params, filename, filename_len, clone) == FAILURE) {
RETURN_FALSE;
}
@@ -5371,6 +5371,10 @@
params = php_domxslt_make_params(idparams, xpath_params TSRMLS_CC);
}
+ if (clone == 1) {
+ xmldocp = xmlCopyDoc(xmldocp, 1);
+ }
+
if (filename_len) {
FILE *f;
f = fopen (filename,w);
@@ -5378,6 +5382,10 @@
fclose(f);
} else {
docp = xsltApplyStylesheet(xsltstp, xmldocp, (const char**)params);
+ }
+
+ if (clone == 1) {
+ xmlFreeDoc(xmldocp);
}
if (params) {
--
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
helly Fri Aug 29 17:32:25 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Throw exception if user wants to pass arguments to an non existing constructor
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.87 php-src/ext/sqlite/sqlite.c:1.88
--- php-src/ext/sqlite/sqlite.c:1.87Fri Aug 29 17:13:50 2003
+++ php-src/ext/sqlite/sqlite.c Fri Aug 29 17:32:25 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.87 2003/08/29 21:13:50 helly Exp $
+ $Id: sqlite.c,v 1.88 2003/08/29 21:32:25 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -941,7 +941,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.87 2003/08/29 21:13:50 helly Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.88 2003/08/29 21:32:25 helly 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();
@@ -1663,7 +1663,7 @@
}
/* }}} */
-/* {{{ proto object sqlite_fetch_object(resource result [, string class_name [, array
ctor_params [, bool decode_binary]]])
+/* {{{ proto object sqlite_fetch_object(resource result [, string class_name [,
NULL|array ctor_params [, bool decode_binary]]])
Fetches the next row from a result set as an object. */
/* note that you can do array($val) for param ctor_params */
PHP_FUNCTION(sqlite_fetch_object)
@@ -1768,6 +1768,8 @@
if (fci.params) {
efree(fci.params);
}
+ } else if (ctor_params Z_TYPE_P(ctor_params) != IS_NULL) {
+ zend_throw_exception_ex(sqlite_ce_exception, 0 TSRMLS_CC, Class %s
does not have a constructor use NULL for parameter ctor_params, class_name);
}
}
/* }}} */
--
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
helly Fri Aug 29 17:33:25 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Throw exception if user wants to pass arguments to an non existing constructor
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.88 php-src/ext/sqlite/sqlite.c:1.89
--- php-src/ext/sqlite/sqlite.c:1.88Fri Aug 29 17:32:25 2003
+++ php-src/ext/sqlite/sqlite.c Fri Aug 29 17:33:24 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.88 2003/08/29 21:32:25 helly Exp $
+ $Id: sqlite.c,v 1.89 2003/08/29 21:33:24 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -941,7 +941,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.88 2003/08/29 21:32:25 helly Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.89 2003/08/29 21:33:24 helly 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();
@@ -1725,7 +1725,7 @@
fci.symbol_table = NULL;
fci.object_pp = return_value;
fci.retval_ptr_ptr = retval_ptr;
- if (ctor_params) {
+ if (ctor_params Z_TYPE_P(ctor_params) != IS_NULL) {
if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
HashTable *ht = Z_ARRVAL_P(ctor_params);
Bucket *p;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
