[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Mar 19 06:31:44 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2288r2=1.2289diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2288 php-src/ChangeLog:1.2289 --- php-src/ChangeLog:1.2288Sat Mar 18 06:31:46 2006 +++ php-src/ChangeLog Sun Mar 19 06:31:43 2006 @@ -1,3 +1,62 @@ +2006-03-18 Antony Dovgal [EMAIL PROTECTED] + +* ext/oci8/oci8_statement.c: + MFB: Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8 + (also fixes bug #36764) + +* (PHP_5_1) + NEWS + ext/oci8/oci8_statement.c: + Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8 (also + fixes bug #36764) + +2006-03-18 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + main/streams/memory.c: + - MFH Fix seek/eof issue in temp streams + +* main/streams/memory.c: + - Fix seek/eof issue in temp streams + +* main/streams/streams.c: + - Fix issue in _php_stream_get_line(): Allow maxchars == 0 as macro +php_stream_get_line() does + +2006-03-18 Rob Richards [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS: + fix news (re-order) + +* ext/dom/php_dom.c + ext/dom/tests/bug36756.phpt: + MFB51: Fixed bug #36756 (DOMDocument::removeChild corrupts node) + add test + +* (PHP_5_1) + ext/dom/php_dom.c + ext/dom/tests/bug36756.phpt + ext/dom/tests/bug36756.phpt: + Fixed bug #36756 (DOMDocument::removeChild corrupts node) + add test + +* (PHP_4_4) + NEWS + NEWS: + BFN + +* (PHP_4_4) + ext/domxml/php_domxml.c: + Fixed bug #36776 (node_list_wrapper_dtor segfault) +- no optimizations. this extension is VERY touchy + +2006-03-18 Seiji Masugata [EMAIL PROTECTED] + +* (PHP_4_4) + ext/mbstring/mbstring.c: + fixed doesn't return value when omitting arguments in mb_get_info( ). + 2006-03-17 Marcus Boerger [EMAIL PROTECTED] * ext/standard/string.c:
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/domxml php_domxml.c
rrichards Sat Mar 18 10:46:27 2006 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/domxml php_domxml.c Log: Fixed bug #36776 (node_list_wrapper_dtor segfault) - no optimizations. this extension is VERY touchy http://cvs.php.net/viewcvs.cgi/php-src/ext/domxml/php_domxml.c?r1=1.218.2.50.2.1r2=1.218.2.50.2.2diff_format=u Index: php-src/ext/domxml/php_domxml.c diff -u php-src/ext/domxml/php_domxml.c:1.218.2.50.2.1 php-src/ext/domxml/php_domxml.c:1.218.2.50.2.2 --- php-src/ext/domxml/php_domxml.c:1.218.2.50.2.1 Sun Jan 1 13:46:52 2006 +++ php-src/ext/domxml/php_domxml.c Sat Mar 18 10:46:27 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_domxml.c,v 1.218.2.50.2.1 2006/01/01 13:46:52 sniper Exp $ */ +/* $Id: php_domxml.c,v 1.218.2.50.2.2 2006/03/18 10:46:27 rrichards Exp $ */ /* TODO * - Support Notation Nodes @@ -649,6 +649,7 @@ /* Skip property freeing for the following types */ case XML_ATTRIBUTE_DECL: case XML_DTD_NODE: + case XML_ELEMENT_DECL: case XML_ENTITY_DECL: case XML_ATTRIBUTE_NODE: break; @@ -689,6 +690,7 @@ case XML_ATTRIBUTE_DECL: case XML_DTD_NODE: case XML_ENTITY_DECL: + case XML_ELEMENT_DECL: case XML_ATTRIBUTE_NODE: break; default: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS
rrichards Sat Mar 18 10:46:56 2006 UTC Modified files: (Branch: PHP_4_4) /php-srcNEWS Log: BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1247.2.920.2.120r2=1.1247.2.920.2.121diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.120 php-src/NEWS:1.1247.2.920.2.121 --- php-src/NEWS:1.1247.2.920.2.120 Mon Mar 13 14:41:27 2006 +++ php-src/NEWSSat Mar 18 10:46:55 2006 @@ -13,6 +13,7 @@ - Fixed bug #36148 (unpack(H*hex, $data) is adding an extra character to the end of the string). (Ilia) - Fixed bug #36017 (fopen() crashes PHP when opening a URL). (Tony) +- Fixed bug #36776 (node_list_wrapper_dtor segfault). (Rob) 13 Jan 2006, Version 4.4.2 - Added missing safe_mode/open_basedir checks into cURL extension. (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) /ext/dom php_dom.c /ext/dom/tests bug36756.phpt
rrichards Sat Mar 18 11:44:49 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/dom/tests bug36756.phpt
Modified files:
/php-src/ext/domphp_dom.c
Log:
Fixed bug #36756 (DOMDocument::removeChild corrupts node)
add test
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.8r2=1.73.2.9diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.8 php-src/ext/dom/php_dom.c:1.73.2.9
--- php-src/ext/dom/php_dom.c:1.73.2.8 Sun Jan 1 12:50:06 2006
+++ php-src/ext/dom/php_dom.c Sat Mar 18 11:44:49 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.73.2.8 2006/01/01 12:50:06 sniper Exp $ */
+/* $Id: php_dom.c,v 1.73.2.9 2006/03/18 11:44:49 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -289,6 +289,8 @@
if (obj-prop_handler != NULL) {
ret = zend_hash_find(obj-prop_handler, Z_STRVAL_P(member),
Z_STRLEN_P(member)+1, (void **) hnd);
+ } else if (instanceof_function(obj-std.ce, dom_node_class_entry
TSRMLS_CC)) {
+ php_error(E_WARNING, Couldn't fetch %s. Node no longer
exists, obj-std.ce-name);
}
if (ret == SUCCESS) {
ret = hnd-read_func(obj, retval TSRMLS_CC);
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/tests/bug36756.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/bug36756.phpt
+++ php-src/ext/dom/tests/bug36756.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom php_dom.c /ext/dom/tests bug36756.phpt
rrichards Sat Mar 18 11:46:13 2006 UTC
Modified files:
/php-src/ext/domphp_dom.c
/php-src/ext/dom/tests bug36756.phpt
Log:
MFB51: Fixed bug #36756 (DOMDocument::removeChild corrupts node)
add test
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.90r2=1.91diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.90 php-src/ext/dom/php_dom.c:1.91
--- php-src/ext/dom/php_dom.c:1.90 Thu Mar 16 10:33:23 2006
+++ php-src/ext/dom/php_dom.c Sat Mar 18 11:46:13 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.90 2006/03/16 10:33:23 dmitry Exp $ */
+/* $Id: php_dom.c,v 1.91 2006/03/18 11:46:13 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -306,6 +306,8 @@
if (obj-prop_handler != NULL) {
ret = zend_u_hash_find(obj-prop_handler, Z_TYPE_P(member),
Z_UNIVAL_P(member), Z_UNILEN_P(member)+1, (void **) hnd);
+ } else if (instanceof_function(obj-std.ce, dom_node_class_entry
TSRMLS_CC)) {
+ php_error(E_WARNING, Couldn't fetch %s. Node no longer
exists, obj-std.ce-name);
}
if (ret == SUCCESS) {
ret = hnd-read_func(obj, retval TSRMLS_CC);
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/tests/bug36756.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/dom/tests/bug36756.phpt
diff -u /dev/null php-src/ext/dom/tests/bug36756.phpt:1.2
--- /dev/null Sat Mar 18 11:46:13 2006
+++ php-src/ext/dom/tests/bug36756.phpt Sat Mar 18 11:46:13 2006
@@ -0,0 +1,35 @@
+--TEST--
+Bug #36756: (DOMDocument::removeChild corrupts node)
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--FILE--
+?php
+
+/* Node is preserved from removeChild */
+$dom = new DOMDocument();
+$dom-loadXML('rootchild//root');
+$xpath = new DOMXpath($dom);
+$node = $xpath-query('/root')-item(0);
+echo $node-nodeName . \n;
+$dom-removeChild($GLOBALS['dom']-firstChild);
+echo nodeType: . $node-nodeType . \n;
+
+/* Node gets destroyed during removeChild */
+$dom-loadXML('rootchild//root');
+$xpath = new DOMXpath($dom);
+$node = $xpath-query('//child')-item(0);
+echo $node-nodeName . \n;
+$GLOBALS['dom']-removeChild($GLOBALS['dom']-firstChild);
+
+echo nodeType: . $node-nodeType . \n;
+
+?
+--EXPECTF--
+root
+nodeType: 1
+child
+
+Warning: Couldn't fetch DOMElement. Node no longer exists in %sbug36756.php on
line %d
+
+Notice: Undefined property: DOMElement::$nodeType in %sbug36756.php on line %d
+nodeType:
--
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
rrichards Sat Mar 18 11:47:06 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.466r2=1.2027.2.467diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.466 php-src/NEWS:1.2027.2.467 --- php-src/NEWS:1.2027.2.466 Fri Mar 17 22:15:57 2006 +++ php-src/NEWSSat Mar 18 11:47:05 2006 @@ -7,6 +7,7 @@ - Added overflow checks to wordwrap() function. (Ilia) - Removed the E_STRICT deprecation notice from var. (Ilia) - Fixed debug_zval_dump() to support private and protected members. (Dmitry) +- Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob) - Fixed bug #36743 (In a class extending XMLReader array properties are not writable). (Tony) - Fixed bug #36727 (segfault in pdo_pgsql bindValue() when no parameters are -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS
rrichards Sat Mar 18 11:51:53 2006 UTC Modified files: (Branch: PHP_4_4) /php-srcNEWS Log: fix news (re-order) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1247.2.920.2.121r2=1.1247.2.920.2.122diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.121 php-src/NEWS:1.1247.2.920.2.122 --- php-src/NEWS:1.1247.2.920.2.121 Sat Mar 18 10:46:55 2006 +++ php-src/NEWSSat Mar 18 11:51:52 2006 @@ -4,6 +4,7 @@ - Updated PCRE to version 6.6. (Andrei) - Added overflow checks to wordwrap() function. (Ilia) - Added a check for special characters in the session name. (Ilia) +- Fixed bug #36776 (node_list_wrapper_dtor segfault). (Rob) - Fixed bug #36459 (Incorrect adding PHPSESSID to links, which contains \r\n). (Ilia) - Fixed bug #36458 (sleep() accepts negative values). (Ilia) @@ -13,7 +14,6 @@ - Fixed bug #36148 (unpack(H*hex, $data) is adding an extra character to the end of the string). (Ilia) - Fixed bug #36017 (fopen() crashes PHP when opening a URL). (Tony) -- Fixed bug #36776 (node_list_wrapper_dtor segfault). (Rob) 13 Jan 2006, Version 4.4.2 - Added missing safe_mode/open_basedir checks into cURL extension. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams streams.c
helly Sat Mar 18 19:44:52 2006 UTC
Modified files:
/php-src/main/streams streams.c
Log:
- Fix issue in _php_stream_get_line(): Allow maxchars == 0 as macro
php_stream_get_line() does
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.106r2=1.107diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.106
php-src/main/streams/streams.c:1.107
--- php-src/main/streams/streams.c:1.106Fri Mar 17 22:52:55 2006
+++ php-src/main/streams/streams.c Sat Mar 18 19:44:51 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.106 2006/03/17 22:52:55 andrei Exp $ */
+/* $Id: streams.c,v 1.107 2006/03/18 19:44:51 helly Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1053,20 +1053,22 @@
}
if (is_unicode) {
- int ulen = u_countChar32(readptr.u, cpysz);
-
- if (ulen maxchars) {
- int32_t i = 0;
-
- ulen = maxchars;
- U16_FWD_N(readptr.u, i, cpysz, ulen);
- cpysz = i;
+ if (maxchars) {
+ int ulen = u_countChar32(readptr.u,
cpysz);
+
+ if (ulen maxchars) {
+ int32_t i = 0;
+
+ ulen = maxchars;
+ U16_FWD_N(readptr.u, i, cpysz,
ulen);
+ cpysz = i;
+ }
+ maxchars -= ulen;
}
- maxchars -= ulen;
memcpy(buf.u, readptr.u, UBYTES(cpysz));
buf.u += cpysz;
} else {
- if (cpysz maxchars) {
+ if (maxchars cpysz maxchars) {
cpysz = maxchars;
}
memcpy(buf.s, readptr.s, cpysz);
@@ -1105,10 +1107,12 @@
}
}
+ if (returned_len) {
+ *returned_len = total_copied;
+ }
+
if (total_copied == 0) {
- if (grow_mode) {
- assert(bufstart.v == NULL);
- }
+ assert(bufstart.v != NULL || !grow_mode || stream-eof);
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams memory.c
helly Sat Mar 18 19:56:35 2006 UTC
Modified files:
/php-src/main/streams memory.c
Log:
- Fix seek/eof issue in temp streams
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/memory.c?r1=1.13r2=1.14diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.13 php-src/main/streams/memory.c:1.14
--- php-src/main/streams/memory.c:1.13 Thu Jan 5 22:05:44 2006
+++ php-src/main/streams/memory.c Sat Mar 18 19:56:35 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.13 2006/01/05 22:05:44 helly Exp $ */
+/* $Id: memory.c,v 1.14 2006/03/18 19:56:35 helly Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -159,7 +159,7 @@
return 0;
}
} else {
- if (ms-fpos (size_t)(offset)) {
+ if (ms-fpos + (size_t)(offset) ms-fsize) {
ms-fpos = ms-fsize;
*newoffs = -1;
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) /main/streams memory.c
helly Sat Mar 18 19:57:00 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main/streams memory.c
Log:
- MFH Fix seek/eof issue in temp streams
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/memory.c?r1=1.8.2.5r2=1.8.2.6diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.8.2.5
php-src/main/streams/memory.c:1.8.2.6
--- php-src/main/streams/memory.c:1.8.2.5 Thu Jan 5 22:03:07 2006
+++ php-src/main/streams/memory.c Sat Mar 18 19:57:00 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.8.2.5 2006/01/05 22:03:07 helly Exp $ */
+/* $Id: memory.c,v 1.8.2.6 2006/03/18 19:57:00 helly Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -159,7 +159,7 @@
return 0;
}
} else {
- if (ms-fpos (size_t)(offset)) {
+ if (ms-fpos + (size_t)(offset) ms-fsize) {
ms-fpos = ms-fsize;
*newoffs = -1;
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) / NEWS /ext/oci8 oci8_statement.c /ext/pdo_oci oci_statement.c
tony2001Sat Mar 18 22:06:31 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_ocioci_statement.c
/php-src/ext/oci8 oci8_statement.c
/php-srcNEWS
Log:
Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8 (also
fixes bug #36764)
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_oci/oci_statement.c?r1=1.16.2.9r2=1.16.2.10diff_format=u
Index: php-src/ext/pdo_oci/oci_statement.c
diff -u php-src/ext/pdo_oci/oci_statement.c:1.16.2.9
php-src/ext/pdo_oci/oci_statement.c:1.16.2.10
--- php-src/ext/pdo_oci/oci_statement.c:1.16.2.9Sun Jan 1 12:50:12 2006
+++ php-src/ext/pdo_oci/oci_statement.c Sat Mar 18 22:06:30 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: oci_statement.c,v 1.16.2.9 2006/01/01 12:50:12 sniper Exp $ */
+/* $Id: oci_statement.c,v 1.16.2.10 2006/03/18 22:06:30 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -545,6 +545,10 @@
) {
/* should be big enough for most date formats
and numbers */
S-cols[colno].datalen = 512;
+#if defined(SQLT_IBFLOAT) defined(SQLT_IBDOUBLE)
+ } else if (dtype == SQLT_IBFLOAT || dtype ==
SQLT_IBDOUBLE) {
+ S-cols[colno].datalen = 1024;
+#endif
} else {
S-cols[colno].datalen = col-maxlen;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.12r2=1.7.2.13diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.12
php-src/ext/oci8/oci8_statement.c:1.7.2.13
--- php-src/ext/oci8/oci8_statement.c:1.7.2.12 Wed Feb 15 20:44:55 2006
+++ php-src/ext/oci8/oci8_statement.c Sat Mar 18 22:06:31 2006
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_statement.c,v 1.7.2.12 2006/02/15 20:44:55 tony2001 Exp $ */
+/* $Id: oci8_statement.c,v 1.7.2.13 2006/03/18 22:06:31 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
@@ -502,6 +502,10 @@
#endif
) {
outcol-storage_size4 = 512; /*
XXX this should fit most NLS date-formats and Numbers */
+#if defined(SQLT_IBFLOAT) defined(SQLT_IBDOUBLE)
+ } else if (outcol-data_type ==
SQLT_IBFLOAT || outcol-data_type == SQLT_IBDOUBLE) {
+ outcol-storage_size4 = 1024;
+#endif
} else {
outcol-storage_size4++; /* add
one for string terminator */
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.467r2=1.2027.2.468diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.467 php-src/NEWS:1.2027.2.468
--- php-src/NEWS:1.2027.2.467 Sat Mar 18 11:47:05 2006
+++ php-src/NEWSSat Mar 18 22:06:31 2006
@@ -5,6 +5,8 @@
- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)
- Fixed offset/length parameter validation in substr_compare() function. (Ilia)
- Added overflow checks to wordwrap() function. (Ilia)
+- Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8
+ (also fixes bug #36764). (Tony)
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8_statement.c /ext/pdo_oci oci_statement.c
tony2001Sat Mar 18 22:06:45 2006 UTC
Modified files:
/php-src/ext/pdo_ocioci_statement.c
/php-src/ext/oci8 oci8_statement.c
Log:
MFB: Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8
(also fixes bug #36764)
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_oci/oci_statement.c?r1=1.19r2=1.20diff_format=u
Index: php-src/ext/pdo_oci/oci_statement.c
diff -u php-src/ext/pdo_oci/oci_statement.c:1.19
php-src/ext/pdo_oci/oci_statement.c:1.20
--- php-src/ext/pdo_oci/oci_statement.c:1.19Sun Jan 1 13:09:53 2006
+++ php-src/ext/pdo_oci/oci_statement.c Sat Mar 18 22:06:45 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: oci_statement.c,v 1.19 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: oci_statement.c,v 1.20 2006/03/18 22:06:45 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -421,6 +421,10 @@
) {
/* should be big enough for most date formats
and numbers */
S-cols[colno].datalen = 512;
+#if defined(SQLT_IBFLOAT) defined(SQLT_IBDOUBLE)
+ } else if (dtype == SQLT_IBFLOAT || dtype ==
SQLT_IBDOUBLE) {
+ S-cols[colno].datalen = 1024;
+#endif
} else {
S-cols[colno].datalen = col-maxlen;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.17r2=1.18diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.17
php-src/ext/oci8/oci8_statement.c:1.18
--- php-src/ext/oci8/oci8_statement.c:1.17 Wed Feb 15 20:43:37 2006
+++ php-src/ext/oci8/oci8_statement.c Sat Mar 18 22:06:45 2006
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_statement.c,v 1.17 2006/02/15 20:43:37 tony2001 Exp $ */
+/* $Id: oci8_statement.c,v 1.18 2006/03/18 22:06:45 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
@@ -502,6 +502,10 @@
#endif
) {
outcol-storage_size4 = 512; /*
XXX this should fit most NLS date-formats and Numbers */
+#if defined(SQLT_IBFLOAT) defined(SQLT_IBDOUBLE)
+ } else if (outcol-data_type ==
SQLT_IBFLOAT || outcol-data_type == SQLT_IBDOUBLE) {
+ outcol-storage_size4 = 1024;
+#endif
} else {
outcol-storage_size4++; /* add
one for string terminator */
}
--
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
tony2001Sat Mar 18 22:24:05 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdopdo_stmt.c
Log:
MFH: check stream for NULL before writing to it
remove unnecessary semicolons
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.32r2=1.118.2.33diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.32
php-src/ext/pdo/pdo_stmt.c:1.118.2.33
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.32 Wed Mar 15 15:25:50 2006
+++ php-src/ext/pdo/pdo_stmt.c Sat Mar 18 22:24:05 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.32 2006/03/15 15:25:50 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.33 2006/03/18 22:24:05 tony2001 Exp $ */
/* The PDO Statement Handle Class */
@@ -42,19 +42,19 @@
* since it is a .c file, it won't be installed for use by PECL extensions, so
we include it here. */
ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0)
ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(third_arg_force_ref, 0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(fourth_arg_force_ref, 0)
@@ -62,10 +62,10 @@
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(all_args_by_ref, 1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
/* }}} */
#endif
@@ -1915,6 +1915,10 @@
struct pdo_bound_param_data *param;
PHP_STMT_GET_OBJ;
+ if (out == NULL) {
+ RETURN_FALSE;
+ }
+
php_stream_printf(out TSRMLS_CC, SQL: [%d] %.*s\n,
stmt-query_stringlen,
stmt-query_stringlen, stmt-query_string);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c
tony2001Sat Mar 18 22:25:29 2006 UTC
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
check stream for NULL before writing to it
remove unnecessary semicolons
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.150r2=1.151diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.150 php-src/ext/pdo/pdo_stmt.c:1.151
--- php-src/ext/pdo/pdo_stmt.c:1.150Wed Mar 15 15:27:08 2006
+++ php-src/ext/pdo/pdo_stmt.c Sat Mar 18 22:25:29 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.150 2006/03/15 15:27:08 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.151 2006/03/18 22:25:29 tony2001 Exp $ */
/* The PDO Statement Handle Class */
@@ -42,19 +42,19 @@
* since it is a .c file, it won't be installed for use by PECL extensions, so
we include it here. */
ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0)
ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(third_arg_force_ref, 0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(fourth_arg_force_ref, 0)
@@ -62,10 +62,10 @@
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(all_args_by_ref, 1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
/* }}} */
#endif
@@ -1876,6 +1876,10 @@
struct pdo_bound_param_data *param;
PHP_STMT_GET_OBJ;
+ if (out == NULL) {
+ RETURN_FALSE;
+ }
+
php_stream_printf(out TSRMLS_CC, SQL: [%d] %.*s\n,
stmt-query_stringlen,
stmt-query_stringlen, stmt-query_string);
--
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/date php_date.c /ext/date/lib parse_tz.c
tony2001Sat Mar 18 23:43:48 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/date php_date.c
/php-src/ext/date/lib parse_tz.c
Log:
fix several leaks in date_sun*() functions
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.43.2.42r2=1.43.2.43diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.42
php-src/ext/date/php_date.c:1.43.2.43
--- php-src/ext/date/php_date.c:1.43.2.42 Mon Mar 6 21:44:53 2006
+++ php-src/ext/date/php_date.c Sat Mar 18 23:43:48 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.42 2006/03/06 21:44:53 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.43 2006/03/18 23:43:48 tony2001 Exp $ */
#include php.h
#include php_streams.h
@@ -1746,7 +1746,8 @@
timelib_unixtime2local(t, time);
rs = timelib_astro_rise_set_altitude(t, longitude, latitude, altitude,
altitude -1 ? 1 : 0, h_rise, h_set, rise, set, transit);
-
+ timelib_time_dtor(t);
+
if (rs != 0) {
RETURN_FALSE;
}
@@ -1889,6 +1890,8 @@
t2-sse = set;
add_assoc_long(return_value,
astronomical_twilight_end, timelib_date_to_int(t2, dummy));
}
+ timelib_time_dtor(t);
+ timelib_time_dtor(t2);
}
/* }}} */
/*
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/lib/parse_tz.c?r1=1.20.2.5r2=1.20.2.6diff_format=u
Index: php-src/ext/date/lib/parse_tz.c
diff -u php-src/ext/date/lib/parse_tz.c:1.20.2.5
php-src/ext/date/lib/parse_tz.c:1.20.2.6
--- php-src/ext/date/lib/parse_tz.c:1.20.2.5Wed Jan 4 21:31:34 2006
+++ php-src/ext/date/lib/parse_tz.c Sat Mar 18 23:43:48 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_tz.c,v 1.20.2.5 2006/01/04 21:31:34 derick Exp $ */
+/* $Id: parse_tz.c,v 1.20.2.6 2006/03/18 23:43:48 tony2001 Exp $ */
#include timelib.h
@@ -368,6 +368,7 @@
timelib_sll timelib_get_current_offset(timelib_time *t)
{
timelib_time_offset *gmt_offset;
+ timelib_sll retval;
switch (t-zone_type) {
case TIMELIB_ZONETYPE_ABBR:
@@ -376,7 +377,9 @@
case TIMELIB_ZONETYPE_ID:
gmt_offset = timelib_get_time_zone_info(t-sse,
t-tz_info);
- return gmt_offset-offset;
+ retval = gmt_offset-offset;
+ timelib_time_offset_dtor(gmt_offset);
+ return retval;
default:
return 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/lib parse_tz.c
tony2001Sat Mar 18 23:44:30 2006 UTC
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/lib parse_tz.c
Log:
MFB: fix several leaks in date_sun*() functions
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.87r2=1.88diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.87 php-src/ext/date/php_date.c:1.88
--- php-src/ext/date/php_date.c:1.87Mon Mar 6 21:43:34 2006
+++ php-src/ext/date/php_date.c Sat Mar 18 23:44:30 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.87 2006/03/06 21:43:34 derick Exp $ */
+/* $Id: php_date.c,v 1.88 2006/03/18 23:44:30 tony2001 Exp $ */
#include php.h
#include php_streams.h
@@ -1901,7 +1901,8 @@
timelib_unixtime2local(t, time);
rs = timelib_astro_rise_set_altitude(t, longitude, latitude, altitude,
altitude -1 ? 1 : 0, h_rise, h_set, rise, set, transit);
-
+ timelib_time_dtor(t);
+
if (rs != 0) {
RETURN_FALSE;
}
@@ -2044,6 +2045,8 @@
t2-sse = set;
add_assoc_long(return_value,
astronomical_twilight_end, timelib_date_to_int(t2, dummy));
}
+ timelib_time_dtor(t);
+ timelib_time_dtor(t2);
}
/* }}} */
/*
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/lib/parse_tz.c?r1=1.25r2=1.26diff_format=u
Index: php-src/ext/date/lib/parse_tz.c
diff -u php-src/ext/date/lib/parse_tz.c:1.25
php-src/ext/date/lib/parse_tz.c:1.26
--- php-src/ext/date/lib/parse_tz.c:1.25Wed Jan 4 12:57:04 2006
+++ php-src/ext/date/lib/parse_tz.c Sat Mar 18 23:44:30 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_tz.c,v 1.25 2006/01/04 12:57:04 derick Exp $ */
+/* $Id: parse_tz.c,v 1.26 2006/03/18 23:44:30 tony2001 Exp $ */
#include timelib.h
@@ -368,6 +368,7 @@
timelib_sll timelib_get_current_offset(timelib_time *t)
{
timelib_time_offset *gmt_offset;
+ timelib_sll retval;
switch (t-zone_type) {
case TIMELIB_ZONETYPE_ABBR:
@@ -376,7 +377,9 @@
case TIMELIB_ZONETYPE_ID:
gmt_offset = timelib_get_time_zone_info(t-sse,
t-tz_info);
- return gmt_offset-offset;
+ retval = gmt_offset-offset;
+ timelib_time_offset_dtor(gmt_offset);
+ return retval;
default:
return 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
