[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/pdo_sqlite sqlite_statement.c

[Ilia Alshanetsky]

iliaa           Wed Aug  1 22:45:32 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/pdo_sqlite     sqlite_statement.c 
    /php-src    NEWS 
  Log:
  
  Fixed bug #41831 (pdo_sqlite prepared statements convert resources to
  strings). 
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4.2.2&r2=1.18.2.4.2.3&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.2 
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.2      Mon Jan  1 
09:36:05 2007
+++ php-src/ext/pdo_sqlite/sqlite_statement.c   Wed Aug  1 22:45:31 2007
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: sqlite_statement.c,v 1.18.2.4.2.2 2007/01/01 09:36:05 sebastian Exp $ 
*/
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.3 2007/08/01 22:45:31 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -109,7 +109,7 @@
                                                        php_stream *stm;
                                                        
php_stream_from_zval_no_verify(stm, &param->parameter);
                                                        if (stm) {
-                                                               
SEPARATE_ZVAL_IF_NOT_REF(&param->parameter);
+                                                               
SEPARATE_ZVAL(&param->parameter);
                                                                
Z_TYPE_P(param->parameter) = IS_STRING;
                                                                
Z_STRLEN_P(param->parameter) = php_stream_copy_to_mem(stm,
                                                                        
&Z_STRVAL_P(param->parameter), PHP_STREAM_COPY_ALL, 0);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.871&r2=1.2027.2.547.2.872&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.871 php-src/NEWS:1.2027.2.547.2.872
--- php-src/NEWS:1.2027.2.547.2.871     Wed Aug  1 10:56:45 2007
+++ php-src/NEWS        Wed Aug  1 22:45:31 2007
@@ -122,6 +122,8 @@
   date_create or new DateTime). (Derick)
 - Fixed bug #41833 (addChild() on a non-existent node, no node created, 
   getName() segfaults). (Rob)
+- Fixed bug #41831 (pdo_sqlite prepared statements convert resources to
+  strings). (Ilia)
 - Fixed bug #41815 (Concurrent read/write fails when EOF is reached). (Sascha)
 - Fixed bug #41813 (segmentation fault when using string offset as an object).
   (judas dot iscariote at gmail dot com, Tony)

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