[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4
wez Sat Sep 24 22:28:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: reinstate this fix for building against PHP 5.0.x. This works fine against PHP 5.1 too; if you revert this, you'd better have an awesome technical reason, or I'll remove your karma. http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.4&r2=1.26.2.5&ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.4 php-src/ext/pdo_sqlite/config.m4:1.26.2.5 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.4 Sat Sep 24 19:33:58 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 22:28:42 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.4 2005/09/24 23:33:58 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.5 2005/09/25 02:28:42 wez Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -83,7 +83,7 @@ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, -$ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) +$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) AC_CHECK_SIZEOF(char *,4) -- 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 mysql_statement.c
wez Sat Sep 24 22:05:06 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql mysql_statement.c
Log:
Fixup LOB handling for inserts (refs #34630).
Also tripped over the return of PECL #5200; looks like mysql doesn't return an
accurate length for the columns. The PDO driver will sanity check the real
length against the buffer size it allocated (based on the info provided by
mysql), so that we won't overrun the buffer. In addition, if a varchar field
is reported as having a length of less than 128, we'll allocate 128 just in
case.
If the data is truncated, report it via the appropriate sqlstate code.
There must be a better way to do this stuff.
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.48.2.1&r2=1.48.2.2&ty=u
Index: php-src/ext/pdo_mysql/mysql_statement.c
diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.1
php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.2
--- php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.1Wed Aug 31 21:57:01 2005
+++ php-src/ext/pdo_mysql/mysql_statement.c Sat Sep 24 22:05:03 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mysql_statement.c,v 1.48.2.1 2005/09/01 01:57:01 iliaa Exp $ */
+/* $Id: mysql_statement.c,v 1.48.2.2 2005/09/25 02:05:03 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -142,6 +142,26 @@
S->fields[i].max_length? S->fields[i].max_length:
S->fields[i].length;
}
+#if 0
+ printf("%d: max_length=%d length=%d
buffer_length=%d type=%d\n",
+ i,
+ S->fields[i].max_length,
+ S->fields[i].length,
+
S->bound_result[i].buffer_length,
+ S->fields[i].type
+ );
+#endif
+
+ /* there are cases where the length
reported by mysql is too short.
+* eg: when describing a table that
contains an enum column. Since
+* we have no way of knowing the true
length either, we'll bump up
+* our buffer size to a reasonable
size, just in case */
+ if (S->fields[i].max_length == 0 &&
S->bound_result[i].buffer_length < 128 && MYSQL_TYPE_VAR_STRING) {
+
S->bound_result[i].buffer_length = 128;
+ }
+
+ S->out_length[i] = 0;
+
S->bound_result[i].buffer =
emalloc(S->bound_result[i].buffer_length);
S->bound_result[i].is_null =
&S->out_null[i];
S->bound_result[i].length =
&S->out_length[i];
@@ -291,9 +311,24 @@
}
switch (PDO_PARAM_TYPE(param->param_type)) {
- case PDO_PARAM_LOB:
case PDO_PARAM_STMT:
return 0;
+ case PDO_PARAM_LOB:
+ if (Z_TYPE_P(param->parameter)
== IS_RESOURCE) {
+ php_stream *stm;
+
php_stream_from_zval_no_verify(stm, ¶m->parameter);
+ if (stm) {
+
SEPARATE_ZVAL_IF_NOT_REF(¶m->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);
+ } else {
+
pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource");
+ return 0;
+ }
+ }
+ /* fall through */
+
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_oci oci_statement.c /ext/pdo_oci/tests bug_33707.phpt
wez Sat Sep 24 20:47:00 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_ocioci_statement.c
/php-src/ext/pdo_oci/tests bug_33707.phpt
Log:
refs #34630.
Real lob support for oracle will appear after the PHP 5.1 release.
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_statement.c?r1=1.16&r2=1.16.2.1&ty=u
Index: php-src/ext/pdo_oci/oci_statement.c
diff -u php-src/ext/pdo_oci/oci_statement.c:1.16
php-src/ext/pdo_oci/oci_statement.c:1.16.2.1
--- php-src/ext/pdo_oci/oci_statement.c:1.16Mon Jul 11 22:43:39 2005
+++ php-src/ext/pdo_oci/oci_statement.c Sat Sep 24 20:46:59 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: oci_statement.c,v 1.16 2005/07/12 02:43:39 wez Exp $ */
+/* $Id: oci_statement.c,v 1.16.2.1 2005/09/25 00:46:59 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -242,10 +242,26 @@
/* figure out what we're doing */
switch (PDO_PARAM_TYPE(param->param_type)) {
- case PDO_PARAM_LOB:
case PDO_PARAM_STMT:
return 0;
+ case PDO_PARAM_LOB:
+ /* fake lobs for now */
+ if (Z_TYPE_P(param->parameter)
== IS_RESOURCE) {
+ php_stream *stm;
+
php_stream_from_zval_no_verify(stm, ¶m->parameter);
+ if (stm) {
+
SEPARATE_ZVAL_IF_NOT_REF(¶m->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);
+ } else {
+
pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource");
+ return 0;
+ }
+ }
+ /* fall through */
+
case PDO_PARAM_STR:
default:
P->oci_type = SQLT_CHR;
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/tests/bug_33707.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u
Index: php-src/ext/pdo_oci/tests/bug_33707.phpt
diff -u php-src/ext/pdo_oci/tests/bug_33707.phpt:1.1.2.2
php-src/ext/pdo_oci/tests/bug_33707.phpt:1.1.2.3
--- php-src/ext/pdo_oci/tests/bug_33707.phpt:1.1.2.2Mon Sep 19 20:35:21 2005
+++ php-src/ext/pdo_oci/tests/bug_33707.phptSat Sep 24 20:47:00 2005
@@ -25,6 +25,6 @@
[1]=>
int(942)
[2]=>
- string(113) "OCIStmtExecute: ORA-00942: table or view does not exist
+ string(%d) "OCIStmtExecute: ORA-00942: table or view does not exist
(%s:%d)"
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
Jani, Informing people of the new way to use SQLite extension on Windows belongs to NEWS and release notes. Why give people less information? Please revert your change. Edin Jani Taskinen wrote: sniper Sat Sep 24 14:19:04 2005 EDT Modified files: (Branch: PHP_5_1) /php-src NEWS Log: Documentation belongs elsewhere http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.74&r2=1.2027.2.75&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.74 php-src/NEWS:1.2027.2.75 --- php-src/NEWS:1.2027.2.74Sat Sep 24 11:13:12 2005 +++ php-src/NEWSSat Sep 24 14:18:58 2005 @@ -1,9 +1,8 @@ PHPNEWS ||| ?? Aug 2005, PHP 5.1 Release Candidate 2 -- Bundle SQLite extension as a shared module in Windows distribution. This - means that the Windows users would have to add php_extension=php_sqlite.dll - into their php.ini to enable SQLite functionality. (Edin) +- Changed SQLite extension to be a shared module in Windows distribution. + (Edin) - Changed "instanceof" and "catch" operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) - 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(PHP_5_1) /ext/spl spl_iterators.h
helly Sat Sep 24 19:48:59 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/splspl_iterators.h Log: - MFH: Rename here too http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.h?r1=1.18.2.2&r2=1.18.2.3&ty=u Index: php-src/ext/spl/spl_iterators.h diff -u php-src/ext/spl/spl_iterators.h:1.18.2.2 php-src/ext/spl/spl_iterators.h:1.18.2.3 --- php-src/ext/spl/spl_iterators.h:1.18.2.2Sun Sep 18 13:15:04 2005 +++ php-src/ext/spl/spl_iterators.h Sat Sep 24 19:48:58 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.h,v 1.18.2.2 2005/09/18 17:15:04 helly Exp $ */ +/* $Id: spl_iterators.h,v 1.18.2.3 2005/09/24 23:48:58 helly Exp $ */ #ifndef SPL_ITERATORS_H #define SPL_ITERATORS_H @@ -28,7 +28,7 @@ #define spl_ce_Iterator zend_ce_iterator #define spl_ce_Aggregate zend_ce_aggregate #define spl_ce_ArrayAccess zend_ce_arrayaccess -#define spl_ce_Serializeable zend_ce_serializeable +#define spl_ce_Serializable zend_ce_serializable extern PHPAPI zend_class_entry *spl_ce_RecursiveIterator; extern PHPAPI zend_class_entry *spl_ce_RecursiveIteratorIterator; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.h
helly Sat Sep 24 19:48:27 2005 EDT Modified files: /php-src/ext/splspl_iterators.h Log: - Rename here too http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.h?r1=1.21&r2=1.22&ty=u Index: php-src/ext/spl/spl_iterators.h diff -u php-src/ext/spl/spl_iterators.h:1.21 php-src/ext/spl/spl_iterators.h:1.22 --- php-src/ext/spl/spl_iterators.h:1.21Sun Sep 18 12:51:20 2005 +++ php-src/ext/spl/spl_iterators.h Sat Sep 24 19:48:26 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.h,v 1.21 2005/09/18 16:51:20 helly Exp $ */ +/* $Id: spl_iterators.h,v 1.22 2005/09/24 23:48:26 helly Exp $ */ #ifndef SPL_ITERATORS_H #define SPL_ITERATORS_H @@ -28,7 +28,7 @@ #define spl_ce_Iterator zend_ce_iterator #define spl_ce_Aggregate zend_ce_aggregate #define spl_ce_ArrayAccess zend_ce_arrayaccess -#define spl_ce_Serializeable zend_ce_serializeable +#define spl_ce_Serializable zend_ce_serializable extern PHPAPI zend_class_entry *spl_ce_RecursiveIterator; extern PHPAPI zend_class_entry *spl_ce_RecursiveIteratorIterator; -- 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 config.m4
sniper Sat Sep 24 19:33:58 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: Revert the "fix". It works fine when you use PHP_5_1 http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.3&r2=1.26.2.4&ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.3 php-src/ext/pdo_sqlite/config.m4:1.26.2.4 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.3 Sat Sep 24 19:23:25 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 19:33:58 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.3 2005/09/24 23:23:25 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.4 2005/09/24 23:33:58 sniper Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -83,7 +83,7 @@ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, -$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) +$ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) AC_CHECK_SIZEOF(char *,4) -- 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_dblib config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_sqlite config.m4
sniper Sat Sep 24 19:23:25 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_dblib config.m4 /php-src/ext/pdo_mysql config.m4 /php-src/ext/pdo_ociconfig.m4 /php-src/ext/pdo_sqlite config.m4 Log: fix typo http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/config.m4?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/pdo_dblib/config.m4 diff -u php-src/ext/pdo_dblib/config.m4:1.2 php-src/ext/pdo_dblib/config.m4:1.2.2.1 --- php-src/ext/pdo_dblib/config.m4:1.2 Tue Jul 26 23:12:43 2005 +++ php-src/ext/pdo_dblib/config.m4 Sat Sep 24 19:23:24 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.2 2005/07/27 03:12:43 wez Exp $ +dnl $Id: config.m4,v 1.2.2.1 2005/09/24 23:23:24 sniper Exp $ dnl if test "$PHP_PDO" != "no"; then @@ -73,7 +73,7 @@ AC_DEFINE(HAVE_FREETDS,1,[ ]) PHP_SUBST(PDO_DBLIB_SHARED_LIBADD) - ifdef([PHP_ADD_EXTENDION_DEP], + ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo) ]) http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.25&r2=1.25.2.1&ty=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.25 php-src/ext/pdo_mysql/config.m4:1.25.2.1 --- php-src/ext/pdo_mysql/config.m4:1.25Tue Jul 26 22:39:46 2005 +++ php-src/ext/pdo_mysql/config.m4 Sat Sep 24 19:23:24 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2005/07/27 02:39:46 wez Exp $ +dnl $Id: config.m4,v 1.25.2.1 2005/09/24 23:23:24 sniper Exp $ dnl if test "$PHP_PDO" != "no"; then @@ -79,7 +79,7 @@ ]) PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path) - ifdef([PHP_ADD_EXTENDION_DEP], + ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo) ]) http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.14&r2=1.14.2.1&ty=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.14 php-src/ext/pdo_oci/config.m4:1.14.2.1 --- php-src/ext/pdo_oci/config.m4:1.14 Tue Jul 26 23:48:08 2005 +++ php-src/ext/pdo_oci/config.m4 Sat Sep 24 19:23:24 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2005/07/27 03:48:08 wez Exp $ +dnl $Id: config.m4,v 1.14.2.1 2005/09/24 23:23:24 sniper Exp $ if test "$PHP_PDO" != "no"; then @@ -199,7 +199,7 @@ PHP_SUBST_OLD(PDO_OCI_DIR) PHP_SUBST_OLD(PDO_OCI_VERSION) - ifdef([PHP_ADD_EXTENDION_DEP], + ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_oci, pdo) ]) http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.2&r2=1.26.2.3&ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.2 php-src/ext/pdo_sqlite/config.m4:1.26.2.3 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.2 Sat Sep 24 15:15:23 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 19:23:25 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.2 2005/09/24 19:15:23 wez Exp $ +dnl $Id: config.m4,v 1.26.2.3 2005/09/24 23:23:25 sniper Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -113,7 +113,7 @@ AC_CHECK_HEADERS(time.h) fi - ifdef([PHP_ADD_EXTENDION_DEP], + ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo) ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_dblib config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_sqlite config.m4
sniper Sat Sep 24 19:22:45 2005 EDT Modified files: /php-src/ext/pdo_dblib config.m4 /php-src/ext/pdo_mysql config.m4 /php-src/ext/pdo_ociconfig.m4 /php-src/ext/pdo_sqlite config.m4 Log: fix typo http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/config.m4?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo_dblib/config.m4 diff -u php-src/ext/pdo_dblib/config.m4:1.2 php-src/ext/pdo_dblib/config.m4:1.3 --- php-src/ext/pdo_dblib/config.m4:1.2 Tue Jul 26 23:12:43 2005 +++ php-src/ext/pdo_dblib/config.m4 Sat Sep 24 19:22:43 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.2 2005/07/27 03:12:43 wez Exp $ +dnl $Id: config.m4,v 1.3 2005/09/24 23:22:43 sniper Exp $ dnl if test "$PHP_PDO" != "no"; then @@ -73,7 +73,7 @@ AC_DEFINE(HAVE_FREETDS,1,[ ]) PHP_SUBST(PDO_DBLIB_SHARED_LIBADD) - ifdef([PHP_ADD_EXTENDION_DEP], + ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo) ]) http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.25&r2=1.26&ty=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.25 php-src/ext/pdo_mysql/config.m4:1.26 --- php-src/ext/pdo_mysql/config.m4:1.25Tue Jul 26 22:39:46 2005 +++ php-src/ext/pdo_mysql/config.m4 Sat Sep 24 19:22:43 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2005/07/27 02:39:46 wez Exp $ +dnl $Id: config.m4,v 1.26 2005/09/24 23:22:43 sniper Exp $ dnl if test "$PHP_PDO" != "no"; then @@ -79,7 +79,7 @@ ]) PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path) - ifdef([PHP_ADD_EXTENDION_DEP], + ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo) ]) http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.14&r2=1.15&ty=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.14 php-src/ext/pdo_oci/config.m4:1.15 --- php-src/ext/pdo_oci/config.m4:1.14 Tue Jul 26 23:48:08 2005 +++ php-src/ext/pdo_oci/config.m4 Sat Sep 24 19:22:43 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2005/07/27 03:48:08 wez Exp $ +dnl $Id: config.m4,v 1.15 2005/09/24 23:22:43 sniper Exp $ if test "$PHP_PDO" != "no"; then @@ -199,7 +199,7 @@ PHP_SUBST_OLD(PDO_OCI_DIR) PHP_SUBST_OLD(PDO_OCI_VERSION) - ifdef([PHP_ADD_EXTENDION_DEP], + ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_oci, pdo) ]) http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.27&r2=1.28&ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.27 php-src/ext/pdo_sqlite/config.m4:1.28 --- php-src/ext/pdo_sqlite/config.m4:1.27 Sun Aug 28 12:56:58 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 19:22:44 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27 2005/08/28 16:56:58 iliaa Exp $ +dnl $Id: config.m4,v 1.28 2005/09/24 23:22:44 sniper Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -113,7 +113,7 @@ AC_CHECK_HEADERS(time.h) fi - ifdef([PHP_ADD_EXTENDION_DEP], + ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo) ]) -- 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/spl spl.php
helly Sat Sep 24 19:19:24 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/splspl.php
Log:
- MFH: Serializeable was renamed to Serializable long ago
http://cvs.php.net/diff.php/php-src/ext/spl/spl.php?r1=1.49.2.6&r2=1.49.2.7&ty=u
Index: php-src/ext/spl/spl.php
diff -u php-src/ext/spl/spl.php:1.49.2.6 php-src/ext/spl/spl.php:1.49.2.7
--- php-src/ext/spl/spl.php:1.49.2.6Sun Sep 18 13:52:09 2005
+++ php-src/ext/spl/spl.php Sat Sep 24 19:19:24 2005
@@ -484,7 +484,7 @@
* constructor instead of calling __construct(). If you need to execute the
* standard constructor you may do so in the method.
*/
-interface Serializeable
+interface Serializable
{
/**
* @return string representation of the instance
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl.php
helly Sat Sep 24 19:18:15 2005 EDT
Modified files:
/php-src/ext/splspl.php
Log:
- Serializeable was renamed to Serializable long ago
http://cvs.php.net/diff.php/php-src/ext/spl/spl.php?r1=1.57&r2=1.58&ty=u
Index: php-src/ext/spl/spl.php
diff -u php-src/ext/spl/spl.php:1.57 php-src/ext/spl/spl.php:1.58
--- php-src/ext/spl/spl.php:1.57Sun Sep 18 13:51:37 2005
+++ php-src/ext/spl/spl.php Sat Sep 24 19:18:14 2005
@@ -484,7 +484,7 @@
* constructor instead of calling __construct(). If you need to execute the
* standard constructor you may do so in the method.
*/
-interface Serializeable
+interface Serializable
{
/**
* @return string representation of the instance
--
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 config.m4
wez Sat Sep 24 15:15:25 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: 99% certain that this fixes PECL #5366 and PECL #5391. http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.1&r2=1.26.2.2&ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.1 php-src/ext/pdo_sqlite/config.m4:1.26.2.2 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.1 Sun Aug 28 12:53:20 2005 +++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 15:15:23 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.1 2005/08/28 16:53:20 iliaa Exp $ +dnl $Id: config.m4,v 1.26.2.2 2005/09/24 19:15:23 wez Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -83,7 +83,7 @@ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, -$ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) +$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) AC_CHECK_SIZEOF(char *,4) -- 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
wez Sat Sep 24 14:55:56 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
Refs #34630
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.1&r2=1.18.2.2&ty=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.1
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.2
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.1 Sun Sep 11 01:00:12 2005
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Sat Sep 24 14:55:56 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.1 2005/09/11 05:00:12 wez Exp $ */
+/* $Id: sqlite_statement.c,v 1.18.2.2 2005/09/24 18:55:56 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -93,7 +93,6 @@
}
switch (PDO_PARAM_TYPE(param->param_type)) {
- case PDO_PARAM_LOB:
case PDO_PARAM_STMT:
return 0;
@@ -103,7 +102,23 @@
}
pdo_sqlite_error_stmt(stmt);
return 0;
-
+
+ case PDO_PARAM_LOB:
+ if (Z_TYPE_P(param->parameter)
== IS_RESOURCE) {
+ php_stream *stm;
+
php_stream_from_zval_no_verify(stm, ¶m->parameter);
+ if (stm) {
+
SEPARATE_ZVAL_IF_NOT_REF(¶m->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);
+ } else {
+
pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource");
+ return 0;
+ }
+ }
+ /* fall through */
+
case PDO_PARAM_STR:
default:
if (Z_TYPE_P(param->parameter)
== IS_NULL) {
@@ -113,9 +128,9 @@
} else {
convert_to_string(param->parameter);
if(SQLITE_OK ==
sqlite3_bind_text(S->stmt, param->paramno + 1,
-
Z_STRVAL_P(param->parameter),
-
Z_STRLEN_P(param->parameter),
- SQLITE_STATIC))
{
+
Z_STRVAL_P(param->parameter),
+
Z_STRLEN_P(param->parameter),
+
SQLITE_STATIC)) {
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/tests bug_34630.phpt
wez Sat Sep 24 14:54:52 2005 EDT Added files: (Branch: PHP_5_1) /php-src/ext/pdo/tests bug_34630.phpt Log: a test for bug #34630 http://cvs.php.net/co.php/php-src/ext/pdo/tests/bug_34630.phpt?r=1.1&p=1 Index: php-src/ext/pdo/tests/bug_34630.phpt +++ php-src/ext/pdo/tests/bug_34630.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_pgsql pgsql_statement.c
wez Sat Sep 24 14:47:52 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_pgsql pgsql_statement.c
Log:
Refs #34630
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.2&r2=1.31.2.3&ty=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.2
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.3
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.2Sat Sep 10 17:00:52 2005
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Sat Sep 24 14:47:50 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pgsql_statement.c,v 1.31.2.2 2005/09/10 21:00:52 wez Exp $ */
+/* $Id: pgsql_statement.c,v 1.31.2.3 2005/09/24 18:47:50 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -199,6 +199,22 @@
}
if (param->paramno >= 0) {
+ if (PDO_PARAM_TYPE(param->param_type)
== PDO_PARAM_LOB &&
+
Z_TYPE_P(param->parameter) == IS_RESOURCE) {
+ php_stream *stm;
+
php_stream_from_zval_no_verify(stm, ¶m->parameter);
+ if (stm) {
+
SEPARATE_ZVAL_IF_NOT_REF(¶m->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);
+ } else {
+ /* expected a stream
resource */
+
pdo_pgsql_error_stmt(stmt, PGRES_FATAL_ERROR, "HY105");
+ return 0;
+ }
+ }
+
if (PDO_PARAM_TYPE(param->param_type)
== PDO_PARAM_NULL ||
Z_TYPE_P(param->parameter) == IS_NULL) {
S->param_values[param->paramno]
= NULL;
--
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
sniper Sat Sep 24 14:19:04 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Documentation belongs elsewhere http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.74&r2=1.2027.2.75&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.74 php-src/NEWS:1.2027.2.75 --- php-src/NEWS:1.2027.2.74Sat Sep 24 11:13:12 2005 +++ php-src/NEWSSat Sep 24 14:18:58 2005 @@ -1,9 +1,8 @@ PHPNEWS ||| ?? Aug 2005, PHP 5.1 Release Candidate 2 -- Bundle SQLite extension as a shared module in Windows distribution. This - means that the Windows users would have to add php_extension=php_sqlite.dll - into their php.ini to enable SQLite functionality. (Edin) +- Changed SQLite extension to be a shared module in Windows distribution. + (Edin) - Changed "instanceof" and "catch" operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) - 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 /ext/standard exec.h
edink Sat Sep 24 11:22:57 2005 EDT Modified files: /php-src/ext/standard exec.h Log: MFB: Allow php extensions to use php_escape_shell_cmd() and php_escape_shell_arg(), needed for mbstring http://cvs.php.net/diff.php/php-src/ext/standard/exec.h?r1=1.24&r2=1.25&ty=u Index: php-src/ext/standard/exec.h diff -u php-src/ext/standard/exec.h:1.24 php-src/ext/standard/exec.h:1.25 --- php-src/ext/standard/exec.h:1.24Wed Aug 3 10:07:58 2005 +++ php-src/ext/standard/exec.h Sat Sep 24 11:22:57 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: exec.h,v 1.24 2005/08/03 14:07:58 sniper Exp $ */ +/* $Id: exec.h,v 1.25 2005/09/24 15:22:57 edink Exp $ */ #ifndef EXEC_H #define EXEC_H @@ -34,8 +34,8 @@ PHP_FUNCTION(proc_nice); PHP_MINIT_FUNCTION(proc_open); -char *php_escape_shell_cmd(char *); -char *php_escape_shell_arg(char *); +PHPAPI char *php_escape_shell_cmd(char *); +PHPAPI char *php_escape_shell_arg(char *); int php_exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC); #endif /* EXEC_H */ -- 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 exec.h
edink Sat Sep 24 11:22:33 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/standard exec.h Log: Allow php extensions to use php_escape_shell_cmd() and php_escape_shell_arg(), needed for mbstring http://cvs.php.net/diff.php/php-src/ext/standard/exec.h?r1=1.24&r2=1.24.2.1&ty=u Index: php-src/ext/standard/exec.h diff -u php-src/ext/standard/exec.h:1.24 php-src/ext/standard/exec.h:1.24.2.1 --- php-src/ext/standard/exec.h:1.24Wed Aug 3 10:07:58 2005 +++ php-src/ext/standard/exec.h Sat Sep 24 11:22:32 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: exec.h,v 1.24 2005/08/03 14:07:58 sniper Exp $ */ +/* $Id: exec.h,v 1.24.2.1 2005/09/24 15:22:32 edink Exp $ */ #ifndef EXEC_H #define EXEC_H @@ -34,8 +34,8 @@ PHP_FUNCTION(proc_nice); PHP_MINIT_FUNCTION(proc_open); -char *php_escape_shell_cmd(char *); -char *php_escape_shell_arg(char *); +PHPAPI char *php_escape_shell_cmd(char *); +PHPAPI char *php_escape_shell_arg(char *); int php_exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC); #endif /* EXEC_H */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /ext/pdo config.w32 /ext/sqlite config.w32
edink Sat Sep 24 11:15:13 2005 EDT
Modified files:
/php-srcphp.ini-dist php.ini-recommended
/php-src/ext/pdoconfig.w32
/php-src/ext/sqlite config.w32
Log:
MFB: Build PDO and SQLite as shared
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.234&r2=1.235&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.234 php-src/php.ini-dist:1.235
--- php-src/php.ini-dist:1.234 Thu Sep 15 12:19:37 2005
+++ php-src/php.ini-distSat Sep 24 11:15:13 2005
@@ -603,6 +603,7 @@
;extension=php_shmop.dll
;extension=php_snmp.dll
;extension=php_sockets.dll
+;extension=php_sqlite.dll
;extension=php_sybase_ct.dll
;extension=php_tidy.dll
;extension=php_xmlrpc.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.182&r2=1.183&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.182 php-src/php.ini-recommended:1.183
--- php-src/php.ini-recommended:1.182 Thu Sep 15 12:19:37 2005
+++ php-src/php.ini-recommended Sat Sep 24 11:15:13 2005
@@ -660,6 +660,7 @@
;extension=php_shmop.dll
;extension=php_snmp.dll
;extension=php_sockets.dll
+;extension=php_sqlite.dll
;extension=php_sybase_ct.dll
;extension=php_tidy.dll
;extension=php_xmlrpc.dll
http://cvs.php.net/diff.php/php-src/ext/pdo/config.w32?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/pdo/config.w32
diff -u php-src/ext/pdo/config.w32:1.5 php-src/ext/pdo/config.w32:1.6
--- php-src/ext/pdo/config.w32:1.5 Fri Mar 11 20:15:37 2005
+++ php-src/ext/pdo/config.w32 Sat Sep 24 11:15:13 2005
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.5 2005/03/12 01:15:37 wez Exp $
+// $Id: config.w32,v 1.6 2005/09/24 15:15:13 edink Exp $
// vim:ft=javascript
-ARG_ENABLE("pdo", "Enable PHP Data Objects support", "yes");
+ARG_ENABLE("pdo", "Enable PHP Data Objects support", "no");
if (PHP_PDO != "no") {
EXTENSION('pdo', 'pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c
pdo_sqlstate.c');
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.w32?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/sqlite/config.w32
diff -u php-src/ext/sqlite/config.w32:1.8 php-src/ext/sqlite/config.w32:1.9
--- php-src/ext/sqlite/config.w32:1.8 Fri Mar 11 20:14:21 2005
+++ php-src/ext/sqlite/config.w32 Sat Sep 24 11:15:13 2005
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.8 2005/03/12 01:14:21 wez Exp $
+// $Id: config.w32,v 1.9 2005/09/24 15:15:13 edink Exp $
// vim:ft=javascript
-ARG_WITH("sqlite", "SQLite support", "yes");
+ARG_WITH("sqlite", "SQLite support", "no");
if (PHP_SQLITE != "no") {
copy_and_subst(configure_module_dirname +
"\\libsqlite\\src\\sqlite.h.in",
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/gd/libgd gd_gif_in.c
Pierre, Please MFH it back to the 4.4 branch as well. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS php.ini-dist php.ini-recommended /ext/pdo config.w32 /ext/sqlite config.w32
edink Sat Sep 24 11:13:14 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS php.ini-dist php.ini-recommended
/php-src/ext/pdoconfig.w32
/php-src/ext/sqlite config.w32
Log:
Build PDO and SQLite as shared
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.73&r2=1.2027.2.74&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.73 php-src/NEWS:1.2027.2.74
--- php-src/NEWS:1.2027.2.73Thu Sep 22 15:03:34 2005
+++ php-src/NEWSSat Sep 24 11:13:12 2005
@@ -1,6 +1,9 @@
PHPNEWS
|||
?? Aug 2005, PHP 5.1 Release Candidate 2
+- Bundle SQLite extension as a shared module in Windows distribution. This
+ means that the Windows users would have to add php_extension=php_sqlite.dll
+ into their php.ini to enable SQLite functionality. (Edin)
- Changed "instanceof" and "catch" operators, is_a() and is_subclass_of()
functions to not call __autoload(). (Dmitry)
- Added support for class constants and static members for internal classes.
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.231.2.1&r2=1.231.2.2&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231.2.1 php-src/php.ini-dist:1.231.2.2
--- php-src/php.ini-dist:1.231.2.1 Mon Aug 29 10:46:17 2005
+++ php-src/php.ini-distSat Sep 24 11:13:13 2005
@@ -594,6 +594,7 @@
;extension=php_shmop.dll
;extension=php_snmp.dll
;extension=php_sockets.dll
+;extension=php_sqlite.dll
;extension=php_sybase_ct.dll
;extension=php_tidy.dll
;extension=php_xmlrpc.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.179.2.1&r2=1.179.2.2&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179.2.1
php-src/php.ini-recommended:1.179.2.2
--- php-src/php.ini-recommended:1.179.2.1 Mon Aug 29 10:46:17 2005
+++ php-src/php.ini-recommended Sat Sep 24 11:13:13 2005
@@ -652,6 +652,7 @@
;extension=php_shmop.dll
;extension=php_snmp.dll
;extension=php_sockets.dll
+;extension=php_sqlite.dll
;extension=php_sybase_ct.dll
;extension=php_tidy.dll
;extension=php_xmlrpc.dll
http://cvs.php.net/diff.php/php-src/ext/pdo/config.w32?r1=1.5&r2=1.5.2.1&ty=u
Index: php-src/ext/pdo/config.w32
diff -u php-src/ext/pdo/config.w32:1.5 php-src/ext/pdo/config.w32:1.5.2.1
--- php-src/ext/pdo/config.w32:1.5 Fri Mar 11 20:15:37 2005
+++ php-src/ext/pdo/config.w32 Sat Sep 24 11:13:13 2005
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.5 2005/03/12 01:15:37 wez Exp $
+// $Id: config.w32,v 1.5.2.1 2005/09/24 15:13:13 edink Exp $
// vim:ft=javascript
-ARG_ENABLE("pdo", "Enable PHP Data Objects support", "yes");
+ARG_ENABLE("pdo", "Enable PHP Data Objects support", "no");
if (PHP_PDO != "no") {
EXTENSION('pdo', 'pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c
pdo_sqlstate.c');
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.w32?r1=1.8&r2=1.8.2.1&ty=u
Index: php-src/ext/sqlite/config.w32
diff -u php-src/ext/sqlite/config.w32:1.8 php-src/ext/sqlite/config.w32:1.8.2.1
--- php-src/ext/sqlite/config.w32:1.8 Fri Mar 11 20:14:21 2005
+++ php-src/ext/sqlite/config.w32 Sat Sep 24 11:13:13 2005
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.8 2005/03/12 01:14:21 wez Exp $
+// $Id: config.w32,v 1.8.2.1 2005/09/24 15:13:13 edink Exp $
// vim:ft=javascript
-ARG_WITH("sqlite", "SQLite support", "yes");
+ARG_WITH("sqlite", "SQLite support", "no");
if (PHP_SQLITE != "no") {
copy_and_subst(configure_module_dirname +
"\\libsqlite\\src\\sqlite.h.in",
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/gd/libgd gd_gif_in.c
pajoye Sat Sep 24 10:40:15 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/gd/libgd gd_gif_in.c Log: - MFH #33220, infinite loop while loading invalid GIF (nlopees) http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd_gif_in.c?r1=1.5&r2=1.5.2.1&ty=u Index: php-src/ext/gd/libgd/gd_gif_in.c diff -u php-src/ext/gd/libgd/gd_gif_in.c:1.5 php-src/ext/gd/libgd/gd_gif_in.c:1.5.2.1 --- php-src/ext/gd/libgd/gd_gif_in.c:1.5Sun Dec 28 15:11:08 2003 +++ php-src/ext/gd/libgd/gd_gif_in.cSat Sep 24 10:40:15 2005 @@ -259,13 +259,13 @@ if ((buf[0] & 0x1) != 0) *Transparent = buf[3]; - while (GetDataBlock(fd, (unsigned char*) buf) != 0) + while (GetDataBlock(fd, (unsigned char*) buf) > 0) ; return FALSE; default: break; } - while (GetDataBlock(fd, (unsigned char*) buf) != 0) + while (GetDataBlock(fd, (unsigned char*) buf) > 0) ; return FALSE; @@ -337,7 +337,7 @@ buf[0] = buf[last_byte-2]; buf[1] = buf[last_byte-1]; - if ((count = GetDataBlock(fd, &buf[2])) == 0) + if ((count = GetDataBlock(fd, &buf[2])) <= 0) done = TRUE; last_byte = 2 + count; -- 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/gd/libgd gd_gif_in.c
pajoye Sat Sep 24 10:39:16 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/gd/libgd gd_gif_in.c Log: - MFH #33220, infinite loop while loading invalid GIF (nlopees) http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd_gif_in.c?r1=1.5.4.1&r2=1.5.4.2&ty=u Index: php-src/ext/gd/libgd/gd_gif_in.c diff -u php-src/ext/gd/libgd/gd_gif_in.c:1.5.4.1 php-src/ext/gd/libgd/gd_gif_in.c:1.5.4.2 --- php-src/ext/gd/libgd/gd_gif_in.c:1.5.4.1Thu Aug 18 08:54:43 2005 +++ php-src/ext/gd/libgd/gd_gif_in.cSat Sep 24 10:39:16 2005 @@ -259,13 +259,13 @@ if ((buf[0] & 0x1) != 0) *Transparent = buf[3]; - while (GetDataBlock(fd, (unsigned char*) buf) != 0) + while (GetDataBlock(fd, (unsigned char*) buf) > 0) ; return FALSE; default: break; } - while (GetDataBlock(fd, (unsigned char*) buf) != 0) + while (GetDataBlock(fd, (unsigned char*) buf) > 0) ; return FALSE; @@ -337,7 +337,7 @@ buf[0] = buf[last_byte-2]; buf[1] = buf[last_byte-1]; - if ((count = GetDataBlock(fd, &buf[2])) == 0) + if ((count = GetDataBlock(fd, &buf[2])) <= 0) done = TRUE; last_byte = 2 + count; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd_gif_in.c
pajoye Sat Sep 24 10:37:51 2005 EDT Modified files: /php-src/ext/gd/libgd gd_gif_in.c Log: - #33220, fix infinite loop while loading invalid gif, this patch fixes at least many cases (nlopess) http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd_gif_in.c?r1=1.6&r2=1.7&ty=u Index: php-src/ext/gd/libgd/gd_gif_in.c diff -u php-src/ext/gd/libgd/gd_gif_in.c:1.6 php-src/ext/gd/libgd/gd_gif_in.c:1.7 --- php-src/ext/gd/libgd/gd_gif_in.c:1.6Thu Aug 18 08:54:29 2005 +++ php-src/ext/gd/libgd/gd_gif_in.cSat Sep 24 10:37:49 2005 @@ -259,13 +259,13 @@ if ((buf[0] & 0x1) != 0) *Transparent = buf[3]; - while (GetDataBlock(fd, (unsigned char*) buf) != 0) + while (GetDataBlock(fd, (unsigned char*) buf) > 0) ; return FALSE; default: break; } - while (GetDataBlock(fd, (unsigned char*) buf) != 0) + while (GetDataBlock(fd, (unsigned char*) buf) > 0) ; return FALSE; @@ -337,7 +337,7 @@ buf[0] = buf[last_byte-2]; buf[1] = buf[last_byte-1]; - if ((count = GetDataBlock(fd, &buf[2])) == 0) + if ((count = GetDataBlock(fd, &buf[2])) <= 0) done = TRUE; last_byte = 2 + count; -- 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 .cvsignore
edink Sat Sep 24 10:22:03 2005 EDT Modified files: /php-src/ext/pdo_sqlite .cvsignore Log: MFB: sqlite3.h is a generated file http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/.cvsignore?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo_sqlite/.cvsignore diff -u php-src/ext/pdo_sqlite/.cvsignore:1.4 php-src/ext/pdo_sqlite/.cvsignore:1.5 --- php-src/ext/pdo_sqlite/.cvsignore:1.4 Tue Jun 14 09:26:09 2005 +++ php-src/ext/pdo_sqlite/.cvsignore Sat Sep 24 10:22:02 2005 @@ -29,3 +29,4 @@ mkinstalldirs modules conftest* +sqlite3.h -- 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 .cvsignore
edink Sat Sep 24 10:21:29 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite .cvsignore Log: sqlite3.h is a generated file http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/.cvsignore?r1=1.4&r2=1.4.2.1&ty=u Index: php-src/ext/pdo_sqlite/.cvsignore diff -u php-src/ext/pdo_sqlite/.cvsignore:1.4 php-src/ext/pdo_sqlite/.cvsignore:1.4.2.1 --- php-src/ext/pdo_sqlite/.cvsignore:1.4 Tue Jun 14 09:26:09 2005 +++ php-src/ext/pdo_sqlite/.cvsignore Sat Sep 24 10:21:29 2005 @@ -29,3 +29,4 @@ mkinstalldirs modules conftest* +sqlite3.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo php_pdo_driver.h php_pdo_int.h
edink Sat Sep 24 10:19:24 2005 EDT Modified files: /php-src/ext/pdophp_pdo_driver.h php_pdo_int.h Log: MFB: Declare functions used by driver as PDO_API in php_pdo_driver.h http://cvs.php.net/diff.php/php-src/ext/pdo/php_pdo_driver.h?r1=1.67&r2=1.68&ty=u Index: php-src/ext/pdo/php_pdo_driver.h diff -u php-src/ext/pdo/php_pdo_driver.h:1.67 php-src/ext/pdo/php_pdo_driver.h:1.68 --- php-src/ext/pdo/php_pdo_driver.h:1.67 Fri Aug 12 19:32:30 2005 +++ php-src/ext/pdo/php_pdo_driver.hSat Sep 24 10:19:24 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_pdo_driver.h,v 1.67 2005/08/12 23:32:30 wez Exp $ */ +/* $Id: php_pdo_driver.h,v 1.68 2005/09/24 14:19:24 edink Exp $ */ #ifndef PHP_PDO_DRIVER_H #define PHP_PDO_DRIVER_H @@ -622,6 +622,9 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char **outquery, int *outquery_len TSRMLS_DC); +PDO_API void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, + const char *sqlstate, const char *supp TSRMLS_DC); + #endif /* PHP_PDO_DRIVER_H */ /* * Local variables: http://cvs.php.net/diff.php/php-src/ext/pdo/php_pdo_int.h?r1=1.19&r2=1.20&ty=u Index: php-src/ext/pdo/php_pdo_int.h diff -u php-src/ext/pdo/php_pdo_int.h:1.19 php-src/ext/pdo/php_pdo_int.h:1.20 --- php-src/ext/pdo/php_pdo_int.h:1.19 Tue Sep 20 14:46:15 2005 +++ php-src/ext/pdo/php_pdo_int.h Sat Sep 24 10:19:24 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_pdo_int.h,v 1.19 2005/09/20 18:46:15 helly Exp $ */ +/* $Id: php_pdo_int.h,v 1.20 2005/09/24 14:19:24 edink Exp $ */ #include "php_pdo_phpvers_compat.h" @@ -56,7 +56,6 @@ extern pdo_driver_t *pdo_find_driver(const char *name, int namelen); extern void pdo_handle_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt TSRMLS_DC); -extern void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *sqlstate, const char *supp TSRMLS_DC); #define PDO_DBH_CLEAR_ERR()strcpy(dbh->error_code, PDO_ERR_NONE) #define PDO_STMT_CLEAR_ERR() strcpy(stmt->error_code, PDO_ERR_NONE) -- 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 php_pdo_driver.h php_pdo_int.h
edink Sat Sep 24 10:18:02 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdophp_pdo_driver.h php_pdo_int.h Log: Declare functions used by driver as PDO_API in php_pdo_driver.h http://cvs.php.net/diff.php/php-src/ext/pdo/php_pdo_driver.h?r1=1.66&r2=1.66.2.1&ty=u Index: php-src/ext/pdo/php_pdo_driver.h diff -u php-src/ext/pdo/php_pdo_driver.h:1.66 php-src/ext/pdo/php_pdo_driver.h:1.66.2.1 --- php-src/ext/pdo/php_pdo_driver.h:1.66 Tue Jul 19 23:38:33 2005 +++ php-src/ext/pdo/php_pdo_driver.hSat Sep 24 10:18:01 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_pdo_driver.h,v 1.66 2005/07/20 03:38:33 iliaa Exp $ */ +/* $Id: php_pdo_driver.h,v 1.66.2.1 2005/09/24 14:18:01 edink Exp $ */ #ifndef PHP_PDO_DRIVER_H #define PHP_PDO_DRIVER_H @@ -622,6 +622,9 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char **outquery, int *outquery_len TSRMLS_DC); +PDO_API void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, + const char *sqlstate, const char *supp TSRMLS_DC); + #endif /* PHP_PDO_DRIVER_H */ /* * Local variables: http://cvs.php.net/diff.php/php-src/ext/pdo/php_pdo_int.h?r1=1.17.2.1&r2=1.17.2.2&ty=u Index: php-src/ext/pdo/php_pdo_int.h diff -u php-src/ext/pdo/php_pdo_int.h:1.17.2.1 php-src/ext/pdo/php_pdo_int.h:1.17.2.2 --- php-src/ext/pdo/php_pdo_int.h:1.17.2.1 Sun Sep 18 14:05:59 2005 +++ php-src/ext/pdo/php_pdo_int.h Sat Sep 24 10:18:01 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_pdo_int.h,v 1.17.2.1 2005/09/18 18:05:59 tony2001 Exp $ */ +/* $Id: php_pdo_int.h,v 1.17.2.2 2005/09/24 14:18:01 edink Exp $ */ /* Stuff private to the PDO extension and not for consumption by PDO drivers * */ @@ -55,7 +55,6 @@ extern pdo_driver_t *pdo_find_driver(const char *name, int namelen); extern void pdo_handle_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt TSRMLS_DC); -extern void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *sqlstate, const char *supp TSRMLS_DC); #define PDO_DBH_CLEAR_ERR()strcpy(dbh->error_code, PDO_ERR_NONE) #define PDO_STMT_CLEAR_ERR() strcpy(stmt->error_code, PDO_ERR_NONE) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/sockets config.m4 sockets.c
Hey Jani,
no need to scream :)
Andrey
Quoting Jani Taskinen <[EMAIL PROTECTED]>:
In-Reply-To: <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
References: <[EMAIL PROTECTED]>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
This is now the 2nd commit by you today which was NOT put into HEAD!!!
ALWAYS COMMIT TO HEAD FIRST!!!
--Jani
On Fri, 23 Sep 2005, Anantha Kesari H Y wrote:
hyanantha Fri Sep 23 05:54:34 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/sockets config.m4 sockets.c
Log:
NetWare LibC don't have socketpair function. So enabling
socket_create_pair functionality only if socketpair is available in
the host LibC.
--Kamesh
http://cvs.php.net/diff.php/php-src/ext/sockets/config.m4?r1=1.15&r2=1.15.4.1&ty=u
Index: php-src/ext/sockets/config.m4
diff -u php-src/ext/sockets/config.m4:1.15
php-src/ext/sockets/config.m4:1.15.4.1
--- php-src/ext/sockets/config.m4:1.15 Mon Jul 7 23:38:00 2003
+++ php-src/ext/sockets/config.m4 Fri Sep 23 05:54:31 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.15 2003/07/08 03:38:00 pollita Exp $
+dnl $Id: config.m4,v 1.15.4.1 2005/09/23 09:54:31 hyanantha Exp $
dnl
PHP_ARG_ENABLE(sockets, whether to enable sockets support,
@@ -31,5 +31,6 @@
PHP_NEW_EXTENSION([sockets], [sockets.c], [$ext_shared])
fi
+PHP_CHECK_FUNC(socketpair)
PHP_CHECK_FUNC(gethostbyname2)
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.171&r2=1.171.2.1&ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171
php-src/ext/sockets/sockets.c:1.171.2.1
--- php-src/ext/sockets/sockets.c:1.171 Wed Aug 3 10:07:52 2005
+++ php-src/ext/sockets/sockets.c Fri Sep 23 05:54:31 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.171 2005/08/03 14:07:52 sniper Exp $ */
+/* $Id: sockets.c,v 1.171.2.1 2005/09/23 09:54:31 hyanantha Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -116,7 +116,9 @@
PHP_FE(socket_select,
first_through_third_args_force_ref)
PHP_FE(socket_create, NULL)
PHP_FE(socket_create_listen,NULL)
+#ifdef HAVE_SOCKETPAIR
PHP_FE(socket_create_pair, fourth_arg_force_ref)
+#endif
PHP_FE(socket_accept, NULL)
PHP_FE(socket_set_nonblock, NULL)
PHP_FE(socket_set_block,NULL)
@@ -1652,6 +1654,7 @@
}
/* }}} */
+#ifdef HAVE_SOCKETPAIR
/* {{{ proto bool socket_create_pair(int domain, int type, int
protocol, array &fd)
Creates a pair of indistinguishable sockets and stores them in fds. */
PHP_FUNCTION(socket_create_pair)
@@ -1711,6 +1714,7 @@
RETURN_TRUE;
}
/* }}} */
+#endif
/* {{{ proto bool socket_shutdown(resource socket[, int how])
Shuts down a socket for receiving, sending, or both. */
--
Donate @
Disclaimer: Donating money may make me happier and friendlier for a
limited period!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
