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

2005-09-10 Thread changelog
changelog   Sun Sep 11 01:44:16 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2099r2=1.2100ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2099 php-src/ChangeLog:1.2100
--- php-src/ChangeLog:1.2099Sat Sep 10 01:39:47 2005
+++ php-src/ChangeLog   Sun Sep 11 01:43:58 2005
@@ -1,3 +1,18 @@
+2005-09-10  Wez Furlong  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  ext/standard/var.c:
+  allow exceptions thrown in __sleep to interrupt the serialization 
process.
+  refs PECL #5217
+
+2005-09-10  Derick Rethans  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  configure.in
+  main/php_version.h:
+  - Fix version numbers as discussed to help version_compare for the PEAR
+  folks.
+
 2005-09-09  Rolland Santimano  [EMAIL PROTECTED]
 
 * ext/standard/string.c:
@@ -11679,7 +11694,7 @@
 
 * (PHP_4_3)
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2099 2005/09/10 05:39:47 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2100 2005/09/11 05:43:58 changelog Exp $ tag
 
 * (PHP_5_0)
   ext/standard/url_scanner_ex.c:
@@ -15080,7 +15095,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.2099 2005/09/10 05:39:47 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.2100 2005/09/11 05:43:58 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -15561,7 +15576,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.2099 2005/09/10 05:39:47 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.2100 2005/09/11 05:43:58 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -17035,7 +17050,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2099 2005/09/10 05:39:47 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2100 2005/09/11 05:43:58 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:


[PHP-CVS] cvs: CVSROOT / avail

2005-09-10 Thread Martin Jansen
mj  Sat Sep 10 08:54:09 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  * Karma for peardoc and pear/HTML_Table for Mark Wiesemann.
  
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1021r2=1.1022ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1021 CVSROOT/avail:1.1022
--- CVSROOT/avail:1.1021Fri Sep  9 19:39:26 2005
+++ CVSROOT/avail   Sat Sep 10 08:54:08 2005
@@ -68,7 +68,7 @@
 
avail|arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola,silvano|pearweb/weeklynews
 
 # Some people get access to the peardoc
-avail|vincentlascaux,damian,techtonik,sroebke,thierry_bo,schst,mcgyver5,sousk,gurugeek,norbert_m,didou,poz,romain,haruki,jurbo,kusor,cipri,yannick,radzaw,adamg,justinpatrin,peterhuewe,ssttoo,jausions,mfonda,shimooka,jystewart|peardoc
+avail|vincentlascaux,damian,techtonik,sroebke,thierry_bo,schst,mcgyver5,sousk,gurugeek,norbert_m,didou,poz,romain,haruki,jurbo,kusor,cipri,yannick,radzaw,adamg,justinpatrin,peterhuewe,ssttoo,jausions,mfonda,shimooka,jystewart,wiesemann|peardoc
 avail|elf|peardoc/ja
 
 # Some people get only access to specific languages for phpdoc
@@ -256,7 +256,7 @@
 avail|johannes|pecl/idn
 avail|jimi|smbc
 avail|justinpatrin|pear/DB_DataObject_FormBuilder
-avail|wiesemann|pear/DB_Table
+avail|wiesemann|pear/DB_Table,pear/HTML_Table
 avail|jausions|pear/Template
 avail|schst,luckec|pecl/id3
 avail|gabe,jlesueur|pecl/zeroconf

-- 
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 /ext/pdo/tests pdo_028.phpt

2005-09-10 Thread Wez Furlong
wez Sat Sep 10 11:32:05 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/pdo/tests  pdo_028.phpt 

  Modified files:  
/php-src/ext/pdopdo_stmt.c 
  Log:
  Add PDOStatement::bindValue(), which is similar to bindParam(), except that
  it binds the value of the zval at the time it is called, rather than keeping
  a reference to the zval and taking the value at execute() time.
  
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.1r2=1.118.2.2ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.1 
php-src/ext/pdo/pdo_stmt.c:1.118.2.2
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.1Thu Sep  1 10:44:11 2005
+++ php-src/ext/pdo/pdo_stmt.c  Sat Sep 10 11:32:04 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.1 2005/09/01 14:44:11 gschlossnagle Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.2 2005/09/10 15:32:04 wez Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -1393,6 +1393,36 @@
return really_register_bound_param(param, stmt, is_param TSRMLS_CC);
 } /* }}} */
 
+/* {{{ proto bool PDOStatement::bindValue(mixed $paramno, mixed $param [, int 
$type ])
+   bind an input parameter to the value of a PHP variable.  $paramno is the 
1-based position of the placeholder in the SQL statement (but can be the 
parameter name for drivers that support named placeholders).  It should be 
called prior to execute(). */
+static PHP_METHOD(PDOStatement, bindValue)
+{
+   pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(getThis() 
TSRMLS_CC);
+   struct pdo_bound_param_data param = {0};
+
+   param.paramno = -1;
+   param.param_type = PDO_PARAM_STR;
+
+   if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, 
ZEND_NUM_ARGS() TSRMLS_CC,
+   lz/|l, param.paramno, param.parameter, 
param.param_type)) {
+   if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
sz/|l, param.name,
+   param.namelen, param.parameter, 
param.param_type)) {
+   RETURN_FALSE;
+   }   
+   }
+
+   if (param.paramno  0) {
+   --param.paramno; /* make it zero-based internally */
+   } else if (!param.name) {
+   pdo_raise_impl_error(stmt-dbh, stmt, HY093, 
Columns/Parameters are 1-based TSRMLS_CC);
+   RETURN_FALSE;
+   }
+
+   RETURN_BOOL(really_register_bound_param(param, stmt, TRUE TSRMLS_CC));
+}
+/* }}} */
+
+
 /* {{{ proto bool PDOStatement::bindParam(mixed $paramno, mixed $param [, int 
$type [, int $maxlen [, mixed $driverdata]]])
bind a parameter to a PHP variable.  $paramno is the 1-based position of 
the placeholder in the SQL statement (but can be the parameter name for drivers 
that support named placeholders).  This isn't supported by all drivers.  It 
should be called prior to execute(). */
 static PHP_METHOD(PDOStatement, bindParam)
@@ -1835,6 +1865,7 @@
PHP_ME(PDOStatement, fetch, NULL,   
ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, bindParam, second_arg_force_ref,   
ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, bindColumn,second_arg_force_ref,   
ZEND_ACC_PUBLIC)
+   PHP_ME(PDOStatement, bindValue, NULL,   
ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, rowCount,  NULL,   
ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, fetchColumn,   NULL,   
ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, fetchAll,  NULL,   
ZEND_ACC_PUBLIC)

http://cvs.php.net/co.php/php-src/ext/pdo/tests/pdo_028.phpt?r=1.1p=1
Index: php-src/ext/pdo/tests/pdo_028.phpt
+++ php-src/ext/pdo/tests/pdo_028.phpt

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



[PHP-CVS] cvs: php-src(PHP_5_1) / configure.in /main php_version.h

2005-09-10 Thread Derick Rethans
derick  Sat Sep 10 11:44:17 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  - Fix version numbers as discussed to help version_compare for the PEAR folks.
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.6r2=1.579.2.7ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.6 php-src/configure.in:1.579.2.7
--- php-src/configure.in:1.579.2.6  Sat Aug 27 21:10:00 2005
+++ php-src/configure.inSat Sep 10 11:44:15 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.6 2005/08/28 01:10:00 sniper Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.7 2005/09/10 15:44:15 derick Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=1
 RELEASE_VERSION=0
-EXTRA_VERSION=-dev
+EXTRA_VERSION=RC2-dev
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.112.2.4r2=1.112.2.5ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.4 
php-src/main/php_version.h:1.112.2.5
--- php-src/main/php_version.h:1.112.2.4Tue Aug 16 08:01:42 2005
+++ php-src/main/php_version.h  Sat Sep 10 11:44:17 2005
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 1
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.1.0-dev
+#define PHP_EXTRA_VERSION RC2-dev
+#define PHP_VERSION 5.1.0RC2-dev

-- 
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/standard var.c

2005-09-10 Thread Wez Furlong
wez Sat Sep 10 13:47:22 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/standard   var.c 
  Log:
  allow exceptions thrown in __sleep to interrupt the serialization process. 
refs PECL #5217
  
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.203r2=1.203.2.1ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203 php-src/ext/standard/var.c:1.203.2.1
--- php-src/ext/standard/var.c:1.203Wed Aug  3 10:08:15 2005
+++ php-src/ext/standard/var.c  Sat Sep 10 13:47:20 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: var.c,v 1.203 2005/08/03 14:08:15 sniper Exp $ */
+/* $Id: var.c,v 1.203.2.1 2005/09/10 17:47:20 wez Exp $ */
 
 
 
@@ -711,13 +711,20 @@
}

if (ce  ce != PHP_IC_ENTRY 
-   zend_hash_exists(ce-function_table, 
__sleep, sizeof(__sleep))) {
+   
zend_hash_exists(ce-function_table, __sleep, sizeof(__sleep))) {
INIT_PZVAL(fname);
ZVAL_STRINGL(fname, __sleep, 
sizeof(__sleep) - 1, 0);
res = 
call_user_function_ex(CG(function_table), struc, fname, 

retval_ptr, 0, 0, 1, NULL TSRMLS_CC);
 
if (res == SUCCESS) {
+   if (EG(exception)) {
+   /* allow exceptions to 
bubble up */
+   if (retval_ptr) {
+   
zval_ptr_dtor(retval_ptr);
+   }
+   return;
+   }
if (retval_ptr) {
if 
(HASH_OF(retval_ptr)) {

php_var_serialize_class(buf, struc, retval_ptr, 

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_dbh.c pdo_stmt.c /ext/pdo/tests pecl_bug_5217.phpt

2005-09-10 Thread Wez Furlong
wez Sat Sep 10 13:48:45 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/pdo/tests  pecl_bug_5217.phpt 

  Modified files:  
/php-src/ext/pdopdo_dbh.c pdo_stmt.c 
  Log:
  add __sleep and __wakeup functions to prevent serialize/deserialize from 
being used on PDO objects.  Refs PECL #5217
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82r2=1.82.2.1ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82 php-src/ext/pdo/pdo_dbh.c:1.82.2.1
--- php-src/ext/pdo/pdo_dbh.c:1.82  Mon Jul 11 22:40:59 2005
+++ php-src/ext/pdo/pdo_dbh.c   Sat Sep 10 13:48:43 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.82 2005/07/12 02:40:59 wez Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.1 2005/09/10 17:48:43 wez Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -960,6 +960,22 @@
 }
 /* }}} */
 
+/* {{{ proto int PDO::__wakeup()
+   Prevents use of a PDO instance that has been unserialized */
+static PHP_METHOD(PDO, __wakeup)
+{
+   zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, You 
cannot serialize or unserialize PDO instances);
+}
+/* }}} */
+
+/* {{{ proto int PDO::__sleep()
+   Prevents serialization of a PDO instance */
+static PHP_METHOD(PDO, __sleep)
+{
+   zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, You 
cannot serialize or unserialize PDO instances);
+}
+/* }}} */
+
 
 function_entry pdo_dbh_functions[] = {
PHP_ME_MAPPING(__construct, dbh_constructor,NULL)
@@ -975,6 +991,8 @@
PHP_ME(PDO, errorInfo,  NULL,   
ZEND_ACC_PUBLIC)
PHP_ME(PDO, getAttribute,   NULL,   
ZEND_ACC_PUBLIC)
PHP_ME(PDO, quote,  NULL,   
ZEND_ACC_PUBLIC)
+   PHP_ME(PDO, __wakeup,   NULL,   
ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+   PHP_ME(PDO, __sleep,NULL,   
ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
{NULL, NULL, NULL}
 };
 
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.2r2=1.118.2.3ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.2 
php-src/ext/pdo/pdo_stmt.c:1.118.2.3
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.2Sat Sep 10 11:32:04 2005
+++ php-src/ext/pdo/pdo_stmt.c  Sat Sep 10 13:48:44 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.2 2005/09/10 15:32:04 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.3 2005/09/10 17:48:44 wez Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -1859,6 +1859,21 @@
 }
 /* }}} */
 
+/* {{{ proto int PDOStatement::__wakeup()
+   Prevents use of a PDOStatement instance that has been unserialized */
+static PHP_METHOD(PDOStatement, __wakeup)
+{
+   zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, You 
cannot serialize or unserialize PDOStatement instances);
+}
+/* }}} */
+
+/* {{{ proto int PDOStatement::__sleep()
+   Prevents serialization of a PDOStatement instance */
+static PHP_METHOD(PDOStatement, __sleep)
+{
+   zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, You 
cannot serialize or unserialize PDOStatement instances);
+}
+/* }}} */
 
 function_entry pdo_dbstmt_functions[] = {
PHP_ME(PDOStatement, execute,   NULL,   
ZEND_ACC_PUBLIC)
@@ -1880,6 +1895,8 @@
PHP_ME(PDOStatement, nextRowset,NULL,   
ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, closeCursor,   NULL,   
ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, debugDumpParams, NULL, 
ZEND_ACC_PUBLIC)
+   PHP_ME(PDOStatement, __wakeup,  NULL,   
ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+   PHP_ME(PDOStatement, __sleep,   NULL,   
ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
{NULL, NULL, NULL}
 };
 

http://cvs.php.net/co.php/php-src/ext/pdo/tests/pecl_bug_5217.phpt?r=1.1p=1
Index: php-src/ext/pdo/tests/pecl_bug_5217.phpt
+++ php-src/ext/pdo/tests/pecl_bug_5217.phpt

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql/tests pecl_bug_5200.phpt

2005-09-10 Thread Wez Furlong
wez Sat Sep 10 15:27:31 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql/testspecl_bug_5200.phpt 
  Log:
  Add test for this bug report; can't repeat the problem.
  
  
  

http://cvs.php.net/co.php/php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt?r=1.1p=1
Index: php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt
+++ php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt

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



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

2005-09-10 Thread Wez Furlong
wez Sat Sep 10 15:32:17 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdopdo_stmt.c 
  Log:
  closes PECL #5027; PDO_FETCH_NAMED not handled via setFetchMode().
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.3r2=1.118.2.4ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.3 
php-src/ext/pdo/pdo_stmt.c:1.118.2.4
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.3Sat Sep 10 13:48:44 2005
+++ php-src/ext/pdo/pdo_stmt.c  Sat Sep 10 15:32:15 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.3 2005/09/10 17:48:44 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.4 2005/09/10 19:32:15 wez Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -1646,6 +1646,7 @@
case PDO_FETCH_BOTH:
case PDO_FETCH_OBJ:
case PDO_FETCH_BOUND:
+   case PDO_FETCH_NAMED:
break;
 
case PDO_FETCH_COLUMN:
@@ -1713,7 +1714,11 @@
break;

default:
-   pdo_raise_impl_error(stmt-dbh, stmt, 22003, mode is 
out of range TSRMLS_CC);
+   if ((mode  ~PDO_FETCH_FLAGS)  PDO_FETCH__MAX  (mode 
 ~PDO_FETCH_FLAGS) = 0) {
+   pdo_raise_impl_error(stmt-dbh, stmt, 22003, 
unhandled mode; this is a PDO bug, please report it TSRMLS_CC);
+   } else {
+   pdo_raise_impl_error(stmt-dbh, stmt, 22003, 
mode is out of range TSRMLS_CC);
+   }
return FAILURE;
}
 

-- 
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.c pdo_sql_parser.re

2005-09-10 Thread Wez Furlong
wez Sat Sep 10 16:58:22 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdopdo.c pdo_sql_parser.re 
  Log:
  actually register PDO_PARAM_BOOL as a constant (doh!).
  When emulating bound parameters, pass booleans via the driver's quoter
  method, so that is has an opportunity to tweak it.
  Refs #33876: PDO misquotes/miscasts bool(false)
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.57r2=1.57.2.1ty=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57 php-src/ext/pdo/pdo.c:1.57.2.1
--- php-src/ext/pdo/pdo.c:1.57  Tue Jul 26 22:39:11 2005
+++ php-src/ext/pdo/pdo.c   Sat Sep 10 16:58:19 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo.c,v 1.57 2005/07/27 02:39:11 wez Exp $ */
+/* $Id: pdo.c,v 1.57.2.1 2005/09/10 20:58:19 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -295,6 +295,7 @@
le_ppdo = zend_register_list_destructors_ex(NULL, php_pdo_pdbh_dtor,
PDO persistent database, module_number);
 
+   REGISTER_LONG_CONSTANT(PDO_PARAM_BOOL, (long)PDO_PARAM_BOOL,  
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(PDO_PARAM_NULL, (long)PDO_PARAM_NULL,  
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(PDO_PARAM_INT,  (long)PDO_PARAM_INT,   
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(PDO_PARAM_STR,  (long)PDO_PARAM_STR,   
CONST_CS|CONST_PERSISTENT);
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.1r2=1.28.2.2ty=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.1 
php-src/ext/pdo/pdo_sql_parser.re:1.28.2.2
--- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.1  Sat Sep  3 20:47:59 2005
+++ php-src/ext/pdo/pdo_sql_parser.re   Sat Sep 10 16:58:19 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_sql_parser.re,v 1.28.2.1 2005/09/04 00:47:59 edink Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.28.2.2 2005/09/10 20:58:19 wez Exp $ */
 
 #include php.h
 #include php_pdo_driver.h
@@ -210,8 +210,6 @@
plc-freeq = 0;
break;
 
-   case IS_BOOL:
-   
convert_to_long(param-parameter);
case IS_LONG:
case IS_DOUBLE:

convert_to_string(param-parameter);
@@ -220,6 +218,8 @@
plc-freeq = 0;
break;
 
+   case IS_BOOL:
+   
convert_to_long(param-parameter);
default:

convert_to_string(param-parameter);
if 
(!stmt-dbh-methods-quoter(stmt-dbh, Z_STRVAL_P(param-parameter),

-- 
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_sql_parser.c

2005-09-10 Thread Wez Furlong
wez Sat Sep 10 16:58:57 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdopdo_sql_parser.c 
  Log:
  and touch the generated file
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_sql_parser.c?r1=1.35.2.1r2=1.35.2.2ty=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.35.2.1 
php-src/ext/pdo/pdo_sql_parser.c:1.35.2.2
--- php-src/ext/pdo/pdo_sql_parser.c:1.35.2.1   Sat Sep  3 20:48:59 2005
+++ php-src/ext/pdo/pdo_sql_parser.cSat Sep 10 16:58:57 2005
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.9.9 on Sun Sep  4 02:48:16 2005 */
-#line 1 pdo_sql_parser.re
+/* Generated by re2c 0.9.9.rc1 on Sat Sep 10 15:53:03 2005 */
+#line 1 ext/pdo/pdo_sql_parser.re
 /*
   +--+
   | PHP Version 5|
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_sql_parser.c,v 1.35.2.1 2005/09/04 00:48:59 edink Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.35.2.2 2005/09/10 20:58:57 wez Exp $ */
 
 #include php.h
 #include php_pdo_driver.h
@@ -46,7 +46,7 @@
char *cursor = s-cur;
 
s-tok = cursor;
-   #line 55 pdo_sql_parser.re
+   #line 55 ext/pdo/pdo_sql_parser.re
 
 
{
@@ -85,7 +85,7 @@
162, 162, 162, 162, 162, 162, 162, 162, 
};
 
-#line 89 pdo_sql_parser.c
+#line 89 stdout
 {
YYCTYPE yych;
unsigned int yyaccept;
@@ -111,9 +111,9 @@
if(yych == '') goto yy28;
goto yy33;
 yy3:
-#line 63 pdo_sql_parser.re
+#line 63 ext/pdo/pdo_sql_parser.re
 { RET(PDO_PARSER_TEXT); }
-#line 117 pdo_sql_parser.c
+#line 117 stdout
 yy4:   yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yybm[0+yych]  16) {
@@ -148,9 +148,9 @@
}
goto yy7;
 yy7:
-#line 62 pdo_sql_parser.re
+#line 62 ext/pdo/pdo_sql_parser.re
 { RET(PDO_PARSER_BIND_POS); }
-#line 154 pdo_sql_parser.c
+#line 154 stdout
 yy8:   ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -160,15 +160,15 @@
}
goto yy10;
 yy10:
-#line 64 pdo_sql_parser.re
+#line 64 ext/pdo/pdo_sql_parser.re
 { RET(PDO_PARSER_TEXT); }
-#line 166 pdo_sql_parser.c
+#line 166 stdout
 yy11:  ++YYCURSOR;
goto yy12;
 yy12:
-#line 65 pdo_sql_parser.re
+#line 65 ext/pdo/pdo_sql_parser.re
 { RET(PDO_PARSER_EOI); }
-#line 172 pdo_sql_parser.c
+#line 172 stdout
 yy13:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -178,9 +178,9 @@
}
goto yy15;
 yy15:
-#line 60 pdo_sql_parser.re
+#line 60 ext/pdo/pdo_sql_parser.re
 { RET(PDO_PARSER_TEXT); }
-#line 184 pdo_sql_parser.c
+#line 184 stdout
 yy16:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -190,9 +190,9 @@
}
goto yy18;
 yy18:
-#line 61 pdo_sql_parser.re
+#line 61 ext/pdo/pdo_sql_parser.re
 { RET(PDO_PARSER_BIND); }
-#line 196 pdo_sql_parser.c
+#line 196 stdout
 yy19:  yyaccept = 1;
YYMARKER = ++YYCURSOR;
if((YYLIMIT - YYCURSOR)  2) YYFILL(2);
@@ -216,9 +216,9 @@
}
goto yy22;
 yy22:
-#line 59 pdo_sql_parser.re
+#line 59 ext/pdo/pdo_sql_parser.re
 { RET(PDO_PARSER_TEXT); }
-#line 222 pdo_sql_parser.c
+#line 222 stdout
 yy23:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -248,9 +248,9 @@
}
goto yy29;
 yy29:
-#line 58 pdo_sql_parser.re
+#line 58 ext/pdo/pdo_sql_parser.re
 { RET(PDO_PARSER_TEXT); }
-#line 254 pdo_sql_parser.c
+#line 254 stdout
 yy30:  yyaccept = 1;
YYMARKER = ++YYCURSOR;
if((YYLIMIT - YYCURSOR)  2) YYFILL(2);
@@ -287,7 +287,7 @@
goto yy29;
 }
 }
-#line 66 pdo_sql_parser.re
+#line 66 ext/pdo/pdo_sql_parser.re

 }
 
@@ -435,8 +435,6 @@
plc-freeq = 0;
break;
 
-   case IS_BOOL:
-   
convert_to_long(param-parameter);
case IS_LONG:
case IS_DOUBLE:

convert_to_string(param-parameter);
@@ -445,6 +443,8 @@
plc-freeq = 0;
break;
 
+   case IS_BOOL:
+   
convert_to_long(param-parameter);
default:

convert_to_string(param-parameter);
if 
(!stmt-dbh-methods-quoter(stmt-dbh, Z_STRVAL_P(param-parameter),

-- 
PHP CVS Mailing 

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_pgsql pgsql_statement.c /ext/pdo_pgsql/tests bug_33876.phpt

2005-09-10 Thread Wez Furlong
wez Sat Sep 10 17:00:53 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/pdo_pgsql/testsbug_33876.phpt 

  Modified files:  
/php-src/ext/pdo_pgsql  pgsql_statement.c 
  Log:
  if a php bolean makes it as far as the parameter callback, it must really need
  to be boolean; express is as native pgsql 't' or 'f'.
  
  Add a test case for Bug #33876, which is a partially bogus bug.
  
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.1r2=1.31.2.2ty=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.1 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.2
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.1Sat Sep  3 19:50:25 2005
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Sat Sep 10 17:00:52 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.31.2.1 2005/09/03 23:50:25 edink Exp $ */
+/* $Id: pgsql_statement.c,v 1.31.2.2 2005/09/10 21:00:52 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -203,6 +203,10 @@

Z_TYPE_P(param-parameter) == IS_NULL) {
S-param_values[param-paramno] 
= NULL;

S-param_lengths[param-paramno] = 0;
+   } else if (Z_TYPE_P(param-parameter) 
== IS_BOOL) {
+   S-param_values[param-paramno] 
= Z_BVAL_P(param-parameter) ? t : f;
+   
S-param_lengths[param-paramno] = 1;
+   
S-param_formats[param-paramno] = 1;
} else {

convert_to_string(param-parameter);
S-param_values[param-paramno] 
= Z_STRVAL_P(param-parameter);

http://cvs.php.net/co.php/php-src/ext/pdo_pgsql/tests/bug_33876.phpt?r=1.1p=1
Index: php-src/ext/pdo_pgsql/tests/bug_33876.phpt
+++ php-src/ext/pdo_pgsql/tests/bug_33876.phpt

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_oci oci_driver.c /ext/pdo_oci/tests bug_33707.phpt

2005-09-10 Thread Wez Furlong
wez Sat Sep 10 17:38:07 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/pdo_oci/tests  bug_33707.phpt 

  Modified files:  
/php-src/ext/pdo_ocioci_driver.c 
  Log:
  closes #33707: error information was not passed up to PDO::query().
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_driver.c?r1=1.24r2=1.24.2.1ty=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.24 
php-src/ext/pdo_oci/oci_driver.c:1.24.2.1
--- php-src/ext/pdo_oci/oci_driver.c:1.24   Mon Jul 11 23:18:17 2005
+++ php-src/ext/pdo_oci/oci_driver.cSat Sep 10 17:38:07 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.24 2005/07/12 03:18:17 wez Exp $ */
+/* $Id: oci_driver.c,v 1.24.2.1 2005/09/10 21:38:07 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -144,6 +144,18 @@
}
}
 
+   if (stmt) {
+   /* always propogate the error code back up to the dbh,
+* so that we can catch the error information when execute
+* is called via query.  See Bug #33707 */
+   if (H-einfo.errmsg) {
+   efree(H-einfo.errmsg);
+   }
+   H-einfo = *einfo;
+   H-einfo.errmsg = einfo-errmsg ? estrdup(einfo-errmsg) : NULL;
+   strcpy(dbh-error_code, stmt-error_code);
+   }
+
/* little mini hack so that we can use this code from the dbh ctor */
if (!dbh-methods) {
zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, 
SQLSTATE[%s]: %s, *pdo_err, einfo-errmsg);

http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/bug_33707.phpt?r=1.1p=1
Index: php-src/ext/pdo_oci/tests/bug_33707.phpt
+++ php-src/ext/pdo_oci/tests/bug_33707.phpt

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_firebird firebird_driver.c /ext/pdo_oci oci_driver.c

2005-09-10 Thread Wez Furlong
wez Sat Sep 10 21:42:41 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_ocioci_driver.c 
/php-src/ext/pdo_firebird   firebird_driver.c 
  Log:
  merge George's fixes back from HEAD
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.1r2=1.24.2.2ty=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.1 
php-src/ext/pdo_oci/oci_driver.c:1.24.2.2
--- php-src/ext/pdo_oci/oci_driver.c:1.24.2.1   Sat Sep 10 17:38:07 2005
+++ php-src/ext/pdo_oci/oci_driver.cSat Sep 10 21:42:38 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.24.2.1 2005/09/10 21:38:07 wez Exp $ */
+/* $Id: oci_driver.c,v 1.24.2.2 2005/09/11 01:42:38 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -431,7 +431,7 @@
{ dbname,   ,   0 }
};
 
-   php_pdo_parse_data_source(dbh-data_source, dbh-data_source_len, vars, 
4);
+   php_pdo_parse_data_source(dbh-data_source, dbh-data_source_len, vars, 
2);

H = pecalloc(1, sizeof(*H), dbh-is_persistent);
dbh-driver_data = H;
http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/firebird_driver.c?r1=1.17r2=1.17.2.1ty=u
Index: php-src/ext/pdo_firebird/firebird_driver.c
diff -u php-src/ext/pdo_firebird/firebird_driver.c:1.17 
php-src/ext/pdo_firebird/firebird_driver.c:1.17.2.1
--- php-src/ext/pdo_firebird/firebird_driver.c:1.17 Wed Aug  3 10:07:39 2005
+++ php-src/ext/pdo_firebird/firebird_driver.c  Sat Sep 10 21:42:41 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: firebird_driver.c,v 1.17 2005/08/03 14:07:39 sniper Exp $ */
+/* $Id: firebird_driver.c,v 1.17.2.1 2005/09/11 01:42:41 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -602,7 +602,7 @@
int i, ret = 0;
pdo_firebird_db_handle *H = dbh-driver_data = 
pecalloc(1,sizeof(*H),dbh-is_persistent);
 
-   php_pdo_parse_data_source(dbh-data_source, dbh-data_source_len, vars, 
2);
+   php_pdo_parse_data_source(dbh-data_source, dbh-data_source_len, vars, 
3);

do {
static char const dpb_flags[] = { 

-- 
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

2005-09-10 Thread Wez Furlong
wez Sun Sep 11 00:59:43 2005 EDT

  Modified files:  
/php-src/ext/pdo_sqlite sqlite_statement.c 
  Log:
  actually reset the statement when closeCursor() is called.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18r2=1.19ty=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18 
php-src/ext/pdo_sqlite/sqlite_statement.c:1.19
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18  Sat Jul 23 19:34:04 2005
+++ php-src/ext/pdo_sqlite/sqlite_statement.c   Sun Sep 11 00:59:41 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: sqlite_statement.c,v 1.18 2005/07/23 23:34:04 iliaa Exp $ */
+/* $Id: sqlite_statement.c,v 1.19 2005/09/11 04:59:41 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -281,6 +281,8 @@
 
 static int pdo_sqlite_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC)
 {
+   pdo_sqlite_stmt *S = (pdo_sqlite_stmt*)stmt-driver_data;
+   sqlite3_reset(S-stmt);
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/pdo_sqlite sqlite_statement.c

2005-09-10 Thread Wez Furlong
wez Sun Sep 11 01:00:12 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_sqlite sqlite_statement.c 
  Log:
  MFH: reset the statement when closeCursor() is called.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18r2=1.18.2.1ty=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18 
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.1
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18  Sat Jul 23 19:34:04 2005
+++ php-src/ext/pdo_sqlite/sqlite_statement.c   Sun Sep 11 01:00:12 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: sqlite_statement.c,v 1.18 2005/07/23 23:34:04 iliaa Exp $ */
+/* $Id: sqlite_statement.c,v 1.18.2.1 2005/09/11 05:00:12 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -281,6 +281,8 @@
 
 static int pdo_sqlite_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC)
 {
+   pdo_sqlite_stmt *S = (pdo_sqlite_stmt*)stmt-driver_data;
+   sqlite3_reset(S-stmt);
return 1;
 }
 

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



[PHP-CVS] cvs: php-src /ext/pdo package.xml pdo.c pdo_dbh.c pdo_sql_parser.re pdo_stmt.c php_pdo_int.h php_pdo_phpvers_compat.h /ext/pdo/tests pecl_bug_5217.phpt

2005-09-10 Thread Wez Furlong
wez Sun Sep 11 01:04:01 2005 EDT

  Added files: 
/php-src/ext/pdophp_pdo_phpvers_compat.h 

  Modified files:  
/php-src/ext/pdopackage.xml pdo.c pdo_dbh.c pdo_sql_parser.re 
pdo_stmt.c php_pdo_int.h 
/php-src/ext/pdo/tests  pecl_bug_5217.phpt 
  Log:
  Merge changes from 5.1 branch.
  Add compat header that allows PDO head to compile against PHP 5.0 and PHP 5.1.
  
  http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.19r2=1.20ty=u
Index: php-src/ext/pdo/package.xml
diff -u php-src/ext/pdo/package.xml:1.19 php-src/ext/pdo/package.xml:1.20
--- php-src/ext/pdo/package.xml:1.19Wed Jul 27 00:07:44 2005
+++ php-src/ext/pdo/package.xml Sun Sep 11 01:03:57 2005
@@ -41,8 +41,8 @@
  licensePHP/license
  release
   statebeta/state
-  version0.9/version
-  date2005-07-27/date
+  version1.1dev/version
+  date2005-09-11/date
 
   notes
 You need to install a PDO database driver to make use of PDO,
@@ -100,6 +100,7 @@
file role=src name=pdo_sql_parser.re/
file role=src name=pdo_sql_parser.c/
file role=src name=pdo_sqlstate.c/
+   file role=src name=php_pdo_phpvers_compat.h/
file role=src name=Makefile.frag/
 
file role=doc name=README/
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.59r2=1.60ty=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.59 php-src/ext/pdo/pdo.c:1.60
--- php-src/ext/pdo/pdo.c:1.59  Fri Aug 12 19:32:30 2005
+++ php-src/ext/pdo/pdo.c   Sun Sep 11 01:03:57 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo.c,v 1.59 2005/08/12 23:32:30 wez Exp $ */
+/* $Id: pdo.c,v 1.60 2005/09/11 05:03:57 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -60,6 +60,13 @@
return U_CLASS_ENTRY(pdo_exception_ce);
 }
 
+PDO_API char *php_pdo_str_tolower_dup(const char *src, int len)
+{
+   char *dest = emalloc(len + 1);
+   zend_str_tolower_copy(dest, src, len);
+   return dest;
+}
+
 zend_class_entry *pdo_dbh_ce, *pdo_dbstmt_ce, *pdo_row_ce;
 
 /* proto array pdo_drivers()
@@ -112,7 +119,7 @@
PHP_RINIT(pdo),
PHP_RSHUTDOWN(pdo),
PHP_MINFO(pdo),
-   0.9,
+   1.1dev,
STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -295,6 +302,7 @@
le_ppdo = zend_register_list_destructors_ex(NULL, php_pdo_pdbh_dtor,
PDO persistent database, module_number);
 
+   REGISTER_LONG_CONSTANT(PDO_PARAM_BOOL, (long)PDO_PARAM_BOOL,  
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(PDO_PARAM_NULL, (long)PDO_PARAM_NULL,  
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(PDO_PARAM_INT,  (long)PDO_PARAM_INT,   
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(PDO_PARAM_STR,  (long)PDO_PARAM_STR,   
CONST_CS|CONST_PERSISTENT);
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.88r2=1.89ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.88 php-src/ext/pdo/pdo_dbh.c:1.89
--- php-src/ext/pdo/pdo_dbh.c:1.88  Tue Aug 23 05:33:44 2005
+++ php-src/ext/pdo/pdo_dbh.c   Sun Sep 11 01:03:57 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.88 2005/08/23 09:33:44 dmitry Exp $ */
+/* $Id: pdo_dbh.c,v 1.89 2005/09/11 05:03:57 wez Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -432,9 +432,11 @@
ZVAL_ASCII_STRINGL(z_key, queryString, sizeof(queryString)-1, 0);
std_object_handlers.write_property(object, z_key, query_string 
TSRMLS_CC);
zval_ptr_dtor(query_string);
+#ifdef UG
if (UG(unicode)) {
zval_dtor(z_key);
}
+#endif
 
if (dbstmt_ce-constructor) {
zend_fcall_info fci;
@@ -504,7 +506,7 @@
 
if (ZEND_NUM_ARGS()  1  SUCCESS == 
zend_hash_index_find(Z_ARRVAL_P(options), PDO_ATTR_STATEMENT_CLASS, 
(void**)opt)) {
if (zend_hash_index_find(Z_ARRVAL_PP(opt), 0, (void**)item) == 
FAILURE
-   || (Z_TYPE_PP(item) != IS_STRING  Z_TYPE_PP(item) != 
IS_UNICODE)
+   || !PDO_ZVAL_PP_IS_TEXT(item)
|| zend_u_lookup_class(Z_TYPE_PP(item), 
Z_UNIVAL_PP(item), Z_UNILEN_PP(item), pce TSRMLS_CC) == FAILURE
) {
pdo_raise_impl_error(dbh, NULL, HY000, 
@@ -963,6 +965,21 @@
 }
 /* }}} */
 
+/* {{{ proto int PDO::__wakeup()
+   Prevents use of a PDO instance that has been unserialized */
+static PHP_METHOD(PDO, __wakeup)
+{
+   zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0 TSRMLS_CC, 
You cannot serialize or unserialize PDO instances);
+}
+/* }}} */
+
+/* {{{ proto int PDO::__sleep()
+   Prevents serialization of a PDO instance */
+static PHP_METHOD(PDO, __sleep)
+{
+   zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0 TSRMLS_CC, 
You cannot serialize or unserialize PDO instances);
+}
+/* }}} */
 
 function_entry 

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

2005-09-10 Thread Wez Furlong
wez Sun Sep 11 01:04:44 2005 EDT

  Modified files:  
/php-src/ext/pdopdo_sql_parser.c 
  Log:
  touch file
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_sql_parser.c?r1=1.36r2=1.37ty=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.36 
php-src/ext/pdo/pdo_sql_parser.c:1.37
--- php-src/ext/pdo/pdo_sql_parser.c:1.36   Sat Sep  3 20:58:49 2005
+++ php-src/ext/pdo/pdo_sql_parser.cSun Sep 11 01:04:43 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.9 on Sun Sep  4 02:58:35 2005 */
+/* Generated by re2c 0.9.9.rc1 on Sun Sep 11 00:03:44 2005 */
 #line 1 pdo_sql_parser.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_sql_parser.c,v 1.36 2005/09/04 00:58:49 edink Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.37 2005/09/11 05:04:43 wez Exp $ */
 
 #include php.h
 #include php_pdo_driver.h
@@ -85,7 +85,7 @@
162, 162, 162, 162, 162, 162, 162, 162, 
};
 
-#line 89 pdo_sql_parser.c
+#line 89 stdout
 {
YYCTYPE yych;
unsigned int yyaccept;
@@ -113,7 +113,7 @@
 yy3:
 #line 63 pdo_sql_parser.re
 { RET(PDO_PARSER_TEXT); }
-#line 117 pdo_sql_parser.c
+#line 117 stdout
 yy4:   yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yybm[0+yych]  16) {
@@ -150,7 +150,7 @@
 yy7:
 #line 62 pdo_sql_parser.re
 { RET(PDO_PARSER_BIND_POS); }
-#line 154 pdo_sql_parser.c
+#line 154 stdout
 yy8:   ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -162,13 +162,13 @@
 yy10:
 #line 64 pdo_sql_parser.re
 { RET(PDO_PARSER_TEXT); }
-#line 166 pdo_sql_parser.c
+#line 166 stdout
 yy11:  ++YYCURSOR;
goto yy12;
 yy12:
 #line 65 pdo_sql_parser.re
 { RET(PDO_PARSER_EOI); }
-#line 172 pdo_sql_parser.c
+#line 172 stdout
 yy13:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -180,7 +180,7 @@
 yy15:
 #line 60 pdo_sql_parser.re
 { RET(PDO_PARSER_TEXT); }
-#line 184 pdo_sql_parser.c
+#line 184 stdout
 yy16:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -192,7 +192,7 @@
 yy18:
 #line 61 pdo_sql_parser.re
 { RET(PDO_PARSER_BIND); }
-#line 196 pdo_sql_parser.c
+#line 196 stdout
 yy19:  yyaccept = 1;
YYMARKER = ++YYCURSOR;
if((YYLIMIT - YYCURSOR)  2) YYFILL(2);
@@ -218,7 +218,7 @@
 yy22:
 #line 59 pdo_sql_parser.re
 { RET(PDO_PARSER_TEXT); }
-#line 222 pdo_sql_parser.c
+#line 222 stdout
 yy23:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -250,7 +250,7 @@
 yy29:
 #line 58 pdo_sql_parser.re
 { RET(PDO_PARSER_TEXT); }
-#line 254 pdo_sql_parser.c
+#line 254 stdout
 yy30:  yyaccept = 1;
YYMARKER = ++YYCURSOR;
if((YYLIMIT - YYCURSOR)  2) YYFILL(2);
@@ -435,8 +435,6 @@
plc-freeq = 0;
break;
 
-   case IS_BOOL:
-   
convert_to_long(param-parameter);
case IS_LONG:
case IS_DOUBLE:

convert_to_string(param-parameter);
@@ -445,6 +443,8 @@
plc-freeq = 0;
break;
 
+   case IS_BOOL:
+   
convert_to_long(param-parameter);
default:

convert_to_string(param-parameter);
if 
(!stmt-dbh-methods-quoter(stmt-dbh, Z_STRVAL_P(param-parameter),

-- 
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 pdo.c

2005-09-10 Thread Wez Furlong
wez Sun Sep 11 01:06:33 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdopackage.xml pdo.c 
  Log:
  set version numbers to 1.0
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.19r2=1.19.2.1ty=u
Index: php-src/ext/pdo/package.xml
diff -u php-src/ext/pdo/package.xml:1.19 php-src/ext/pdo/package.xml:1.19.2.1
--- php-src/ext/pdo/package.xml:1.19Wed Jul 27 00:07:44 2005
+++ php-src/ext/pdo/package.xml Sun Sep 11 01:06:30 2005
@@ -40,9 +40,9 @@
  /description
  licensePHP/license
  release
-  statebeta/state
-  version0.9/version
-  date2005-07-27/date
+  statestable/state
+  version1.0/version
+  date2005-10-11/date
 
   notes
 You need to install a PDO database driver to make use of PDO,
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.57.2.1r2=1.57.2.2ty=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57.2.1 php-src/ext/pdo/pdo.c:1.57.2.2
--- php-src/ext/pdo/pdo.c:1.57.2.1  Sat Sep 10 16:58:19 2005
+++ php-src/ext/pdo/pdo.c   Sun Sep 11 01:06:30 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo.c,v 1.57.2.1 2005/09/10 20:58:19 wez Exp $ */
+/* $Id: pdo.c,v 1.57.2.2 2005/09/11 05:06:30 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -112,7 +112,7 @@
PHP_RINIT(pdo),
PHP_RSHUTDOWN(pdo),
PHP_MINFO(pdo),
-   0.9,
+   1.0,
STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

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



[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c /ext/pdo_oci oci_driver.c /ext/pdo_pgsql pgsql_statement.c /ext/pdo_sqlite sqlite_driver.c

2005-09-10 Thread Wez Furlong
wez Sun Sep 11 01:08:50 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
/php-src/ext/pdo_ocioci_driver.c 
/php-src/ext/pdo_pgsql  pgsql_statement.c 
/php-src/ext/pdo_sqlite sqlite_driver.c 
  Log:
  merge other PDO fixes from 5.1 branch.
  Allow pdo_sqlite to build against 5.0 and 5.1 too.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.63r2=1.64ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.63 
php-src/ext/pdo_mysql/mysql_driver.c:1.64
--- php-src/ext/pdo_mysql/mysql_driver.c:1.63   Tue Aug 30 23:48:01 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cSun Sep 11 01:08:47 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.63 2005/08/31 03:48:01 gschlossnagle Exp $ */
+/* $Id: mysql_driver.c,v 1.64 2005/09/11 05:08:47 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -424,7 +424,7 @@
}
 
dbname = vars[1].optval;
-host = vars[2].optval; 
+   host = vars[2].optval;  
if(vars[3].optval) {
port = atoi(vars[3].optval);
}
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_driver.c?r1=1.26r2=1.27ty=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.26 
php-src/ext/pdo_oci/oci_driver.c:1.27
--- php-src/ext/pdo_oci/oci_driver.c:1.26   Tue Aug 30 15:59:11 2005
+++ php-src/ext/pdo_oci/oci_driver.cSun Sep 11 01:08:49 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.26 2005/08/30 19:59:11 gschlossnagle Exp $ */
+/* $Id: oci_driver.c,v 1.27 2005/09/11 05:08:49 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -144,6 +144,18 @@
}
}
 
+   if (stmt) {
+   /* always propogate the error code back up to the dbh,
+* so that we can catch the error information when execute
+* is called via query.  See Bug #33707 */
+   if (H-einfo.errmsg) {
+   efree(H-einfo.errmsg);
+   }
+   H-einfo = *einfo;
+   H-einfo.errmsg = einfo-errmsg ? estrdup(einfo-errmsg) : NULL;
+   strcpy(dbh-error_code, stmt-error_code);
+   }
+
/* little mini hack so that we can use this code from the dbh ctor */
if (!dbh-methods) {
zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0 
TSRMLS_CC, SQLSTATE[%s]: %s, *pdo_err, einfo-errmsg);
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.32r2=1.33ty=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.32 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.33
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.32Sat Sep  3 19:52:56 2005
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Sun Sep 11 01:08:49 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.32 2005/09/03 23:52:56 edink Exp $ */
+/* $Id: pgsql_statement.c,v 1.33 2005/09/11 05:08:49 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -203,6 +203,10 @@

Z_TYPE_P(param-parameter) == IS_NULL) {
S-param_values[param-paramno] 
= NULL;

S-param_lengths[param-paramno] = 0;
+   } else if (Z_TYPE_P(param-parameter) 
== IS_BOOL) {
+   S-param_values[param-paramno] 
= Z_BVAL_P(param-parameter) ? t : f;
+   
S-param_lengths[param-paramno] = 1;
+   
S-param_formats[param-paramno] = 1;
} else {

convert_to_string(param-parameter);
S-param_values[param-paramno] 
= Z_STRVAL_P(param-parameter);
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite_driver.c?r1=1.22r2=1.23ty=u
Index: php-src/ext/pdo_sqlite/sqlite_driver.c
diff -u php-src/ext/pdo_sqlite/sqlite_driver.c:1.22 
php-src/ext/pdo_sqlite/sqlite_driver.c:1.23
--- php-src/ext/pdo_sqlite/sqlite_driver.c:1.22 Mon Aug 22 08:22:11 2005
+++ php-src/ext/pdo_sqlite/sqlite_driver.c  Sun Sep 11 01:08:49 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: sqlite_driver.c,v 1.22 2005/08/22 12:22:11 dmitry Exp $ */
+/* $Id: sqlite_driver.c,v 1.23 2005/09/11 05:08:49 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -457,7 +457,11 @@
char *func_name;
int func_name_len;
long argc = -1;
+#ifdef 

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo package.xml pdo.c /ext/pdo_dblib package.xml pdo_dblib.c /ext/pdo_firebird package.xml pdo_firebird.c /ext/pdo_mysql package.xml pdo_mysql.c /ext/pdo_oci p

2005-09-10 Thread Wez Furlong
wez Sun Sep 11 01:27:30 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdopackage.xml pdo.c 
/php-src/ext/pdo_dblib  package.xml pdo_dblib.c 
/php-src/ext/pdo_firebird   package.xml pdo_firebird.c 
/php-src/ext/pdo_mysql  package.xml pdo_mysql.c 
/php-src/ext/pdo_ocipackage.xml pdo_oci.c 
/php-src/ext/pdo_odbc   package.xml pdo_odbc.c 
/php-src/ext/pdo_pgsql  package.xml pdo_pgsql.c 
/php-src/ext/pdo_sqlite package.xml pdo_sqlite.c 
  Log:
  update package.xml files and version numbers, in anticipation of a big bunch 
of releases.
  
  http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.19.2.1r2=1.19.2.2ty=u
Index: php-src/ext/pdo/package.xml
diff -u php-src/ext/pdo/package.xml:1.19.2.1 
php-src/ext/pdo/package.xml:1.19.2.2
--- php-src/ext/pdo/package.xml:1.19.2.1Sun Sep 11 01:06:30 2005
+++ php-src/ext/pdo/package.xml Sun Sep 11 01:27:29 2005
@@ -40,9 +40,9 @@
  /description
  licensePHP/license
  release
-  statestable/state
-  version1.0/version
-  date2005-10-11/date
+  statebeta/state
+  version1.0RC1/version
+  date2005-09-11/date
 
   notes
 You need to install a PDO database driver to make use of PDO,
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.57.2.2r2=1.57.2.3ty=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57.2.2 php-src/ext/pdo/pdo.c:1.57.2.3
--- php-src/ext/pdo/pdo.c:1.57.2.2  Sun Sep 11 01:06:30 2005
+++ php-src/ext/pdo/pdo.c   Sun Sep 11 01:27:29 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo.c,v 1.57.2.2 2005/09/11 05:06:30 wez Exp $ */
+/* $Id: pdo.c,v 1.57.2.3 2005/09/11 05:27:29 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -112,7 +112,7 @@
PHP_RINIT(pdo),
PHP_RSHUTDOWN(pdo),
PHP_MINFO(pdo),
-   1.0,
+   1.0RC1,
STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/package.xml?r1=1.2r2=1.2.2.1ty=u
Index: php-src/ext/pdo_dblib/package.xml
diff -u php-src/ext/pdo_dblib/package.xml:1.2 
php-src/ext/pdo_dblib/package.xml:1.2.2.1
--- php-src/ext/pdo_dblib/package.xml:1.2   Wed Jul 27 00:20:50 2005
+++ php-src/ext/pdo_dblib/package.xml   Sun Sep 11 01:27:29 2005
@@ -24,11 +24,11 @@
  licensePHP/license
  release
   statebeta/state
-  version0.9/version
-  date2005-07-27/date
+  version1.0RC1/version
+  date2005-09-11/date
 
   notes
-   First ever PECL release.
+   Update code for API changes in PDO; no actual changes have been made to 
this driver.
   /notes
 
   filelist
@@ -44,7 +44,7 @@
   /filelist
   deps
dep type=php rel=ge version=5.0.3/
-   dep type=ext name=pdo rel=ge version=0.9/
+   dep type=ext name=pdo rel=ge version=1.0RC1/
   /deps
  /release
 /package
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.9r2=1.9.2.1ty=u
Index: php-src/ext/pdo_dblib/pdo_dblib.c
diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.9 
php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.1
--- php-src/ext/pdo_dblib/pdo_dblib.c:1.9   Tue Jul 26 23:12:43 2005
+++ php-src/ext/pdo_dblib/pdo_dblib.c   Sun Sep 11 01:27:29 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: pdo_dblib.c,v 1.9 2005/07/27 03:12:43 wez Exp $ */
+/* $Id: pdo_dblib.c,v 1.9.2.1 2005/09/11 05:27:29 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -65,7 +65,7 @@
NULL,
PHP_RSHUTDOWN(pdo_dblib),
PHP_MINFO(pdo_dblib),
-   0.9,
+   1.0RC1,
STANDARD_MODULE_PROPERTIES
 };
 
http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/package.xml?r1=1.7r2=1.7.2.1ty=u
Index: php-src/ext/pdo_firebird/package.xml
diff -u php-src/ext/pdo_firebird/package.xml:1.7 
php-src/ext/pdo_firebird/package.xml:1.7.2.1
--- php-src/ext/pdo_firebird/package.xml:1.7Wed Feb  9 00:26:38 2005
+++ php-src/ext/pdo_firebird/package.xmlSun Sep 11 01:27:29 2005
@@ -1,6 +1,6 @@
 ?xml version=1.0 encoding=iso-8859-1?
 !DOCTYPE package SYSTEM ../pear/package.dtd
-package version=1.0!-- $Id: package.xml,v 1.7 2005/02/09 05:26:38 wez Exp 
$ --
+package version=1.0!-- $Id: package.xml,v 1.7.2.1 2005/09/11 05:27:29 wez 
Exp $ --
  namePDO_FIREBIRD/name
  summaryFirebird/InterBase 6 driver for PDO/summary
  maintainers
@@ -21,8 +21,8 @@
  licensePHP/license
  release
   statebeta/state
-  version0.2/version
-  date2005-02-09/date
+  version0.3/version
+  date2005-09-11/date
 
   notes
To compile and run this module, you will need to have the main PDO module 
and Firebird's
@@ -51,7 +51,7 @@
   /filelist
   deps
dep type=php rel=ge version=5.0.3/
-   dep type=ext rel=ge name=pdo version=0.2/
+   dep type=ext rel=ge name=pdo version=1.0RC1/
   /deps
  /release
 /package
http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/pdo_firebird.c?r1=1.4r2=1.4.2.1ty=u
Index: php-src/ext/pdo_firebird/pdo_firebird.c
diff -u 

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite package.xml

2005-09-10 Thread Wez Furlong
wez Sun Sep 11 01:46:14 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_sqlite package.xml 
  Log:
  update manifest
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/package.xml?r1=1.10.2.1r2=1.10.2.2ty=u
Index: php-src/ext/pdo_sqlite/package.xml
diff -u php-src/ext/pdo_sqlite/package.xml:1.10.2.1 
php-src/ext/pdo_sqlite/package.xml:1.10.2.2
--- php-src/ext/pdo_sqlite/package.xml:1.10.2.1 Sun Sep 11 01:27:30 2005
+++ php-src/ext/pdo_sqlite/package.xml  Sun Sep 11 01:46:13 2005
@@ -76,6 +76,7 @@
 file role=src name=sqlite.pc.in/
 file role=src name=VERSION/
 dir name=src
+file role=src name=analyze.c/
 file role=src name=attach.c/
 file role=src name=alter.c/
 file role=src name=auth.c/
@@ -136,6 +137,7 @@
 file role=src name=vdbeapi.c/
 file role=src name=vdbeaux.c/
 file role=src name=vdbe.c/
+file role=src name=vdbefifo.c/
 file role=src name=vdbe.h/
 file role=src name=vdbeInt.h/
 file role=src name=vdbemem.c/

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