[PHP-CVS] svn: /SVNROOT/ global_avail
derick Tue, 16 Nov 2010 09:23:00 + Revision: http://svn.php.net/viewvc?view=revision&revision=305405 Log: - Give 'dzenovich' access to runkit and classkit per Tony's request. Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2010-11-16 09:12:01 UTC (rev 305404) +++ SVNROOT/global_avail2010-11-16 09:23:00 UTC (rev 305405) @@ -282,7 +282,7 @@ avail|ramsey|pecl/uploadprogress,pecl/pdo_user avail|seariver|pecl/wxwidgets avail|pestilence669|pecl/xrange -avail|mlively|pecl/runkit,pecl/classkit +avail|mlively,dzenovich|pecl/runkit,pecl/classkit avail|thierry|pecl/fam avail|hamano|pecl/tcc avail|graham,myang|pecl/optimizer -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] svn: /php/php-src/trunk/ UPGRADING.INTERNALS ext/standard/basic_functions.c ext/standard/basic_functions.h main/php_streams.h main/streams/memory.c main/streams/streams.c
On Mon, 15 Nov 2010 07:25:44 -, Kalle Sommer Nielsen
wrote:
2010/11/15 Gustavo André dos Santos Lopes :
cataphract Mon, 15 Nov 2010 03:05:32 +
Revision: http://svn.php.net/viewvc?view=revision&revision=305346
Log:
- Added leak_variable() function.
Why do we need a leak_variable() function in a regular build unlike
leak() and crash() which are defined in zend_builtin_functions.c in
debug mode only or did I miss something here?
It's only in the debug builds, not the regular builds. In any case, it
makes more sense to have it near leak() and crash. The attached patch does
that, but will have to be applied by someone else.
(the previous e-mail doesn't seem to have gone through, apologies if this
is the second)
--
Gustavo LopesIndex: ext/standard/basic_functions.c
===
--- ext/standard/basic_functions.c (revision 305370)
+++ ext/standard/basic_functions.c (working copy)
@@ -853,11 +853,6 @@
#if ZEND_DEBUG
ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_leak_variable, 0, 0, 1)
- ZEND_ARG_INFO(0, variable)
- ZEND_ARG_INFO(0, leak_data)
-ZEND_END_ARG_INFO()
#endif
#ifdef HAVE_GETLOADAVG
@@ -3002,7 +2997,6 @@
PHP_FE(parse_ini_string,
arginfo_parse_ini_string)
#if ZEND_DEBUG
PHP_FE(config_get_hash,
arginfo_config_get_hash)
- PHP_FE(leak_variable,
arginfo_leak_variable)
#endif
PHP_FE(is_uploaded_file,
arginfo_is_uploaded_file)
PHP_FE(move_uploaded_file,
arginfo_move_uploaded_file)
@@ -5923,32 +5917,6 @@
zend_hash_apply_with_arguments(hash TSRMLS_CC, (apply_func_args_t)
add_config_entry_cb, 1, return_value);
}
/* }}} */
-
-/* {{{ proto leak_variable(variable [, leak_data]) */
-PHP_FUNCTION(leak_variable)
-{
- zval *zv;
- zend_bool leak_data = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &zv,
&leak_data) == FAILURE) {
- return;
- }
-
- if (leak_data && (Z_TYPE_P(zv) != IS_RESOURCE && Z_TYPE_P(zv) !=
IS_OBJECT)) {
- php_error_docref0(NULL TSRMLS_CC, E_WARNING,
- "Leaking non-zval data is only applicable to resources
and objects");
- return;
- }
-
- if (!leak_data) {
- zval_add_ref(&zv);
- } else if (Z_TYPE_P(zv) == IS_RESOURCE) {
- zend_list_addref(Z_RESVAL_P(zv));
- } else if (Z_TYPE_P(zv) == IS_OBJECT) {
- Z_OBJ_HANDLER_P(zv, add_ref)(zv TSRMLS_CC);
- }
-}
-/* }}} */
#endif
#ifdef HAVE_GETLOADAVG
Index: ext/standard/basic_functions.h
===
--- ext/standard/basic_functions.h (revision 305370)
+++ ext/standard/basic_functions.h (working copy)
@@ -127,7 +127,6 @@
PHP_FUNCTION(parse_ini_string);
#if ZEND_DEBUG
PHP_FUNCTION(config_get_hash);
-PHP_FUNCTION(leak_variable);
#endif
PHP_FUNCTION(str_rot13);
Index: Zend/zend_builtin_functions.c
===
--- Zend/zend_builtin_functions.c (revision 305370)
+++ Zend/zend_builtin_functions.c (working copy)
@@ -54,6 +54,7 @@
static ZEND_FUNCTION(class_alias);
#if ZEND_DEBUG
static ZEND_FUNCTION(leak);
+static ZEND_FUNCTION(leak_variable);
#ifdef ZEND_TEST_EXCEPTIONS
static ZEND_FUNCTION(crash);
#endif
@@ -180,6 +181,13 @@
ZEND_ARG_INFO(0, autoload)
ZEND_END_ARG_INFO()
+#if ZEND_DEBUG
+ZEND_BEGIN_ARG_INFO_EX(arginfo_leak_variable, 0, 0, 1)
+ ZEND_ARG_INFO(0, variable)
+ ZEND_ARG_INFO(0, leak_data)
+ZEND_END_ARG_INFO()
+#endif
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1)
ZEND_ARG_INFO(0, message)
ZEND_ARG_INFO(0, error_type)
@@ -245,6 +253,7 @@
ZEND_FE(class_alias,arginfo_class_alias)
#if ZEND_DEBUG
ZEND_FE(leak, NULL)
+ ZEND_FE(leak_variable, arginfo_leak_variable)
#ifdef ZEND_TEST_EXCEPTIONS
ZEND_FE(crash, NULL)
#endif
@@ -1367,7 +1376,29 @@
}
/* }}} */
+/* {{{ proto leak_variable(mixed variable [, bool leak_data]) */
+ZEND_FUNCTION(leak_variable)
+{
+ zval *zv;
+ zend_bool leak_data = 0;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &zv,
&leak_data) == FAILURE) {
+ return;
+ }
+
+ if (!leak_d
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Tue, 16 Nov 2010 18:39:35 + Revision: http://svn.php.net/viewvc?view=revision&revision=305411 Log: - htscanner karma for martynas Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2010-11-16 16:47:18 UTC (rev 305410) +++ SVNROOT/global_avail2010-11-16 18:39:35 UTC (rev 305411) @@ -332,6 +332,7 @@ avail|cubrid|pecl/cubrid,phpdoc avail|treffynnon|pecl/ssdeep,phpdoc avail|nicolas|pecl/judy,phpdoc +avail|martynas|pecl/htscanner,phpdoc # Objective-C bridge avail|wez,jan|php/php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/oci8_interface.c branches/PHP_5_3/ext/oci8/package.xml branches/PHP_5_3/ext/oci8/php_oci8.h branches/PHP_5_3/ext/oci8/tests/null_byte_1.phpt bran
sixd Tue, 16 Nov 2010 19:33:31 +
Revision: http://svn.php.net/viewvc?view=revision&revision=305412
Log:
Protect against null bytes in LOB filenames (rasmus)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c
U php/php-src/branches/PHP_5_3/ext/oci8/package.xml
U php/php-src/branches/PHP_5_3/ext/oci8/php_oci8.h
A php/php-src/branches/PHP_5_3/ext/oci8/tests/null_byte_1.phpt
A php/php-src/branches/PHP_5_3/ext/oci8/tests/null_byte_2.phpt
U php/php-src/trunk/ext/oci8/oci8_interface.c
U php/php-src/trunk/ext/oci8/package.xml
U php/php-src/trunk/ext/oci8/php_oci8.h
A php/php-src/trunk/ext/oci8/tests/null_byte_1.phpt
A php/php-src/trunk/ext/oci8/tests/null_byte_2.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c
===
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c 2010-11-16 18:39:35 UTC (rev 305411)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c 2010-11-16 19:33:31 UTC (rev 305412)
@@ -242,7 +242,12 @@
return;
}
}
-
+
+ if (strlen(filename) != filename_len) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filename cannot contain null bytes");
+ RETURN_FALSE;
+ }
+
if (zend_hash_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"), (void **)&tmp) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
RETURN_FALSE;
@@ -894,7 +899,12 @@
RETURN_FALSE;
}
}
-
+
+ if (strlen(filename) != filename_len) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filename cannot contain null bytes");
+ RETURN_FALSE;
+ }
+
if (zend_hash_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"), (void **)&tmp) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
RETURN_FALSE;
@@ -1666,8 +1676,8 @@
}
/* }}} */
-/* {{{ proto resource oci_parse(resource connection, string query)
- Parse a query and return a statement */
+/* {{{ proto resource oci_parse(resource connection, string statement)
+ Parse a SQL or PL/SQL statement and return a statement resource */
PHP_FUNCTION(oci_parse)
{
zval *z_connection;
Modified: php/php-src/branches/PHP_5_3/ext/oci8/package.xml
===
--- php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2010-11-16 18:39:35 UTC (rev 305411)
+++ php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2010-11-16 19:33:31 UTC (rev 305412)
@@ -33,21 +33,20 @@
no
- 2010-11-10
+ 2010-11-16
15:00:00
- 1.4.4
- 1.4.4
+ 1.4.5
+ 1.4.5
- stable
+ devel
stable
http://www.php.net/license";>PHP
-Fixed bug #53284 (Valgrind warnings in oci_set_* functions)
-Enhancement - improve startup failure error messages
+Protect against null bytes in LOB filenames (http://news.php.net/php.internals/50202)
@@ -306,6 +305,8 @@
+
+
@@ -379,6 +380,22 @@
+ 1.4.4
+ 1.4.4
+
+
+ stable
+ stable
+
+ http://www.php.net/license";>PHP
+
+Fixed bug #53284 (Valgrind warnings in oci_set_* functions)
+Enhancement - improve startup failure error messages
+
+
+
+
+
1.4.3
1.4.3
Modified: php/php-src/branches/PHP_5_3/ext/oci8/php_oci8.h
===
--- php/php-src/branches/PHP_5_3/ext/oci8/php_oci8.h 2010-11-16 18:39:35 UTC (rev 305411)
+++ php/php-src/branches/PHP_5_3/ext/oci8/php_oci8.h 2010-11-16 19:33:31 UTC (rev 305412)
@@ -46,7 +46,7 @@
*/
#undef PHP_OCI8_VERSION
#endif
-#define PHP_OCI8_VERSION "1.4.4"
+#define PHP_OCI8_VERSION "1.4.5-devel"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry
Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/null_byte_1.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/null_byte_1.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/null_byte_1.phpt 2010-11-16 19:33:31 UTC (rev 305412)
@@ -0,0 +1,38 @@
+--TEST--
+Protect against null bytes in LOB filenames (http://news.php.net/php.internals/50202)
+--SKIPIF--
+
+--INI--
+display_errors = On
+error_reporting = E_WARNING
+--FILE--
+savefile("/tmp/abc\0def");
+var_dump($r);
+
+echo "Test 2: Export\n";
+
+$r = $lob->export("/tmp/abc\0def");
+var_dump($r);
+
+?>
+===DONE===
+
+--EXPECTF--
+Test 1: Import
+
+Warning: OCI-Lob::savefile(): Filename cannot contain null bytes in %snull_byte_1.php on line %d
+bool(false)
+Test 2: Export
+
+Warning: OCI-Lob::export(): Filename cannot contain null bytes in %snull_byte_1.php on line %d
+bool(false)
+===DONE===
Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/null_byte_1.phpt
___
Added: svn:key
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
sixd Tue, 16 Nov 2010 19:38:31 + Revision: http://svn.php.net/viewvc?view=revision&revision=305413 Log: Added missing news Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-11-16 19:33:31 UTC (rev 305412) +++ php/php-src/branches/PHP_5_3/NEWS 2010-11-16 19:38:31 UTC (rev 305413) @@ -68,6 +68,7 @@ __COMPILER_HALT_OFFSET__). (Felipe) - Fixed bug #53297 (gettimeofday implementation in php/win32/time.c can return 1 million microsecs). (ped at 7gods dot org) +- Fixed bug #53284 (Valgrind warnings in oci_set_* functions) (Oracle Corp.) - Fixed bug #53279 (SplFileObject doesn't initialise default CSV escape character). (Adam) - Fixed bug #53273 (mb_strcut() returns garbage with the excessive length -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/package.xml branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home.phpt branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt
sixd Tue, 16 Nov 2010 20:50:29 +
Revision: http://svn.php.net/viewvc?view=revision&revision=305415
Log:
Improve test cross- DB version portability
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/package.xml
U
php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home.phpt
A
php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt
U
php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old.phpt
A
php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old_11.phpt
U php/php-src/trunk/ext/oci8/package.xml
U php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home.phpt
A php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_11.phpt
U php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old.phpt
A php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old_11.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/package.xml
===
--- php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2010-11-16 20:23:44 UTC (rev 305414)
+++ php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2010-11-16 20:50:29 UTC (rev 305415)
@@ -183,6 +183,8 @@
+
+
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home.phpt 2010-11-16 20:23:44 UTC (rev 305414)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home.phpt 2010-11-16 20:50:29 UTC (rev 305415)
@@ -10,6 +10,10 @@
if ($ov !== 1) {
die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
}
+$iv = preg_match('/Oracle .*Version => (10\.2)/', $phpinfo);
+if ($iv != 1) {
+die ("skip tests a feature that works only with Oracle 10gR2");
+}
?>
--ENV--
ORACLE_HOME=""
Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt 2010-11-16 20:50:29 UTC (rev 305415)
@@ -0,0 +1,41 @@
+--TEST--
+oci_connect() without ORACLE_HOME set (OCIServerAttach() segfaults)
+--SKIPIF--
+ (11\.2|12)/', $phpinfo);
+if ($iv != 1) {
+die ("skip tests a feature that works only with Oracle 11gR2 or greater version of client");
+}
+?>
+--ENV--
+ORACLE_HOME=""
+--FILE--
+
+===DONE===
+
+--EXPECTF--
+Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d
+
+Warning: oci_connect(): Error while trying to retrieve text for error ORA-01804
+ in %s on line %d
+bool(false)
+===DONE===
Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old.phpt 2010-11-16 20:23:44 UTC (rev 305414)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old.phpt 2010-11-16 20:50:29 UTC (rev 305415)
@@ -10,6 +10,10 @@
if ($ov !== 1) {
die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
}
+$iv = preg_match('/Oracle .*Version => (10\.2)/', $phpinfo);
+if ($iv != 1) {
+die ("skip tests a feature that works only with Oracle 10gR2");
+}
?>
--ENV--
ORACLE_HOME=""
Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old_11.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old_11.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old_11.phpt 2010-11-16 20:50:29 UTC (rev 305415)
@@ -0,0 +1,41 @@
+--TEST--
+ocilogon() without ORACLE_HOME set (OCIServerAttach() segfaults)
+--SKIPIF--
+ (11\.2|12)/', $phpinfo);
+if ($iv != 1) {
+die ("skip tests a feature that works only with Oracle 11gR2 or greater version of client");
+}
+?>
+--ENV--
+ORACLE_HOME=""
+--FILE--
+
+===DONE===
+
+--EXPECTF--
+Warning: ocilogon(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d
+
+Warning: ocilogon(): Error while trying to retrieve text for error
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c trunk/ext/pdo_firebird/
felipe Tue, 16 Nov 2010 21:02:14 +
Revision: http://svn.php.net/viewvc?view=revision&revision=305416
Log:
- Fixed bug #53323 (pdo_firebird getAttribute() crash)
patch by: preeves at ibphoenix dot com
Bug: http://bugs.php.net/53323 (Open) Some calls to pdo_firebird getAttribute
crash
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
U php/php-src/trunk/ext/pdo_firebird/firebird_driver.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2010-11-16 20:50:29 UTC (rev 305415)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-11-16 21:02:14 UTC (rev 305416)
@@ -8,6 +8,8 @@
- Fixed NULL pointer dereference in ZipArchive::getArchiveComment.
(CVE-2010-3709). (Maksymilian Arciemowicz)
+- Fixed bug #53323 (pdo_firebird getAttribute() crash).
+ (preeves at ibphoenix dot com)
- Fixed bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with
large amount of data). (CVE-2010-3709). (Adam)
- Fixed bug #52879 (Objects unreferenced in __get, __set, __isset or __unset
Modified: php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c
2010-11-16 20:50:29 UTC (rev 305415)
+++ php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c
2010-11-16 21:02:14 UTC (rev 305416)
@@ -508,7 +508,7 @@
pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
switch (attr) {
- char tmp[200];
+ char tmp[512];
case PDO_ATTR_AUTOCOMMIT:
ZVAL_LONG(val,dbh->auto_commit);
@@ -551,6 +551,10 @@
ZVAL_STRING(val,tmp,1);
return 1;
}
+
+ case PDO_ATTR_FETCH_TABLE_NAMES:
+ ZVAL_BOOL(val, H->fetch_table_names);
+ return 1;
}
return 0;
}
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-11-16 20:50:29 UTC (rev 305415)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-11-16 21:02:14 UTC (rev 305416)
@@ -64,6 +64,8 @@
- Fixed the filter extension accepting IPv4 octets with a leading 0 as that
belongs to the unsupported "dotted octal" representation. (Gustavo)
+- Fixed bug #53323 (pdo_firebird getAttribute() crash).
+ (preeves at ibphoenix dot com)
- Fixed bug #53305 (E_NOTICE when defining a constant starts with
__COMPILER_HALT_OFFSET__). (Felipe)
- Fixed bug #53297 (gettimeofday implementation in php/win32/time.c can return
Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
2010-11-16 20:50:29 UTC (rev 305415)
+++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
2010-11-16 21:02:14 UTC (rev 305416)
@@ -547,7 +547,7 @@
pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
switch (attr) {
- char tmp[200];
+ char tmp[512];
case PDO_ATTR_AUTOCOMMIT:
ZVAL_LONG(val,dbh->auto_commit);
@@ -590,6 +590,10 @@
ZVAL_STRING(val,tmp,1);
return 1;
}
+
+ case PDO_ATTR_FETCH_TABLE_NAMES:
+ ZVAL_BOOL(val, H->fetch_table_names);
+ return 1;
}
return 0;
}
Modified: php/php-src/trunk/ext/pdo_firebird/firebird_driver.c
===
--- php/php-src/trunk/ext/pdo_firebird/firebird_driver.c2010-11-16
20:50:29 UTC (rev 305415)
+++ php/php-src/trunk/ext/pdo_firebird/firebird_driver.c2010-11-16
21:02:14 UTC (rev 305416)
@@ -547,7 +547,7 @@
pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
switch (attr) {
- char tmp[200];
+ char tmp[512];
case PDO_ATTR_AUTOCOMMIT:
ZVAL_LONG(val,dbh->auto_commit);
@@ -590,6 +590,10 @@
ZVAL_STRING(val,tmp,1);
return 1;
}
+
+ case PDO_ATTR_FETCH_TABLE_NAMES:
+ ZVAL_BOOL(val, H->fetch_table_names);
+ return 1;
}
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe,
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h trunk/sapi/fpm/fpm/fpm_atomic.h
fat Tue, 16 Nov 2010 22:02:36 + Revision: http://svn.php.net/viewvc?view=revision&revision=305417 Log: - Fixed #53310 (sparc < v9 won't is not supported) Bug: http://bugs.php.net/53310 (Analyzed) fpm_atomic.h uses SPARC v9 only code, doesn't work on v8 Changed paths: U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h U php/php-src/trunk/sapi/fpm/fpm/fpm_atomic.h Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h === --- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h 2010-11-16 21:02:14 UTC (rev 305416) +++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h 2010-11-16 22:02:36 UTC (rev 305417) @@ -95,6 +95,8 @@ #elif ( __sparc__ || __sparc ) /* Marcin Ochab */ +#if (__sparcv9 || __sparcv9__) + #if (__arch64__ || __arch64) typedef uint64_tatomic_uint_t; typedef volatile atomic_uint_t atomic_t; @@ -131,9 +133,13 @@ /* }}} */ #endif +#else /* #if (__sparcv9 || __sparcv9__) */ +#error Sparc v8 and predecessors are not and will not be supported (see bug report 53310) +#endif /* #if (__sparcv9 || __sparcv9__) */ + #else -#error unsupported processor. please write a patch and send it to me +#error Unsupported processor. Please open a bug report (bugs.php.net). #endif Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_atomic.h === --- php/php-src/trunk/sapi/fpm/fpm/fpm_atomic.h 2010-11-16 21:02:14 UTC (rev 305416) +++ php/php-src/trunk/sapi/fpm/fpm/fpm_atomic.h 2010-11-16 22:02:36 UTC (rev 305417) @@ -95,6 +95,8 @@ #elif ( __sparc__ || __sparc ) /* Marcin Ochab */ +#if (__sparcv9 || __sparcv9__) + #if (__arch64__ || __arch64) typedef uint64_tatomic_uint_t; typedef volatile atomic_uint_t atomic_t; @@ -131,9 +133,13 @@ /* }}} */ #endif +#else /* #if (__sparcv9 || __sparcv9__) */ +#error Sparc v8 and predecessors are not and will not be supported (see bug report 53310) +#endif /* #if (__sparcv9 || __sparcv9__) */ + #else -#error unsupported processor. please write a patch and send it to me +#error Unsupported processor. Please open a bug report (bugs.php.net). #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/string.c branches/PHP_5_3/ext/standard/tests/strings/bug53319.phpt trunk/ext/standard/string.c trunk/ext/standard/tests
felipe Tue, 16 Nov 2010 22:16:44 +
Revision: http://svn.php.net/viewvc?view=revision&revision=305418
Log:
- Fixed bug #53319 (strip_tags() may strip '' incorrectly)
Bug: http://bugs.php.net/53319 (Open) Strip_tags() may strip ''
incorrectly
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/string.c
A php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug53319.phpt
U php/php-src/trunk/ext/standard/string.c
A php/php-src/trunk/ext/standard/tests/strings/bug53319.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-11-16 22:02:36 UTC (rev 305417)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-11-16 22:16:44 UTC (rev 305418)
@@ -66,6 +66,7 @@
- Fixed bug #53323 (pdo_firebird getAttribute() crash).
(preeves at ibphoenix dot com)
+- Fixed Bug #53319 (strip_tags() may strip '' incorrectly). (Felipe)
- Fixed bug #53305 (E_NOTICE when defining a constant starts with
__COMPILER_HALT_OFFSET__). (Felipe)
- Fixed bug #53297 (gettimeofday implementation in php/win32/time.c can return
Modified: php/php-src/branches/PHP_5_3/ext/standard/string.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/string.c 2010-11-16 22:02:36 UTC
(rev 305417)
+++ php/php-src/branches/PHP_5_3/ext/standard/string.c 2010-11-16 22:16:44 UTC
(rev 305418)
@@ -4211,9 +4211,8 @@
if (!isspace((int)c)) {
if (state == 0) {
state=1;
- if (c != '/')
- *(n++) = c;
- } else {
+ }
+ if (c != '/') {
*(n++) = c;
}
} else {
Added: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug53319.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug53319.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug53319.phpt
2010-11-16 22:16:44 UTC (rev 305418)
@@ -0,0 +1,17 @@
+--TEST--
+Bug #53319 (Strip_tags() may strip '' incorrectly)
+--FILE--
+USDCDN';
+var_dump(strip_tags($str, ''));
+var_dump(strip_tags($str, '') === $str);
+var_dump(strip_tags($str));
+var_dump(strip_tags('', ''));
+
+?>
+--EXPECTF--
+string(47) "USDCDN"
+bool(true)
+string(6) "USDCDN"
+string(0) ""
Property changes on:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug53319.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/trunk/ext/standard/string.c
===
--- php/php-src/trunk/ext/standard/string.c 2010-11-16 22:02:36 UTC (rev
305417)
+++ php/php-src/trunk/ext/standard/string.c 2010-11-16 22:16:44 UTC (rev
305418)
@@ -4210,9 +4210,8 @@
if (!isspace((int)c)) {
if (state == 0) {
state=1;
- if (c != '/')
- *(n++) = c;
- } else {
+ }
+ if (c != '/') {
*(n++) = c;
}
} else {
Added: php/php-src/trunk/ext/standard/tests/strings/bug53319.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/bug53319.phpt
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/strings/bug53319.phpt 2010-11-16
22:16:44 UTC (rev 305418)
@@ -0,0 +1,17 @@
+--TEST--
+Bug #53319 (Strip_tags() may strip '' incorrectly)
+--FILE--
+USDCDN';
+var_dump(strip_tags($str, ''));
+var_dump(strip_tags($str, '') === $str);
+var_dump(strip_tags($str));
+var_dump(strip_tags('', ''));
+
+?>
+--EXPECTF--
+string(47) "USDCDN"
+bool(true)
+string(6) "USDCDN"
+string(0) ""
Property changes on: php/php-src/trunk/ext/standard/tests/strings/bug53319.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/fpm/zlog.c trunk/sapi/fpm/fpm/zlog.c
fat Tue, 16 Nov 2010 22:53:47 +
Revision: http://svn.php.net/viewvc?view=revision&revision=305419
Log:
- fix (log with level < WARNING before daemonizing were not written to
/dev/stderr)
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c
U php/php-src/trunk/sapi/fpm/fpm/zlog.c
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c2010-11-16 22:16:44 UTC
(rev 305418)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c2010-11-16 22:53:47 UTC
(rev 305419)
@@ -121,7 +121,7 @@
buf[len++] = '\n';
write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len);
- if (zlog_fd != STDERR_FILENO && zlog_fd > -1 && !launched && (flags &
ZLOG_LEVEL_MASK) >= ZLOG_WARNING) {
+ if (zlog_fd != STDERR_FILENO && zlog_fd > -1 && !launched && (flags &
ZLOG_LEVEL_MASK) >= ZLOG_NOTICE) {
write(STDERR_FILENO, buf, len);
}
}
Modified: php/php-src/trunk/sapi/fpm/fpm/zlog.c
===
--- php/php-src/trunk/sapi/fpm/fpm/zlog.c 2010-11-16 22:16:44 UTC (rev
305418)
+++ php/php-src/trunk/sapi/fpm/fpm/zlog.c 2010-11-16 22:53:47 UTC (rev
305419)
@@ -121,7 +121,7 @@
buf[len++] = '\n';
write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len);
- if (zlog_fd != STDERR_FILENO && zlog_fd > -1 && !launched && (flags &
ZLOG_LEVEL_MASK) >= ZLOG_WARNING) {
+ if (zlog_fd != STDERR_FILENO && zlog_fd > -1 && !launched && (flags &
ZLOG_LEVEL_MASK) >= ZLOG_NOTICE) {
write(STDERR_FILENO, buf, len);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/credits.c trunk/ext/standard/credits.c
felipe Tue, 16 Nov 2010 23:02:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=305420
Log:
- Updated QA and User note maintainers credits
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/credits.c
U php/php-src/trunk/ext/standard/credits.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/credits.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/credits.c 2010-11-16 22:53:47 UTC
(rev 305419)
+++ php/php-src/branches/PHP_5_3/ext/standard/credits.c 2010-11-16 23:02:00 UTC
(rev 305420)
@@ -96,7 +96,7 @@
php_info_print_table_colspan_header(2, "PHP Documentation");
CREDIT_LINE("Authors", "Mehdi Achour, Friedhelm Betz, Antony
Dovgal, Nuno Lopes, Hannes Magnusson, Georg Richter, Damien Seguy, Jakub
Vrana");
CREDIT_LINE("Editor", "Philip Olson");
- CREDIT_LINE("User Note Maintainers", "Friedhelm Betz, Etienne
Kneuss, Nuno Lopes, Hannes Magnusson, Felipe Pena, Maciek Sokolewicz");
+ CREDIT_LINE("User Note Maintainers", "Friedhelm Betz, Etienne
Kneuss, Nuno Lopes, Hannes Magnusson, Felipe Pena, Maciek Sokolewicz, Daniel P.
Brown");
CREDIT_LINE("Other Contributors", "Previously active authors,
editors and other contributors are listed in the manual.");
php_info_print_table_end();
}
@@ -104,7 +104,7 @@
if (flag & PHP_CREDITS_QA) {
php_info_print_table_start();
php_info_print_table_header(1, "PHP Quality Assurance Team");
- php_info_print_table_row(1, "Ilia Alshanetsky, Joerg Behrens,
Antony Dovgal, Stefan Esser, Moriyoshi Koizumi, Magnus Maatta, Sebastian Nohn,
Derick Rethans, Melvyn Sopacua, Jani Taskinen");
+ php_info_print_table_row(1, "Ilia Alshanetsky, Joerg Behrens,
Antony Dovgal, Stefan Esser, Moriyoshi Koizumi, Magnus Maatta, Sebastian Nohn,
Derick Rethans, Melvyn Sopacua, Jani Taskinen, Pierre-Alain Joye, Dmitry
Stogov, Felipe Pena");
php_info_print_table_end();
}
Modified: php/php-src/trunk/ext/standard/credits.c
===
--- php/php-src/trunk/ext/standard/credits.c2010-11-16 22:53:47 UTC (rev
305419)
+++ php/php-src/trunk/ext/standard/credits.c2010-11-16 23:02:00 UTC (rev
305420)
@@ -96,7 +96,7 @@
php_info_print_table_colspan_header(2, "PHP Documentation");
CREDIT_LINE("Authors", "Mehdi Achour, Friedhelm Betz, Antony
Dovgal, Nuno Lopes, Hannes Magnusson, Georg Richter, Damien Seguy, Jakub
Vrana");
CREDIT_LINE("Editor", "Philip Olson");
- CREDIT_LINE("User Note Maintainers", "Friedhelm Betz, Etienne
Kneuss, Nuno Lopes, Hannes Magnusson, Felipe Pena, Maciek Sokolewicz");
+ CREDIT_LINE("User Note Maintainers", "Friedhelm Betz, Etienne
Kneuss, Nuno Lopes, Hannes Magnusson, Felipe Pena, Maciek Sokolewicz, Daniel P.
Brown");
CREDIT_LINE("Other Contributors", "Previously active authors,
editors and other contributors are listed in the manual.");
php_info_print_table_end();
}
@@ -104,7 +104,7 @@
if (flag & PHP_CREDITS_QA) {
php_info_print_table_start();
php_info_print_table_header(1, "PHP Quality Assurance Team");
- php_info_print_table_row(1, "Ilia Alshanetsky, Joerg Behrens,
Antony Dovgal, Stefan Esser, Moriyoshi Koizumi, Magnus Maatta, Sebastian Nohn,
Derick Rethans, Melvyn Sopacua, Jani Taskinen");
+ php_info_print_table_row(1, "Ilia Alshanetsky, Joerg Behrens,
Antony Dovgal, Stefan Esser, Moriyoshi Koizumi, Magnus Maatta, Sebastian Nohn,
Derick Rethans, Melvyn Sopacua, Jani Taskinen, Pierre-Alain Joye, Dmitry
Stogov, Felipe Pena");
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/standard/ credits.c
felipe Wed, 17 Nov 2010 00:02:22 +
Revision: http://svn.php.net/viewvc?view=revision&revision=305421
Log:
- Updated QA and User note maintainers credits
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/credits.c
Modified: php/php-src/branches/PHP_5_2/ext/standard/credits.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/credits.c 2010-11-16 23:02:00 UTC
(rev 305420)
+++ php/php-src/branches/PHP_5_2/ext/standard/credits.c 2010-11-17 00:02:22 UTC
(rev 305421)
@@ -98,7 +98,7 @@
php_info_print_table_colspan_header(2, "PHP Documentation");
CREDIT_LINE("Authors", "Mehdi Achour, Friedhelm Betz, Antony
Dovgal, Nuno Lopes, Hannes Magnusson, Georg Richter, Damien Seguy, Jakub
Vrana");
CREDIT_LINE("Editor", "Philip Olson");
- CREDIT_LINE("User Note Maintainers", "Friedhelm Betz, Etienne
Kneuss, Nuno Lopes, Hannes Magnusson, Felipe Pena, Maciek Sokolewicz");
+ CREDIT_LINE("User Note Maintainers", "Friedhelm Betz, Etienne
Kneuss, Nuno Lopes, Hannes Magnusson, Felipe Pena, Maciek Sokolewicz, Daniel P.
Brown");
CREDIT_LINE("Other Contributors", "Previously active authors,
editors and other contributors are listed in the manual.");
php_info_print_table_end();
}
@@ -106,7 +106,7 @@
if (flag & PHP_CREDITS_QA) {
php_info_print_table_start();
php_info_print_table_header(1, "PHP Quality Assurance Team");
- php_info_print_table_row(1, "Ilia Alshanetsky, Joerg Behrens,
Antony Dovgal, Stefan Esser, Moriyoshi Koizumi, Magnus Maatta, Sebastian Nohn,
Derick Rethans, Melvyn Sopacua, Jani Taskinen");
+ php_info_print_table_row(1, "Ilia Alshanetsky, Joerg Behrens,
Antony Dovgal, Stefan Esser, Moriyoshi Koizumi, Magnus Maatta, Sebastian Nohn,
Derick Rethans, Melvyn Sopacua, Jani Taskinen, Pierre-Alain Joye, Dmitry
Stogov, Felipe Pena");
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c trunk/ext/pdo_fireb
hi Felipe,
The 5.2 builds are broken after this commit:
do_firebird.c
firebird_driver.c
ext\pdo_firebird\firebird_driver.c(556) : error C2039:
'fetch_table_names' : is not a member of 'pdo_firebird_db_handle'
ext\pdo_firebird\php_pdo_firebird_int.h(62) : see declaration
of 'pdo_firebird_db_handle'
firebird_statement.c
pdo_firebird.c
NMAKE : fatal error U1077: '"cl.exe"' : return code '0x2'
Stop.
Cheers,
On Tue, Nov 16, 2010 at 10:02 PM, Felipe Pena wrote:
> felipe Tue, 16 Nov 2010 21:02:14 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=305416
>
> Log:
> - Fixed bug #53323 (pdo_firebird getAttribute() crash)
> patch by: preeves at ibphoenix dot com
>
> Bug: http://bugs.php.net/53323 (Open) Some calls to pdo_firebird getAttribute
> crash
>
> Changed paths:
> U php/php-src/branches/PHP_5_2/NEWS
> U php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c
> U php/php-src/branches/PHP_5_3/NEWS
> U php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
> U php/php-src/trunk/ext/pdo_firebird/firebird_driver.c
>
> Modified: php/php-src/branches/PHP_5_2/NEWS
> ===
> --- php/php-src/branches/PHP_5_2/NEWS 2010-11-16 20:50:29 UTC (rev 305415)
> +++ php/php-src/branches/PHP_5_2/NEWS 2010-11-16 21:02:14 UTC (rev 305416)
> @@ -8,6 +8,8 @@
>
> - Fixed NULL pointer dereference in ZipArchive::getArchiveComment.
> (CVE-2010-3709). (Maksymilian Arciemowicz)
> +- Fixed bug #53323 (pdo_firebird getAttribute() crash).
> + (preeves at ibphoenix dot com)
> - Fixed bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with
> large amount of data). (CVE-2010-3709). (Adam)
> - Fixed bug #52879 (Objects unreferenced in __get, __set, __isset or __unset
>
> Modified: php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c
> ===
> --- php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c
> 2010-11-16 20:50:29 UTC (rev 305415)
> +++ php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c
> 2010-11-16 21:02:14 UTC (rev 305416)
> @@ -508,7 +508,7 @@
> pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
>
> switch (attr) {
> - char tmp[200];
> + char tmp[512];
>
> case PDO_ATTR_AUTOCOMMIT:
> ZVAL_LONG(val,dbh->auto_commit);
> @@ -551,6 +551,10 @@
> ZVAL_STRING(val,tmp,1);
> return 1;
> }
> +
> + case PDO_ATTR_FETCH_TABLE_NAMES:
> + ZVAL_BOOL(val, H->fetch_table_names);
> + return 1;
> }
> return 0;
> }
>
> Modified: php/php-src/branches/PHP_5_3/NEWS
> ===
> --- php/php-src/branches/PHP_5_3/NEWS 2010-11-16 20:50:29 UTC (rev 305415)
> +++ php/php-src/branches/PHP_5_3/NEWS 2010-11-16 21:02:14 UTC (rev 305416)
> @@ -64,6 +64,8 @@
> - Fixed the filter extension accepting IPv4 octets with a leading 0 as that
> belongs to the unsupported "dotted octal" representation. (Gustavo)
>
> +- Fixed bug #53323 (pdo_firebird getAttribute() crash).
> + (preeves at ibphoenix dot com)
> - Fixed bug #53305 (E_NOTICE when defining a constant starts with
> __COMPILER_HALT_OFFSET__). (Felipe)
> - Fixed bug #53297 (gettimeofday implementation in php/win32/time.c can
> return
>
> Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
> ===
> --- php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
> 2010-11-16 20:50:29 UTC (rev 305415)
> +++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
> 2010-11-16 21:02:14 UTC (rev 305416)
> @@ -547,7 +547,7 @@
> pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
>
> switch (attr) {
> - char tmp[200];
> + char tmp[512];
>
> case PDO_ATTR_AUTOCOMMIT:
> ZVAL_LONG(val,dbh->auto_commit);
> @@ -590,6 +590,10 @@
> ZVAL_STRING(val,tmp,1);
> return 1;
> }
> +
> + case PDO_ATTR_FETCH_TABLE_NAMES:
> + ZVAL_BOOL(val, H->fetch_table_names);
> + return 1;
> }
> return 0;
> }
>
> Modified: php/php-src/trunk/ext/pdo_firebird/firebird_driver.c
> ===
> --- php/php-src/trunk/ext/pdo_firebird/firebird_driver.c 2010-11-16
> 20:50:29 UTC (rev 305415)
> +++ php/php-src/trunk/ext/pdo_firebird/firebird_driver.c 2010-11-16
> 21:02:14 UTC (rev 305416)
> @@ -547,7 +547,7 @@
> pdo
[PHP-CVS] svn: /SVNROOT/ commit-email.php
philip Wed, 17 Nov 2010 03:09:56 +
Revision: http://svn.php.net/viewvc?view=revision&revision=305433
Log:
Added new (temp and future) php-gtk documentation locations
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2010-11-17 02:53:29 UTC (rev 305432)
+++ SVNROOT/commit-email.php2010-11-17 03:09:56 UTC (rev 305433)
@@ -15,6 +15,9 @@
// GTK
'|^gtk/php-gtk-web|' => array('[email protected]'),
'|^gtk/php-gtk-doc|' => array('[email protected]'),
+'|^phpdoc/doc-base/branches/gtk-docgen|' =>
array('[email protected]'),
+'|^phpdoc/en/branches/php-gtk|' => array('[email protected]'),
+'|^phpdoc/en/trunk/reference/php-gtk|' =>
array('[email protected]'),
'|^gtk/php-gtk|' => array('[email protected]'),
'|^gtk|' => array('[email protected]'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c trunk/ext/pdo_fireb
Hi Pierre, Felipe 2010/11/17 Pierre Joye : > hi Felipe, > > The 5.2 builds are broken after this commit: This commit should be reverted in 5.2, the case PDO_ATTR_FETCH_TABLE_NAMES part. As only 5.3+ have the feature and since 5.2 is security-only I don't think it should be altered to work with it. -- regards, Kalle Sommer Nielsen [email protected] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
