[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Nov 25 01:41:19 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2174r2=1.2175ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2174 php-src/ChangeLog:1.2175 --- php-src/ChangeLog:1.2174Thu Nov 24 01:41:07 2005 +++ php-src/ChangeLog Fri Nov 25 01:40:50 2005 @@ -1,3 +1,70 @@ +2005-11-24 Marcus Boerger [EMAIL PROTECTED] + +* ext/simplexml/tests/bug27010.phpt: + - Synch test name + +* (PHP_5_1) + NEWS: + - NEWS, NEWS, NEWS + +* (PHP_5_1) + ZendEngine2/zend_reflection_api.c: + - MFH Reflection class consts (not removing globals consts in 5.1*) (by + Johannes) + +2005-11-24 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + Fixed bug #35358 (Incorrect error messages for PDO class constants). + +2005-11-24 Antony Dovgal [EMAIL PROTECTED] + +* ext/oci8/oci8.c: + fix #35322 (oci_connect() after oci_close() gives unknown resource) + +2005-11-24 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_0) + NEWS + NEWS + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.c + ZendEngine2/zend_execute_API.c + ZendEngine2/zend_execute_API.c + ZendEngine2/zend_execute_API.c: + Fixed bug #35360 (exceptions in interactive mode (php -a) may cause crash) + +2005-11-24 Sebastian Bergmann [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS + ZendEngine2/zend_builtin_functions.c + ZendEngine2/zend_builtin_functions.h + ZendEngine2/zend_exceptions.c: + MFH: Add an additional field $frame['object'] to the result array of + debug_backtrace() that contains a reference to the respective object when + the frame was called from an object. + +2005-11-24 Sara Golemon [EMAIL PROTECTED] + +* (PHP_5_1) + ext/zlib/tests/zlib_filter_deflate.phpt + ext/zlib/tests/zlib_filter_inflate.phpt: + MFH (r-1.2) Sync tests with new defaults + +* ext/zlib/tests/zlib_filter_deflate.phpt + ext/zlib/tests/zlib_filter_inflate.phpt: + Sync tests with new defaults + +2005-11-24 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + ext/ming/config.m4 + ext/ming/ming.c: + - Fix build for new ming versions + 2005-11-23 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_5_1) @@ -17200,7 +17267,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2174 2005/11/24 06:41:07 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2175 2005/11/25 06:40:50 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -20601,7 +20668,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2174 2005/11/24 06:41:07 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2175 2005/11/25 06:40:50 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -21082,7 +21149,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2174 2005/11/24 06:41:07 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2175 2005/11/25 06:40:50 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -22556,7 +22623,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2174 2005/11/24 06:41:07 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2175 2005/11/25 06:40:50 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/pdo pdo_dbh.c pdo_stmt.c
iliaa Thu Nov 24 11:21:46 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdopdo_stmt.c pdo_dbh.c
/php-srcNEWS
Log:
Fixed bug #35358 (Incorrect error messages for PDO class constants).
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.17r2=1.118.2.18ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.17
php-src/ext/pdo/pdo_stmt.c:1.118.2.18
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.17 Wed Nov 16 01:32:33 2005
+++ php-src/ext/pdo/pdo_stmt.c Thu Nov 24 11:21:41 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.17 2005/11/16 06:32:33 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.18 2005/11/24 16:21:41 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -1119,7 +1119,7 @@
#if PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1
if ((flags PDO_FETCH_SERIALIZE) == PDO_FETCH_SERIALIZE) {
- pdo_raise_impl_error(stmt-dbh, stmt, IM001,
PDO_FETCH_SERIALIZE is not supported in this PHP version TSRMLS_CC);
+ pdo_raise_impl_error(stmt-dbh, stmt, IM001,
PDO::FETCH_SERIALIZE is not supported in this PHP version TSRMLS_CC);
return 0;
}
#endif
@@ -1127,18 +1127,18 @@
switch(mode) {
case PDO_FETCH_FUNC:
if (!fetch_all) {
- pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO_FETCH_FUNC is only allowed in PDOStatement::fetchAll() TSRMLS_CC);
+ pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO::FETCH_FUNC is only allowed in PDOStatement::fetchAll() TSRMLS_CC);
return 0;
}
return 1;
default:
if ((flags PDO_FETCH_SERIALIZE) == PDO_FETCH_SERIALIZE) {
- pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO_FETCH_SERIALIZE can only be used together with PDO_FETCH_CLASS TSRMLS_CC);
+ pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO::FETCH_SERIALIZE can only be used together with PDO::FETCH_CLASS
TSRMLS_CC);
return 0;
}
if ((flags PDO_FETCH_CLASSTYPE) == PDO_FETCH_CLASSTYPE) {
- pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO_FETCH_CLASSTYPE can only be used together with PDO_FETCH_CLASS TSRMLS_CC);
+ pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO::FETCH_CLASSTYPE can only be used together with PDO::FETCH_CLASS
TSRMLS_CC);
return 0;
}
if (mode = PDO_FETCH__MAX) {
@@ -1366,7 +1366,7 @@
stmt-fetch.column = Z_LVAL_P(arg2);
break;
case 3:
- pdo_raise_impl_error(stmt-dbh, stmt, HY000, Third
parameter not allowed for PDO_FETCH_COLUMN TSRMLS_CC);
+ pdo_raise_impl_error(stmt-dbh, stmt, HY000, Third
parameter not allowed for PDO::FETCH_COLUMN TSRMLS_CC);
error = 1;
}
break;
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.15r2=1.82.2.16ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.15 php-src/ext/pdo/pdo_dbh.c:1.82.2.16
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.15 Sun Nov 20 15:06:28 2005
+++ php-src/ext/pdo/pdo_dbh.c Thu Nov 24 11:21:42 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.15 2005/11/20 20:06:28 iliaa Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.16 2005/11/24 16:21:42 iliaa Exp $ */
/* The PDO Database Handle Class */
@@ -508,7 +508,7 @@
|| zend_lookup_class(Z_STRVAL_PP(item),
Z_STRLEN_PP(item), pce TSRMLS_CC) == FAILURE
) {
pdo_raise_impl_error(dbh, NULL, HY000,
- PDO_ATTR_STATEMENT_CLASS requires format
array(classname, ctor_args);
+ PDO::ATTR_STATEMENT_CLASS requires format
array(classname, ctor_args);
the classname must be a string specifying an
existing class
TSRMLS_CC);
PDO_HANDLE_DBH_ERR();
@@ -530,7 +530,7 @@
if (zend_hash_index_find(Z_ARRVAL_PP(opt), 1, (void**)item) ==
SUCCESS) {
if (Z_TYPE_PP(item) != IS_ARRAY) {
pdo_raise_impl_error(dbh, NULL, HY000,
- PDO_ATTR_STATEMENT_CLASS requires
format array(classname, ctor_args);
+ PDO::ATTR_STATEMENT_CLASS requires
format array(classname, ctor_args);
ctor_args must be an array
TSRMLS_CC);
PDO_HANDLE_DBH_ERR();
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c pdo_stmt.c
iliaa Thu Nov 24 11:22:28 2005 EDT
Modified files:
/php-src/ext/pdopdo_stmt.c pdo_dbh.c
Log:
MFB51: Fixed bug #35358 (Incorrect error messages for PDO class constants).
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.130r2=1.131ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.130 php-src/ext/pdo/pdo_stmt.c:1.131
--- php-src/ext/pdo/pdo_stmt.c:1.130Sun Oct 30 17:55:21 2005
+++ php-src/ext/pdo/pdo_stmt.c Thu Nov 24 11:22:27 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.130 2005/10/30 22:55:21 helly Exp $ */
+/* $Id: pdo_stmt.c,v 1.131 2005/11/24 16:22:27 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -69,6 +69,12 @@
/* }}} */
#endif
+#define PHP_STMT_GET_OBJ \
+ pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(getThis()
TSRMLS_CC); \
+ if (!stmt-dbh) {\
+RETURN_FALSE; \
+ }\
+
static PHP_FUNCTION(dbstmt_constructor) /* {{{ */
{
php_error_docref(NULL TSRMLS_CC, E_ERROR, You should not create a
PDOStatement manually);
@@ -333,9 +339,9 @@
Execute a prepared statement, optionally binding parameters */
static PHP_METHOD(PDOStatement, execute)
{
- pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(getThis()
TSRMLS_CC);
zval *input_params = NULL;
int ret = 1;
+ PHP_STMT_GET_OBJ;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |a!,
input_params)) {
RETURN_FALSE;
@@ -1072,7 +1078,7 @@
#if PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1
if ((flags PDO_FETCH_SERIALIZE) == PDO_FETCH_SERIALIZE) {
- pdo_raise_impl_error(stmt-dbh, stmt, IM001,
PDO_FETCH_SERIALIZE is not supported in this PHP version TSRMLS_CC);
+ pdo_raise_impl_error(stmt-dbh, stmt, IM001,
PDO::FETCH_SERIALIZE is not supported in this PHP version TSRMLS_CC);
return 0;
}
#endif
@@ -1080,18 +1086,18 @@
switch(mode) {
case PDO_FETCH_FUNC:
if (!fetch_all) {
- pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO_FETCH_FUNC is only allowed in PDOStatement::fetchAll() TSRMLS_CC);
+ pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO::FETCH_FUNC is only allowed in PDOStatement::fetchAll() TSRMLS_CC);
return 0;
}
return 1;
default:
if ((flags PDO_FETCH_SERIALIZE) == PDO_FETCH_SERIALIZE) {
- pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO_FETCH_SERIALIZE can only be used together with PDO_FETCH_CLASS TSRMLS_CC);
+ pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO::FETCH_SERIALIZE can only be used together with PDO::FETCH_CLASS
TSRMLS_CC);
return 0;
}
if ((flags PDO_FETCH_CLASSTYPE) == PDO_FETCH_CLASSTYPE) {
- pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO_FETCH_CLASSTYPE can only be used together with PDO_FETCH_CLASS TSRMLS_CC);
+ pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO::FETCH_CLASSTYPE can only be used together with PDO::FETCH_CLASS
TSRMLS_CC);
return 0;
}
if (mode = PDO_FETCH__MAX) {
@@ -1113,7 +1119,7 @@
long how = PDO_FETCH_USE_DEFAULT;
long ori = PDO_FETCH_ORI_NEXT;
long off = 0;
- pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+PHP_STMT_GET_OBJ;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |lll,
how,
ori, off)) {
@@ -1146,8 +1152,8 @@
zval *old_ctor_args, *ctor_args;
int error = 0, old_arg_count;
- pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(getThis()
TSRMLS_CC);
-
+ PHP_STMT_GET_OBJ;
+
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |sz,
class_name, class_name_len, ctor_args)) {
RETURN_FALSE;
@@ -1214,8 +1220,8 @@
Returns a data of the specified column in the result set. */
static PHP_METHOD(PDOStatement, fetchColumn)
{
- pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(getThis()
TSRMLS_CC);
long col_n = 0;
+ PHP_STMT_GET_OBJ;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l,
col_n)) {
RETURN_FALSE;
@@ -1236,13 +1242,13 @@
Returns an array of all of the results. */
static PHP_METHOD(PDOStatement, fetchAll)
{
- pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(getThis()
TSRMLS_CC);
long how = PDO_FETCH_USE_DEFAULT;
zval *data, *return_all;
zval *arg2;
zend_class_entry *old_ce;
zval *old_ctor_args, *ctor_args = NULL;
[PHP-CVS] cvs: CVSROOT / avail
wez Thu Nov 24 11:52:35 2005 EDT Modified files: /CVSROOTavail Log: copied pdo_ids to pdo_informix on the repository; update karma http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1049r2=1.1050ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1049 CVSROOT/avail:1.1050 --- CVSROOT/avail:1.1049Tue Nov 22 05:27:01 2005 +++ CVSROOT/avail Thu Nov 24 11:52:33 2005 @@ -309,10 +309,10 @@ # legally encumbered. If you have contributions for these two extensions, # please contact the lead developers. This is a temporary measure until # we can put in place a more general process. -unavail||pecl/ibm_db2,pecl/pdo_odbc,php-src/ext/pdo_odbc,pecl/sdo,pecl/pdo_ids +unavail||pecl/ibm_db2,pecl/pdo_odbc,php-src/ext/pdo_odbc,pecl/sdo,pecl/pdo_ids,pecl/pdo_informix avail|dbs,skoduru|pecl/ibm_db2 avail|wez,dbs|pecl/pdo_odbc,php-src/ext/pdo_odbc avail|gcc,cem,mfp,ansriniv|pecl/sdo -avail|dbs|pecl/pdo_ids +avail|dbs|pecl/pdo_ids,pecl/pdo_informix # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Thu Nov 24 12:50:40 2005 EDT Modified files: /CVSROOTavail Log: - arpad pear karma http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1050r2=1.1051ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1050 CVSROOT/avail:1.1051 --- CVSROOT/avail:1.1050Thu Nov 24 11:52:33 2005 +++ CVSROOT/avail Thu Nov 24 12:50:36 2005 @@ -299,7 +299,7 @@ avail|clockwerx|pear/Validate avail|traufeisen|pecl/gnupg,phpdoc/en/reference/gnupg avail|bate|pear/Net_DNS,pear/Net_IPv4 - +avail|arpad|peardoc,pear/Validate,pear/HTML_AJAX avail|mikl|pecl/memcache # Curl modules -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Thu Nov 24 13:20:04 2005 EDT Modified files: /CVSROOTavail Log: karma for new accounts http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1051r2=1.1052ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1051 CVSROOT/avail:1.1052 --- CVSROOT/avail:1.1051Thu Nov 24 12:50:36 2005 +++ CVSROOT/avail Thu Nov 24 13:20:02 2005 @@ -59,7 +59,7 @@ # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP tree, the PEAR website, and the PEAR documentation. -avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish,firman|pear,peardoc +avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish,firman,epte|pear,peardoc # PEAR bits in the main php-src module avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye|php-src/pear,pear-core @@ -76,18 +76,18 @@ # Some people get only access to specific languages for phpdoc avail|elf,shimooka,takagi|phpdoc-ja -avail|machado|phpdoc-pt_BR +avail|machado,scar|phpdoc-pt_BR avail|radical,shoty|phpdoc-ro avail|penguin|phpdoc-da -avail|ianasa,gustavo,soywiz|phpdoc-es -avail|erkje|phpdoc-nl +avail|ianasa,gustavo,soywiz,ladderalice|phpdoc-es +avail|erkje,oebe|phpdoc-nl avail|magidev,colder|phpdoc-fr -avail|diab|phpdoc-ar +avail|diab,daif|phpdoc-ar avail|parstic|phpdoc-fa_IR avail|neonz|phpdoc-lv avail|mkoula|phpdoc-cs avail|xdanger|phpdoc-zh,phpdoc-hk -avail|freespace,shaff,sveta|phpdoc-ru +avail|freespace,shaff,sveta,wanderer|phpdoc-ru avail|cyb0org|phpdoc-pl avail|jacques|phpdoc,pear/Validate avail|cumhuronat,gulenzek,xhandros,neoprobe,faruk,infralite,flarecaster|phpdoc-tr @@ -228,7 +228,7 @@ avail|areaz2|pecl/dazuko avail|nicos|php-src/ext/readline avail|mabouzou|php-src/ext/sqlanywhere -avail|cortesi,webdi,colder|peardoc +avail|cortesi,webdi,colder,zefredz|peardoc avail|aditus|jpgraph avail|phallstrom|php-gtk-web/apps,php-gtk-web/include/apps.inc avail|mohrt|pear/Date @@ -301,6 +301,8 @@ avail|bate|pear/Net_DNS,pear/Net_IPv4 avail|arpad|peardoc,pear/Validate,pear/HTML_AJAX avail|mikl|pecl/memcache +avail|norro|pear/Image_3D +avail|ttsuruoka|pear/Services_Amazon # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql config.m4
wez Thu Nov 24 13:56:17 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_mysql config.m4 Log: Fix bug that breaks pdo_mysql when built shared (was not being linked to the mysql libraries). If you have another mysql module loaded, this would not have been noticable. http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.2r2=1.25.2.3ty=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.2 php-src/ext/pdo_mysql/config.m4:1.25.2.3 --- php-src/ext/pdo_mysql/config.m4:1.25.2.2Sat Nov 5 11:20:06 2005 +++ php-src/ext/pdo_mysql/config.m4 Thu Nov 24 13:56:16 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.2 2005/11/05 16:20:06 wez Exp $ +dnl $Id: config.m4,v 1.25.2.3 2005/11/24 18:56:16 wez Exp $ dnl if test $PHP_PDO != no; then @@ -117,9 +117,9 @@ ]) PDO_MYSQL_MODULE_TYPE=external + PDO_MYSQL_SHARED_LIBADD=$PDO_MYSQL_LIBS PHP_SUBST(PDO_MYSQL_SHARED_LIBADD) PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE) - PHP_SUBST_OLD(PDO_MYSQL_LIBS) fi fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests bug27010.phpt
helly Thu Nov 24 15:27:28 2005 EDT Modified files: /php-src/ext/simplexml/testsbug27010.phpt Log: - Synch test name http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/bug27010.phpt?r1=1.3r2=1.4ty=u Index: php-src/ext/simplexml/tests/bug27010.phpt diff -u php-src/ext/simplexml/tests/bug27010.phpt:1.3 php-src/ext/simplexml/tests/bug27010.phpt:1.4 --- php-src/ext/simplexml/tests/bug27010.phpt:1.3 Sat Oct 29 12:12:57 2005 +++ php-src/ext/simplexml/tests/bug27010.phpt Thu Nov 24 15:27:27 2005 @@ -1,5 +1,5 @@ --TEST-- -Bug #27010: segfault and node text not displayed when returned from children() +Bug #27010 (segfault and node text not displayed when returned from children()) --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo config.m4
wez Thu Nov 24 16:38:11 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdoconfig.m4 Log: Fix PECL Bug #6014; config fails on PHP 5.0.3 http://cvs.php.net/diff.php/php-src/ext/pdo/config.m4?r1=1.15.2.2r2=1.15.2.3ty=u Index: php-src/ext/pdo/config.m4 diff -u php-src/ext/pdo/config.m4:1.15.2.2 php-src/ext/pdo/config.m4:1.15.2.3 --- php-src/ext/pdo/config.m4:1.15.2.2 Tue Oct 4 03:44:56 2005 +++ php-src/ext/pdo/config.m4 Thu Nov 24 16:38:09 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15.2.2 2005/10/04 07:44:56 helly Exp $ +dnl $Id: config.m4,v 1.15.2.3 2005/11/24 21:38:09 wez Exp $ dnl config.m4 for extension pdo dnl vim:se ts=2 sw=2 et: @@ -51,7 +51,10 @@ esac fi PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared) - PHP_ADD_EXTENSION_DEP(pdo, spl, true) + ifdef([PHP_ADD_EXTENSION_DEP], + [ +PHP_ADD_EXTENSION_DEP(pdo, spl, true) + ]) ifdef([PHP_INSTALL_HEADERS], [ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_dbh.c
wez Thu Nov 24 16:46:56 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdopdo_dbh.c Log: CLASSTYPE is an internal flag. Closes PECL #5640. http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.16r2=1.82.2.17ty=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.16 php-src/ext/pdo/pdo_dbh.c:1.82.2.17 --- php-src/ext/pdo/pdo_dbh.c:1.82.2.16 Thu Nov 24 11:21:42 2005 +++ php-src/ext/pdo/pdo_dbh.c Thu Nov 24 16:46:56 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_dbh.c,v 1.82.2.16 2005/11/24 16:21:42 iliaa Exp $ */ +/* $Id: pdo_dbh.c,v 1.82.2.17 2005/11/24 21:46:56 wez Exp $ */ /* The PDO Database Handle Class */ @@ -1272,7 +1272,6 @@ REGISTER_PDO_CLASS_CONST_LONG(FETCH_FUNC, (long)PDO_FETCH_FUNC); REGISTER_PDO_CLASS_CONST_LONG(FETCH_GROUP,(long)PDO_FETCH_GROUP); REGISTER_PDO_CLASS_CONST_LONG(FETCH_UNIQUE,(long)PDO_FETCH_UNIQUE); - REGISTER_PDO_CLASS_CONST_LONG(FETCH_CLASSTYPE,(long)PDO_FETCH_CLASSTYPE); #if PHP_MAJOR_VERSION 5 || PHP_MINOR_VERSION = 1 REGISTER_PDO_CLASS_CONST_LONG(FETCH_SERIALIZE,(long)PDO_FETCH_SERIALIZE); #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo package.xml
wez Thu Nov 24 17:25:38 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdopackage.xml Log: prep for release http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.19.2.4r2=1.19.2.5ty=u Index: php-src/ext/pdo/package.xml diff -u php-src/ext/pdo/package.xml:1.19.2.4 php-src/ext/pdo/package.xml:1.19.2.5 --- php-src/ext/pdo/package.xml:1.19.2.4Mon Oct 31 21:44:11 2005 +++ php-src/ext/pdo/package.xml Thu Nov 24 17:25:37 2005 @@ -40,9 +40,9 @@ /description licensePHP/license release - statebeta/state - version1.0RC2/version - date2005-11-01/date + statestable/state + version1.0/version + date2005-11-24/date notes ** NOTE WELL! ** @@ -54,9 +54,7 @@ check http://pecl.php.net/package-search.php?pkg_name=PDO for a list of available PDO drivers. -It is highly recommended that you update to the latest stable PHP 5 snapshot -before using PDO. -You can obtain it from http://snaps.php.net. +It is highly recommended that you update to PHP 5.1 before using PDO. If you are running on Windows, you can find a precompiled binary at: http://pecl4win.php.net/ext.php/php_pdo.dll @@ -65,12 +63,15 @@ http://pecl4win.php.net ** Changes ** - - Changed PDO_XXX constants to PDO::XXX +- It is now possible to extend PDO and PDOStatement and override their constructors + +- Fixed Bug #35303; PDO::prepare() can cause crashes with invalid parameters +- Fixed Bug #35135; new PDOStatement can cause crashes. +- Fixed Bug #35293 and PECL Bug #5589; segfault when creating persistent connections - Fixed PECL Bug #5010, problem installing headers - renamed pdo_drivers() to PDO::getAvailableDrivers() - Various fixes when building with SPL -- It is now possible to extend PDO and PDOStatement and override their constructors - PDO::setAttribute(PDO::ATTR_STATEMENT_CLASS) allows you to set your own PDOStatement replacement when extending PDO and PDOStatement - Fixed Bug #34687; error information from PDO::query() was not always returned -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite package.xml
wez Thu Nov 24 17:33:21 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite package.xml Log: prep for release http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/package.xml?r1=1.10.2.3r2=1.10.2.4ty=u Index: php-src/ext/pdo_sqlite/package.xml diff -u php-src/ext/pdo_sqlite/package.xml:1.10.2.3 php-src/ext/pdo_sqlite/package.xml:1.10.2.4 --- php-src/ext/pdo_sqlite/package.xml:1.10.2.3 Mon Oct 31 22:16:36 2005 +++ php-src/ext/pdo_sqlite/package.xml Thu Nov 24 17:33:20 2005 @@ -23,9 +23,9 @@ /description licensePHP/license release - statebeta/state - version1.0RC2/version - date2005-11-01/date + statestable/state + version1.0/version + date2005-11-24/date notes You need to install the PDO core module before you can make use of this one. @@ -170,7 +170,7 @@ /filelist deps dep type=php rel=ge version=5.0.3/ - dep type=ext rel=ge name=pdo version=1.0RC2/ + dep type=ext rel=ge name=pdo version=1.0/ /deps /release /package -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main main.c
iliaa Thu Nov 24 19:02:18 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main main.c
/php-srcNEWS
Log:
Fixed bug #35170 (PHP_AUTH_DIGEST differs under Apache 1.x and 2.x).
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.640.2.7r2=1.640.2.8ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.7 php-src/main/main.c:1.640.2.8
--- php-src/main/main.c:1.640.2.7 Tue Nov 15 06:13:42 2005
+++ php-src/main/main.c Thu Nov 24 19:02:11 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.7 2005/11/15 11:13:42 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.8 2005/11/25 00:02:11 iliaa Exp $ */
/* {{{ includes
*/
@@ -1804,7 +1804,7 @@
}
if (ret == -1 auth auth[0] != '\0' strncmp(auth, Digest , 7)
== 0) {
- SG(request_info).auth_digest = estrdup(auth);
+ SG(request_info).auth_digest = estrdup(auth + 7);
ret = 0;
}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.222r2=1.2027.2.223ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.222 php-src/NEWS:1.2027.2.223
--- php-src/NEWS:1.2027.2.222 Thu Nov 24 15:06:11 2005
+++ php-src/NEWSThu Nov 24 19:02:16 2005
@@ -8,6 +8,7 @@
- Fixed bug #35360 (exceptions in interactive mode (php -a) may cause crash).
(Dmitry)
- Fixed bug #35358 (Incorrect error messages for PDO class constants). (Ilia)
+- Fixed bug #35170 (PHP_AUTH_DIGEST differs under Apache 1.x and 2.x). (Ilia)
24 Nov 2005, PHP 5.1
- Added support for class constants and static members for internal classes.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
iliaa Thu Nov 24 19:07:57 2005 EDT
Modified files:
/php-src/main main.c
Log:
MFB51: Fixed bug #35170 (PHP_AUTH_DIGEST differs under Apache 1.x and 2.x)
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.652r2=1.653ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.652 php-src/main/main.c:1.653
--- php-src/main/main.c:1.652 Fri Nov 18 11:20:43 2005
+++ php-src/main/main.c Thu Nov 24 19:07:57 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.652 2005/11/18 16:20:43 rasmus Exp $ */
+/* $Id: main.c,v 1.653 2005/11/25 00:07:57 iliaa Exp $ */
/* {{{ includes
*/
@@ -1924,7 +1924,7 @@
}
if (ret == -1 auth auth[0] != '\0' strncmp(auth, Digest , 7)
== 0) {
- SG(request_info).auth_digest = estrdup(auth);
+ SG(request_info).auth_digest = estrdup(auth + 7);
ret = 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_dbh.c
wez Thu Nov 24 19:20:14 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdopdo_dbh.c Log: well, what do you know, it does do something. http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.17r2=1.82.2.18ty=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.17 php-src/ext/pdo/pdo_dbh.c:1.82.2.18 --- php-src/ext/pdo/pdo_dbh.c:1.82.2.17 Thu Nov 24 16:46:56 2005 +++ php-src/ext/pdo/pdo_dbh.c Thu Nov 24 19:20:12 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_dbh.c,v 1.82.2.17 2005/11/24 21:46:56 wez Exp $ */ +/* $Id: pdo_dbh.c,v 1.82.2.18 2005/11/25 00:20:12 wez Exp $ */ /* The PDO Database Handle Class */ @@ -1272,6 +1272,7 @@ REGISTER_PDO_CLASS_CONST_LONG(FETCH_FUNC, (long)PDO_FETCH_FUNC); REGISTER_PDO_CLASS_CONST_LONG(FETCH_GROUP,(long)PDO_FETCH_GROUP); REGISTER_PDO_CLASS_CONST_LONG(FETCH_UNIQUE,(long)PDO_FETCH_UNIQUE); + REGISTER_PDO_CLASS_CONST_LONG(FETCH_CLASSTYPE,(long)PDO_FETCH_CLASSTYPE); #if PHP_MAJOR_VERSION 5 || PHP_MINOR_VERSION = 1 REGISTER_PDO_CLASS_CONST_LONG(FETCH_SERIALIZE,(long)PDO_FETCH_SERIALIZE); #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_stmt.c
wez Thu Nov 24 19:29:06 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdopdo_stmt.c
Log:
Fix for #35332.
The problem is caused by the user mixing positional and named parameters.
PDO was blindly adding the parameters, unaware that the same parameters were
already allocated by position.
What we do now is register the parameter with the driver before adding it to
any hash. This gives the driver an opportunity to normalize the name and
parameter number. PDO can then ensure that only one entry is occupied in the
hash for a given parameter.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.18r2=1.118.2.19ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.18
php-src/ext/pdo/pdo_stmt.c:1.118.2.19
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.18 Thu Nov 24 11:21:41 2005
+++ php-src/ext/pdo/pdo_stmt.c Thu Nov 24 19:29:04 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.18 2005/11/24 16:21:41 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.19 2005/11/25 00:29:04 wez Exp $ */
/* The PDO Statement Handle Class */
@@ -288,7 +288,7 @@
ZVAL_ADDREF(param-driver_params);
}
- if (param-name stmt-columns) {
+ if (!is_param param-name stmt-columns) {
/* try to map the name to the column */
int i;
@@ -299,13 +299,15 @@
}
}
-#if 0
/* if you prepare and then execute passing an array of params
keyed by names,
* then this will trigger, and we don't want that */
if (param-paramno == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Did not
found column name '%s' in the defined columns; it will not be bound,
param-name);
}
-#endif
+ }
+
+ if (is_param !rewrite_name_to_position(stmt, param TSRMLS_CC)) {
+ return 0;
}
if (param-name) {
@@ -317,30 +319,26 @@
} else {
param-name = estrndup(param-name, param-namelen);
}
- zend_hash_update(hash, param-name, param-namelen, param,
sizeof(*param), (void**)pparam);
- } else {
- zend_hash_index_update(hash, param-paramno, param,
sizeof(*param), (void**)pparam);
- }
-
- if (is_param !rewrite_name_to_position(stmt, pparam TSRMLS_CC)) {
- return 0;
}
/* tell the driver we just created a parameter */
if (stmt-methods-param_hook) {
- if (!stmt-methods-param_hook(stmt, pparam,
+ if (!stmt-methods-param_hook(stmt, param,
PDO_PARAM_EVT_ALLOC TSRMLS_CC)) {
- /* driver indicates that the parameter doesn't exist.
-* remove it from our hash */
- if (pparam-name) {
- zend_hash_del(hash, pparam-name,
pparam-namelen);
- } else {
- zend_hash_index_del(hash, pparam-paramno);
- }
return 0;
}
}
+ if (param-paramno = 0) {
+ zend_hash_index_del(hash, param-paramno);
+ }
+
+ if (param-name) {
+ zend_hash_update(hash, param-name, param-namelen, param,
sizeof(*param), (void**)pparam);
+ } else {
+ zend_hash_index_update(hash, param-paramno, param,
sizeof(*param), (void**)pparam);
+ }
+
return 1;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mysqli/tests 009.phpt
andrey Thu Nov 24 20:13:58 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/mysqli/tests 009.phpt Log: fix test - unsigned it is casted to 0 in mysql sql_mode http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/009.phpt?r1=1.6.2.5r2=1.6.2.6ty=u Index: php-src/ext/mysqli/tests/009.phpt diff -u php-src/ext/mysqli/tests/009.phpt:1.6.2.5 php-src/ext/mysqli/tests/009.phpt:1.6.2.6 --- php-src/ext/mysqli/tests/009.phpt:1.6.2.5 Mon Nov 21 20:57:02 2005 +++ php-src/ext/mysqli/tests/009.phpt Thu Nov 24 20:13:56 2005 @@ -71,7 +71,7 @@ [4]= int(0) [5]= - string(13) - + int(0) [6]= int(100) } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_odbc pdo_odbc.c
wez Thu Nov 24 21:33:05 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_odbc pdo_odbc.c
Log:
Add pdo_odbc.db2_instance_name ini setting when built against DB2.
This is a convenience for setting up the DB2 environment more easily.
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/pdo_odbc.c?r1=1.14.2.3r2=1.14.2.4ty=u
Index: php-src/ext/pdo_odbc/pdo_odbc.c
diff -u php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.3
php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.4
--- php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.3Mon Oct 17 21:05:22 2005
+++ php-src/ext/pdo_odbc/pdo_odbc.c Thu Nov 24 21:33:04 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pdo_odbc.c,v 1.14.2.3 2005/10/18 01:05:22 dbs Exp $ */
+/* $Id: pdo_odbc.c,v 1.14.2.4 2005/11/25 02:33:04 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -74,6 +74,13 @@
SQLUINTEGER pdo_odbc_pool_mode = SQL_CP_ONE_PER_HENV;
#endif
+#if defined(DB2CLI_VER) !defined(PHP_WIN32)
+PHP_INI_BEGIN()
+ PHP_INI_ENTRY(pdo_odbc.db2_instance_name, NULL, PHP_INI_SYSTEM, NULL)
+PHP_INI_END()
+
+#endif
+
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(pdo_odbc)
{
@@ -85,6 +92,20 @@
return FAILURE;
}
+#if defined(DB2CLI_VER) !defined(PHP_WIN32)
+ REGISTER_INI_ENTRIES();
+ {
+ char *instance = INI_STR(pdo_odbc.db2_instance_name);
+ if (instance) {
+ char *env = malloc(sizeof(DB2INSTANCE=) +
strlen(instance));
+ strcpy(env, DB2INSTANCE=);
+ strcat(env, instance);
+ putenv(env);
+ /* after this point, we can't free env without breaking
the environment */
+ }
+ }
+#endif
+
#ifdef SQL_ATTR_CONNECTION_POOLING
/* ugh, we don't really like .ini stuff in PDO, but since ODBC
connection
* pooling is process wide, we can't set it from within the scope of a
@@ -125,6 +146,9 @@
*/
PHP_MSHUTDOWN_FUNCTION(pdo_odbc)
{
+#if defined(DB2CLI_VER) !defined(PHP_WIN32)
+ UNREGISTER_INI_ENTRIES();
+#endif
php_pdo_unregister_driver(pdo_odbc_driver);
return SUCCESS;
}
@@ -144,6 +168,9 @@
#endif
php_info_print_table_end();
+#if defined(DB2CLI_VER) !defined(PHP_WIN32)
+ DISPLAY_INI_ENTRIES();
+#endif
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_stmt.c
wez Thu Nov 24 22:23:21 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdopdo_stmt.c
Log:
Bug: when stringify fetch mode is on, and the driver returns a string instead
of a stream for a LOB parameter, PDO would incorrectly return NULL for that
column.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.19r2=1.118.2.20ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.19
php-src/ext/pdo/pdo_stmt.c:1.118.2.20
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.19 Thu Nov 24 19:29:04 2005
+++ php-src/ext/pdo/pdo_stmt.c Thu Nov 24 22:23:17 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.19 2005/11/25 00:29:04 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.20 2005/11/25 03:23:17 wez Exp $ */
/* The PDO Statement Handle Class */
@@ -517,6 +517,11 @@
} else {
ZVAL_NULL(dest);
}
+ } else {
+ ZVAL_STRINGL(dest, value, value_len,
!caller_frees);
+ if (caller_frees) {
+ caller_frees = 0;
+ }
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo/tests bug_34630.phpt
wez Thu Nov 24 22:24:32 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo/tests bug_34630.phpt
Log:
PDO support for LOBs in the postgres driver currently assumes bytea columns.
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/bug_34630.phpt?r1=1.1.2.3r2=1.1.2.4ty=u
Index: php-src/ext/pdo/tests/bug_34630.phpt
diff -u php-src/ext/pdo/tests/bug_34630.phpt:1.1.2.3
php-src/ext/pdo/tests/bug_34630.phpt:1.1.2.4
--- php-src/ext/pdo/tests/bug_34630.phpt:1.1.2.3Sun Oct 30 21:07:38 2005
+++ php-src/ext/pdo/tests/bug_34630.phptThu Nov 24 22:24:32 2005
@@ -14,10 +14,13 @@
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
-$is_oci = $db-getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci';
+$driver = $db-getAttribute(PDO::ATTR_DRIVER_NAME);
+$is_oci = $driver == 'oci';
if ($is_oci) {
$db-exec('CREATE TABLE test (id int NOT NULL PRIMARY KEY, val BLOB)');
+} else if ($driver == 'pgsql') {
+ $db-exec('CREATE TABLE test (id int NOT NULL PRIMARY KEY, val bytea)');
} else {
$db-exec('CREATE TABLE test (id int NOT NULL PRIMARY KEY, val
VARCHAR(256))');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_pgsql package.xml pgsql_driver.c pgsql_statement.c php_pdo_pgsql_int.h
wez Thu Nov 24 22:35:06 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_pgsql package.xml pgsql_driver.c pgsql_statement.c
php_pdo_pgsql_int.h
Log:
Addresses #35338.
Postgres client API is pretty poor, so we have zero idea about the actual
parameter types in a statement.
We now defer the preparation of a statement until the first call to execute is
made. At that point, we have the parameters defined by the calling script, so
we can use the typing specified there when we perform the prepare.
For PDO_PARAM_LOB parameters, we set the binary formatting flag.
We can't just set this flag for all parameters, because its meaning is not
string data, counted length but data is in native format. If this flag is
set for a numeric column and we send the number 1 formatted as a string, then
we will get an insufficient data left in message error message, because the
library was expecting sizeof(int4) bytes but only saw 1 byte for 1.
This is infuriating because we have no way to determine the datatypes for
parameters, and the type we explicitly set has to match the type in the
database. The only choice we're left with is telling postgres to deduce the
type; we still have no idea what type was deduced.
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/package.xml?r1=1.5.2.2r2=1.5.2.3ty=u
Index: php-src/ext/pdo_pgsql/package.xml
diff -u php-src/ext/pdo_pgsql/package.xml:1.5.2.2
php-src/ext/pdo_pgsql/package.xml:1.5.2.3
--- php-src/ext/pdo_pgsql/package.xml:1.5.2.2 Mon Oct 31 22:10:09 2005
+++ php-src/ext/pdo_pgsql/package.xml Thu Nov 24 22:35:04 2005
@@ -30,7 +30,7 @@
licensePHP/license
release
statebeta/state
- version1.0RC2/version
+ version1.0/version
date2005-11-01/date
notes
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.53r2=1.53.2.1ty=u
Index: php-src/ext/pdo_pgsql/pgsql_driver.c
diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.53
php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.1
--- php-src/ext/pdo_pgsql/pgsql_driver.c:1.53 Wed Aug 3 10:07:39 2005
+++ php-src/ext/pdo_pgsql/pgsql_driver.cThu Nov 24 22:35:04 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pgsql_driver.c,v 1.53 2005/08/03 14:07:39 sniper Exp $ */
+/* $Id: pgsql_driver.c,v 1.53.2.1 2005/11/25 03:35:04 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -153,8 +153,9 @@
}
#if HAVE_PQPREPARE
- if (!driver_options || pdo_attr_lval(driver_options,
- PDO_PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT, 0
TSRMLS_CC) == 0) {
+ if ((!driver_options || pdo_attr_lval(driver_options,
+ PDO_PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT, 0
TSRMLS_CC) == 0)
+PQprotocolVersion(H-server) 2) {
stmt-supports_placeholders = PDO_PLACEHOLDER_NAMED;
stmt-named_rewrite_template = $%d;
ret = pdo_parse_params(stmt, (char*)sql, sql_len, nsql,
nsql_len TSRMLS_CC);
@@ -169,41 +170,15 @@
}
spprintf(S-stmt_name, 0, pdo_pgsql_stmt_%08x, (unsigned
int)stmt);
- res = PQprepare(H-server, S-stmt_name, sql, 0, NULL);
+ /* that's all for now; we'll defer the actual prepare until the
first execute call */
+
if (nsql) {
- efree(nsql);
- }
- if (!res) {
- pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, NULL);
- return 0;
+ S-query = nsql;
+ } else {
+ S-query = estrdup(sql);
}
- /* check if the connection is using protocol version 2.0.
-* if that is the reason that the prepare failed, we want to
fall
-* through and let PDO emulate it for us */
- status = PQresultStatus(res);
- switch (status) {
- case PGRES_COMMAND_OK:
- case PGRES_TUPLES_OK:
- /* it worked */
- PQclear(res);
- return 1;
-
- case PGRES_BAD_RESPONSE:
- /* server is probably too old; fall through and
let
-* PDO emulate it */
- efree(S-stmt_name);
- S-stmt_name = NULL;
- PQclear(res);
- break;
-
- default:
- /* protocol 3.0 and above; hard error */
- pdo_pgsql_error(dbh, status,
pdo_pgsql_sqlstate(res));
- PQclear(res);
- return 0;
-
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo/tests bug_34630.phpt
wez Thu Nov 24 22:37:02 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo/tests bug_34630.phpt
Log:
actually, bytea is not required for LOBs in postgres; good!
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/bug_34630.phpt?r1=1.1.2.4r2=1.1.2.5ty=u
Index: php-src/ext/pdo/tests/bug_34630.phpt
diff -u php-src/ext/pdo/tests/bug_34630.phpt:1.1.2.4
php-src/ext/pdo/tests/bug_34630.phpt:1.1.2.5
--- php-src/ext/pdo/tests/bug_34630.phpt:1.1.2.4Thu Nov 24 22:24:32 2005
+++ php-src/ext/pdo/tests/bug_34630.phptThu Nov 24 22:37:01 2005
@@ -19,8 +19,6 @@
if ($is_oci) {
$db-exec('CREATE TABLE test (id int NOT NULL PRIMARY KEY, val BLOB)');
-} else if ($driver == 'pgsql') {
- $db-exec('CREATE TABLE test (id int NOT NULL PRIMARY KEY, val bytea)');
} else {
$db-exec('CREATE TABLE test (id int NOT NULL PRIMARY KEY, val
VARCHAR(256))');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo TODO
wez Fri Nov 25 02:23:55 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdoTODO Log: Update the TODO list. http://cvs.php.net/diff.php/php-src/ext/pdo/TODO?r1=1.6r2=1.6.2.1ty=u Index: php-src/ext/pdo/TODO diff -u php-src/ext/pdo/TODO:1.6 php-src/ext/pdo/TODO:1.6.2.1 --- php-src/ext/pdo/TODO:1.6Sun Feb 6 16:05:59 2005 +++ php-src/ext/pdo/TODOFri Nov 25 02:23:55 2005 @@ -1,21 +1,93 @@ -$Id: TODO,v 1.6 2005/02/06 21:05:59 wez Exp $ +$Id: TODO,v 1.6.2.1 2005/11/25 07:23:55 wez Exp $ -In no particular order: +Roadmap for PDO -Probable Bugs: -- persistent connections with bound parameters might segv on subsequent - requests +Core, version 1.1: +== -Low-level: + - Separate the handle factory call into two phases: + - handle creation + - connecting -- $dbh-quote() -- LOB support via Streams API -- make errors generated at the pdo level (as opposed to driver level) use the - selected error mode. + This would then allow PDO to call setAttribute() + for each driver option specified in the constructor. + Right now, the handling of driver attributes is a bit sloppy. -Not-so-low-level: -- fetchAll(), single row, single column fetches etc. + - Add: + pdo.max_persistent + pdo.persistent_timeout + pdo.ping_interval -Could be more... + with the same meanings as those options from oci8. + + - BLOB/CLOB. + Investigate the various APIs to determine if we can + transparently map BLOBs and CLOBs as PDO_PARAM_LOB. + If the API needs hints from the client side, we need + to introduce a PDO_PARAM_CLOB to differentiate between + binary and character data. + + - Character set selection. + Generalize/standardize this. + + - meta data. + Formalize getColumnMeta(). + Look at retrieving lists of tables and other objects in the db. + + - tracing/logging/debugging + Add ini options: + + pdo.trace_file + pdo.enable_tracing + + And corresponding attributes, ATTR_TRACE_FILE, ATTR_TRACING_ENABLE, + settable at dbh and stmt levels independently. If set at the dbh level, + the stmt will inherit its value. If not set explicitly in code, the + defaults for the dbh will come from the INI settings. + + ATTR_TRACE_FILE will accept a string or a stream. + + The INI options are useful for administrative tracing/debugging. + Trace mode will output very verbose info. + + +General DB API Roundup: += + Consider how the following can be implemented in PDO: + + mysqli_change_user(); alters auth credentials on a live connection + mysqli_info(); info about rows affected by last query + mysqli_master_query(); force query to run on master + mysqli_ping(); ping / reconnect + mysqli_stat(); one line summary of server status + + oci_password_change() + + Also consider master/slave and/or failover server configuration. + + +Postgres: += + + - Real large object support. + - Someone with more pgsql experience can suggest more features + +Oracle: +=== + + - Support for array types and collections. + +Userspace PDO Driver: += + + - Will be hard. + +PDO Session module: +=== + + - Is it worth writing in C? + Probably not. + + +vim:se et ts=2 sw=2 tw=78: -vim:tw=78:et -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
