[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon May 31 20:32:33 2004 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1644r2=1.1645ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1644 php-src/ChangeLog:1.1645 --- php-src/ChangeLog:1.1644Sun May 30 20:33:13 2004 +++ php-src/ChangeLog Mon May 31 20:32:32 2004 @@ -1,3 +1,84 @@ +2004-05-31 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_reflection_api.c: + Refcount must not be set separatley again. + +* ZendEngine2/zend_reflection_api.c + ZendEngine2/zend_reflection_api.c: + Add missing initialization + +* ZendEngine2/zend_compile.c: + + +2004-05-31 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/informix/ifx.ec: + MFB: missing ';' + +2004-05-31 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/yp/yp.c: + Added missing argument check. + +2004-05-31 Pierre-Alain Joye [EMAIL PROTECTED] + +* (PHP_4_3) + ext/informix/ifx.ec: + - Missing ';' + +2004-05-31 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/informix/ifx.ec: + Fix build. + +2004-05-31 Ard Biesheuvel [EMAIL PROTECTED] + +* ext/interbase/ibase_query.c: + Fix typo in error message + +* ext/interbase/ibase_query.c + ext/interbase/php_ibase_includes.h + ext/interbase/tests/interbase.inc: + Improved handling of 'CREATE DATABASE ...' by ibase_query() + Improved param handling of ibase_query() and ibase_execute() + +2004-05-31 Rob Richards [EMAIL PROTECTED] + +* ext/dom/attr.c + ext/dom/cdatasection.c + ext/dom/characterdata.c + ext/dom/comment.c + ext/dom/document.c + ext/dom/documentfragment.c + ext/dom/documenttype.c + ext/dom/domexception.c + ext/dom/domimplementation.c + ext/dom/element.c + ext/dom/entity.c + ext/dom/entityreference.c + ext/dom/namednodemap.c + ext/dom/namelist.c + ext/dom/node.c + ext/dom/nodelist.c + ext/dom/notation.c + ext/dom/processinginstruction.c + ext/dom/text.c + ext/dom/xpath.c: + Fix bug #28584: DOMText::splitText() does not split text properly + (benjcarson) + Prototype fixes + +2004-05-31 Zeev Suraski [EMAIL PROTECTED] + +* ext/dom/document.c: + Fix prototypes + +2004-05-31 Ard Biesheuvel [EMAIL PROTECTED] + +* (PHP_4_3) + ext/informix/ifx.ec: + Fix build + 2004-05-30 Brad House [EMAIL PROTECTED] * ext/mcve/mcve.c @@ -4358,7 +4439,7 @@ 2004-03-18 Pierre-Alain Joye [EMAIL PROTECTED] * ext/gd/tests/bug27582_2.phpt: - - Fix the test description and $Id: ChangeLog,v 1.1644 2004/05/31 00:33:13 changelog Exp $ + - Fix the test description and $Id: ChangeLog,v 1.1645 2004/06/01 00:32:32 changelog Exp $ 2004-03-18 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon May 31 20:32:37 2004 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.476r2=1.477ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.476 ZendEngine2/ChangeLog:1.477 --- ZendEngine2/ChangeLog:1.476 Fri May 28 20:32:22 2004 +++ ZendEngine2/ChangeLog Mon May 31 20:32:37 2004 @@ -1,3 +1,15 @@ +2004-05-31 Marcus Boerger [EMAIL PROTECTED] + +* zend_reflection_api.c: + Refcount must not be set separatley again. + +* zend_reflection_api.c + zend_reflection_api.c: + Add missing initialization + +* zend_compile.c: + + 2004-05-28 Andrei Zmievski [EMAIL PROTECTED] * zend.c: @@ -4732,7 +4744,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.476 2004/05/29 00:32:22 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.477 2004/06/01 00:32:37 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -6456,7 +6468,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.476 2004/05/29 00:32:22 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.477 2004/06/01 00:32:37 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/informix ifx.ec
abies Mon May 31 04:33:43 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/informix ifx.ec
Log:
Fix build
http://cvs.php.net/diff.php/php-src/ext/informix/ifx.ec?r1=1.69.2.24r2=1.69.2.25ty=u
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.69.2.24 php-src/ext/informix/ifx.ec:1.69.2.25
--- php-src/ext/informix/ifx.ec:1.69.2.24 Sun May 30 14:58:48 2004
+++ php-src/ext/informix/ifx.ec Mon May 31 04:33:42 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: ifx.ec,v 1.69.2.24 2004/05/30 18:58:48 iliaa Exp $ */
+/* $Id: ifx.ec,v 1.69.2.25 2004/05/31 08:33:42 abies Exp $ */
/* ---
* if you want a function reference : grep '^\*\*' ifx.ec will give
@@ -126,8 +126,8 @@
#define PHP_IFX_CHECK_CONNECTION(ifx) \
{ \
if (ifx_check() 0) { \
-IFXG(sv_sqlcode) = SQLCODE; \
char *ifx_err = ifx_error(ifx); \
+IFXG(sv_sqlcode) = SQLCODE; \
php_error_docref(NULL TSRMLS_CC, E_WARNING, Set connection %s fails
(%s), ifx, ifx_err); \
efree(ifx_err);\
RETURN_FALSE; \
@@ -289,7 +289,7 @@
PARAMETER char *link;
EXEC SQL END DECLARE SECTION;
{
- char *ifx_err = null;
+ char *ifx_err = NULL;
TSRMLS_FETCH();
EXEC SQL SET CONNECTION :link;
--
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.c
zeevMon May 31 04:58:32 2004 EDT
Modified files:
/php-src/ext/splspl_iterators.c
Log:
Fix typo
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.37r2=1.38ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.37 php-src/ext/spl/spl_iterators.c:1.38
--- php-src/ext/spl/spl_iterators.c:1.37Sun May 30 13:32:32 2004
+++ php-src/ext/spl/spl_iterators.c Mon May 31 04:58:32 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.37 2004/05/30 17:32:32 zeev Exp $ */
+/* $Id: spl_iterators.c,v 1.38 2004/05/31 08:58:32 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1265,7 +1265,7 @@
{NULL, NULL, NULL}
};
-/* {{{ proto CachingRecursiveIterator::__constrcut(RecursiveIterator $it)
+/* {{{ proto CachingRecursiveIterator::__construct(RecursiveIterator $it)
Create an iterator from a RecursiveIterator */
SPL_METHOD(CachingRecursiveIterator, __construct)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
rrichards Mon May 31 07:20:46 2004 EDT
Modified files:
/php-src/ext/libxml libxml.c
Log:
fix leak when using relaxng
interim fix for isolating our streams handling
- once libxml supports overriding streams this should be changed
for security reasons
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.17r2=1.18ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.17 php-src/ext/libxml/libxml.c:1.18
--- php-src/ext/libxml/libxml.c:1.17Fri Apr 23 13:31:44 2004
+++ php-src/ext/libxml/libxml.c Mon May 31 07:20:46 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.17 2004/04/23 17:31:44 rrichards Exp $ */
+/* $Id: libxml.c,v 1.18 2004/05/31 11:20:46 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -40,6 +40,9 @@
#include libxml/tree.h
#include libxml/uri.h
#include libxml/xmlerror.h
+#ifdef LIBXML_SCHEMAS_ENABLED
+#include libxml/relaxng.h
+#endif
#include php_libxml.h
@@ -241,7 +244,11 @@
int php_libxml_streams_IO_match_wrapper(const char *filename)
{
TSRMLS_FETCH();
- return php_stream_locate_url_wrapper(filename, NULL, 0 TSRMLS_CC) ? 1 : 0;
+
+ if (zend_is_executing(TSRMLS_C)) {
+ return php_stream_locate_url_wrapper(filename, NULL, 0 TSRMLS_CC) ? 1
: 0;
+ }
+ return 0;
}
void *php_libxml_streams_IO_open_wrapper(const char *filename, const char *mode,
const int read_only)
@@ -408,6 +415,9 @@
PHP_LIBXML_API void php_libxml_shutdown() {
if (_php_libxml_initialized) {
+#if defined(LIBXML_SCHEMAS_ENABLED)
+ xmlRelaxNGCleanupTypes();
+#endif
xmlCleanupParser();
zend_hash_destroy(php_libxml_exports);
_php_libxml_initialized = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom document.c
zeevMon May 31 08:27:50 2004 EDT
Modified files:
/php-src/ext/domdocument.c
Log:
Fix prototypes
http://cvs.php.net/diff.php/php-src/ext/dom/document.c?r1=1.53r2=1.54ty=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.53 php-src/ext/dom/document.c:1.54
--- php-src/ext/dom/document.c:1.53 Thu May 27 07:15:44 2004
+++ php-src/ext/dom/document.c Mon May 31 08:27:49 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.53 2004/05/27 11:15:44 rrichards Exp $ */
+/* $Id: document.c,v 1.54 2004/05/31 12:27:49 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1544,7 +1544,7 @@
}
/* }}} end dom_parser_document */
-/* {{{ proto boolean domnode dom_document_load(string source);
+/* {{{ proto boolean|domnode dom_document_load(string source);
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load
Since: DOM Level 3
*/
@@ -1554,7 +1554,7 @@
}
/* }}} end dom_document_load */
-/* {{{ proto boolean domnode dom_document_loadxml(string source);
+/* {{{ proto boolean|domnode dom_document_loadxml(string source);
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML
Since: DOM Level 3
*/
@@ -1564,7 +1564,7 @@
}
/* }}} end dom_document_loadxml */
-/* {{{ proto long domnode dom_document_save(string file);
+/* {{{ proto long|domnode dom_document_save(string file);
Convenience method to save to file
*/
PHP_FUNCTION(dom_document_save)
@@ -1600,7 +1600,7 @@
}
/* }}} end dom_document_save */
-/* {{{ proto string domnode dom_document_savexml([node n]);
+/* {{{ proto string|domnode dom_document_savexml([node n]);
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML
Since: DOM Level 3
*/
@@ -1729,7 +1729,7 @@
}
-/* {{{ proto string domnode dom_document_validate();
+/* {{{ proto string|domnode dom_document_validate();
Since: DOM extended
*/
PHP_FUNCTION(dom_document_validate)
@@ -1842,14 +1842,14 @@
}
}
-/* {{{ proto boolean domnode _dom_document_schema_validate(string filename); */
+/* {{{ proto boolean|domnode _dom_document_schema_validate(string filename); */
PHP_FUNCTION(dom_document_schema_validate_file)
{
_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
}
/* }}} end _dom_document_schema_validate */
-/* {{{ proto boolean domnode _dom_document_schema_validate(string source); */
+/* {{{ proto boolean|domnode _dom_document_schema_validate(string source); */
PHP_FUNCTION(dom_document_schema_validate_xml)
{
_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU,
DOM_LOAD_STRING);
@@ -1932,14 +1932,14 @@
}
}
-/* {{{ proto boolean domnode dom_document_relaxNG_validate_file(string filename); */
+/* {{{ proto boolean|domnode dom_document_relaxNG_validate_file(string filename); */
PHP_FUNCTION(dom_document_relaxNG_validate_file)
{
_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU,
DOM_LOAD_FILE);
}
/* }}} end dom_document_relaxNG_validate_file */
-/* {{{ proto boolean domnode dom_document_relaxNG_validate_xml(string source); */
+/* {{{ proto boolean|domnode dom_document_relaxNG_validate_xml(string source); */
PHP_FUNCTION(dom_document_relaxNG_validate_xml)
{
_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU,
DOM_LOAD_STRING);
@@ -2022,7 +2022,7 @@
}
}
-/* {{{ proto boolean domnode dom_document_load_html_file(string source);
+/* {{{ proto boolean|domnode dom_document_load_html_file(string source);
Since: DOM extended
*/
PHP_METHOD(domdocument, loadHTMLFile)
@@ -2031,7 +2031,7 @@
}
/* }}} end dom_document_load_html_file */
-/* {{{ proto boolean domnode dom_document_load_html(string source);
+/* {{{ proto boolean|domnode dom_document_load_html(string source);
Since: DOM extended
*/
PHP_METHOD(domdocument, loadHTML)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom attr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c documenttype.c domexception.c domimplementation.c element.c entity.c entityreference.c namednodemap.c namelist.c node.c nodelist.c notation.c processinginstruction.c text.c xpath.c
rrichards Mon May 31 08:50:28 2004 EDT
Modified files:
/php-src/ext/domattr.c cdatasection.c characterdata.c comment.c
document.c documentfragment.c documenttype.c
domexception.c domimplementation.c element.c
entity.c entityreference.c namednodemap.c
namelist.c node.c nodelist.c notation.c
processinginstruction.c text.c xpath.c
Log:
Fix bug #28584: DOMText::splitText() does not split text properly (benjcarson)
Prototype fixes
http://cvs.php.net/diff.php/php-src/ext/dom/attr.c?r1=1.14r2=1.15ty=u
Index: php-src/ext/dom/attr.c
diff -u php-src/ext/dom/attr.c:1.14 php-src/ext/dom/attr.c:1.15
--- php-src/ext/dom/attr.c:1.14 Sun May 16 06:30:16 2004
+++ php-src/ext/dom/attr.c Mon May 31 08:50:28 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: attr.c,v 1.14 2004/05/16 10:30:16 rrichards Exp $ */
+/* $Id: attr.c,v 1.15 2004/05/31 12:50:28 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -31,7 +31,7 @@
/*
-* class domattr extends domnode
+* class DOMAttr extends DOMNode
*
* URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-637646024
* Since:
@@ -43,7 +43,7 @@
{NULL, NULL, NULL}
};
-/* {{{ proto void DomAttr::__construct(string name, [string value]); */
+/* {{{ proto void DOMAttr::__construct(string name, [string value]); */
PHP_METHOD(domattr, __construct)
{
@@ -85,7 +85,7 @@
}
}
-/* }}} end DomAttr::__construct */
+/* }}} end DOMAttr::__construct */
/* {{{ proto name string
@@ -200,7 +200,7 @@
-/* {{{ proto ownerElement element
+/* {{{ proto ownerElement DOMElement
readonly=yes
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement
Since: DOM Level 2
@@ -236,7 +236,7 @@
-/* {{{ proto schemaTypeInfotypeinfo
+/* {{{ proto schemaTypeInfoDOMTypeInfo
readonly=yes
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo
Since: DOM Level 3
http://cvs.php.net/diff.php/php-src/ext/dom/cdatasection.c?r1=1.9r2=1.10ty=u
Index: php-src/ext/dom/cdatasection.c
diff -u php-src/ext/dom/cdatasection.c:1.9 php-src/ext/dom/cdatasection.c:1.10
--- php-src/ext/dom/cdatasection.c:1.9 Sun May 16 06:30:16 2004
+++ php-src/ext/dom/cdatasection.c Mon May 31 08:50:28 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: cdatasection.c,v 1.9 2004/05/16 10:30:16 rrichards Exp $ */
+/* $Id: cdatasection.c,v 1.10 2004/05/31 12:50:28 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -29,7 +29,7 @@
/*
-* class domcdatasection extends domtext
+* class DOMCdataSection extends DOMText
*
* URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-667469212
* Since:
@@ -40,7 +40,7 @@
{NULL, NULL, NULL}
};
-/* {{{ proto void DomCDataSection::__construct(string value); */
+/* {{{ proto void DOMCdataSection::__construct(string value); */
PHP_METHOD(domcdatasection, __construct)
{
@@ -73,6 +73,6 @@
php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep,
(void *)intern TSRMLS_CC);
}
}
-/* }}} end DomCDataSection::__construct */
+/* }}} end DOMCdataSection::__construct */
#endif
http://cvs.php.net/diff.php/php-src/ext/dom/characterdata.c?r1=1.12r2=1.13ty=u
Index: php-src/ext/dom/characterdata.c
diff -u php-src/ext/dom/characterdata.c:1.12 php-src/ext/dom/characterdata.c:1.13
--- php-src/ext/dom/characterdata.c:1.12Mon Feb 16 08:06:33 2004
+++ php-src/ext/dom/characterdata.c Mon May 31 08:50:28 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: characterdata.c,v 1.12 2004/02/16 13:06:33 rrichards Exp $ */
+/* $Id: characterdata.c,v 1.13 2004/05/31 12:50:28 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -29,7 +29,7 @@
/*
-* class domcharacterdata extends domnode
+* class DOMCharacterData extends DOMNode
*
* URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-FF21A306
* Since:
@@ -105,7 +105,7 @@
/* }}} */
-/* {{{ proto lengthunsigned long
+/* {{{ proto lengthlong
readonly=yes
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7D61178C
Since:
@@ -140,7 +140,7 @@
/* }}} */
-/* {{{ proto domstring dom_characterdata_substring_data(unsigned long offset,
unsigned long count);
+/* {{{ proto string dom_characterdata_substring_data(long offset, long count);
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
Since:
*/
@@ -190,7 +190,7 @@
/* }}} end dom_characterdata_substring_data */
-/*
[PHP-CVS] cvs: php-src /ext/interbase ibase_query.c php_ibase_includes.h /ext/interbase/tests interbase.inc
abies Mon May 31 09:40:25 2004 EDT
Modified files:
/php-src/ext/interbase ibase_query.c php_ibase_includes.h
/php-src/ext/interbase/testsinterbase.inc
Log:
Improved handling of 'CREATE DATABASE ...' by ibase_query()
Improved param handling of ibase_query() and ibase_execute()
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_query.c?r1=1.11r2=1.12ty=u
Index: php-src/ext/interbase/ibase_query.c
diff -u php-src/ext/interbase/ibase_query.c:1.11
php-src/ext/interbase/ibase_query.c:1.12
--- php-src/ext/interbase/ibase_query.c:1.11Sun May 30 16:40:36 2004
+++ php-src/ext/interbase/ibase_query.c Mon May 31 09:40:24 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ibase_query.c,v 1.11 2004/05/30 20:40:36 abies Exp $ */
+/* $Id: ibase_query.c,v 1.12 2004/05/31 13:40:24 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -92,6 +92,9 @@
static int le_result, le_query;
+#define LE_RESULT Firebird/InterBase result
+#define LE_QUERY Firebird/InterBase query
+
static void _php_ibase_free_xsqlda(XSQLDA *sqlda) /* {{{ */
{
int i;
@@ -838,7 +841,7 @@
/* }}} */
static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resultp,
/* {{{ */
- ibase_query *ib_query, int argc, zval ***args)
+ ibase_query *ib_query, zval ***args)
{
XSQLDA *in_sqlda = NULL, *out_sqlda = NULL;
BIND_BUF *bind_buf = NULL;
@@ -846,7 +849,8 @@
static char info_count[] = { isc_info_sql_records };
char result[64];
ISC_STATUS isc_result;
-
+ int argc = ib_query-in_sqlda ? ib_query-in_sqlda-sqld : 0;
+
RESET_ERRMSG;
for (i = 0; i argc; ++i) {
@@ -935,11 +939,6 @@
if (ib_query-in_sqlda) { /* has placeholders */
IBDEBUG(Query wants XSQLDA for input);
- if (ib_query-in_sqlda-sqld != argc) {
- _php_ibase_module_error(Placeholders (%d) and variables (%d)
mismatch
- TSRMLS_CC, ib_query-in_sqlda-sqld, argc);
- goto _php_ibase_exec_error;
- }
in_sqlda = emalloc(XSQLDA_LENGTH(ib_query-in_sqlda-sqld));
memcpy(in_sqlda, ib_query-in_sqlda,
XSQLDA_LENGTH(ib_query-in_sqlda-sqld));
bind_buf = safe_emalloc(sizeof(BIND_BUF), ib_query-in_sqlda-sqld, 0);
@@ -1035,141 +1034,123 @@
Execute a query */
PHP_FUNCTION(ibase_query)
{
- zval ***args, ***bind_args = NULL;
- int i, bind_n = 0, trans_res_id = 0;
+ zval *zlink, *ztrans, ***bind_args = NULL;
+ char *query;
+ int bind_i, query_len;
+ long trans_res_id = 0;
ibase_db_link *ib_link = NULL;
ibase_trans *trans = NULL;
ibase_query ib_query = { NULL, NULL, 0, 0 };
ibase_result *result = NULL;
- char *query;
RESET_ERRMSG;
-
- if (ZEND_NUM_ARGS() 1) {
- WRONG_PARAM_COUNT;
- }
-
- /* use stack to avoid leaks */
- args = (zval ***) do_alloca(sizeof(zval **) * ZEND_NUM_ARGS());
-
+
RETVAL_FALSE;
- if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
- goto ibase_query_end;
-
- }
-
- i = 0;
- while (Z_TYPE_PP(args[i++]) != IS_STRING) {
- if (i = ZEND_NUM_ARGS()) {
- _php_ibase_module_error(Query argument missing TSRMLS_CC);
- goto ibase_query_end;
-
- }
- }
+ switch (ZEND_NUM_ARGS()) {
+ long l;
- convert_to_string_ex(args[i-1]);
- query = Z_STRVAL_PP(args[i-1]);
+ default:
+ if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, 3
TSRMLS_CC, rrs,
+ zlink, ztrans, query, query_len)) {
- /* find out if the first one or two arguments refer to either a link id,
- a trans id or both */
- switch (i) {
- case 1:
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link*, zlink,
-1, LE_LINK, le_link, le_plink);
+ ZEND_FETCH_RESOURCE(trans, ibase_trans*, ztrans, -1,
LE_TRANS, le_trans);
+
+ trans_res_id = Z_LVAL_P(ztrans);
+ bind_i = 3;
+ break;
+ }
+ case 2:
+ if (SUCCESS ==
zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, 2 TSRMLS_CC, rs,
+ zlink, query, query_len)) {
+
_php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, zlink, ib_link, trans);
+
+ if (trans != NULL) {
+ trans_res_id = Z_LVAL_P(zlink);
+
[PHP-CVS] cvs: php-src /ext/interbase ibase_query.c
abies Mon May 31 09:43:06 2004 EDT
Modified files:
/php-src/ext/interbase ibase_query.c
Log:
Fix typo in error message
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_query.c?r1=1.12r2=1.13ty=u
Index: php-src/ext/interbase/ibase_query.c
diff -u php-src/ext/interbase/ibase_query.c:1.12
php-src/ext/interbase/ibase_query.c:1.13
--- php-src/ext/interbase/ibase_query.c:1.12Mon May 31 09:40:24 2004
+++ php-src/ext/interbase/ibase_query.c Mon May 31 09:43:06 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ibase_query.c,v 1.12 2004/05/31 13:40:24 abies Exp $ */
+/* $Id: ibase_query.c,v 1.13 2004/05/31 13:43:06 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1137,7 +1137,7 @@
expected_n = ib_query.in_sqlda ? ib_query.in_sqlda-sqld : 0;
if (bind_n != expected_n) {
- _php_ibase_module_error(Statements expect %d arguments, %d
given TSRMLS_CC,
+ _php_ibase_module_error(Statement expects %d arguments, %d
given TSRMLS_CC,
expected_n, bind_n);
break;
@@ -1810,7 +1810,7 @@
expected_n = ib_query-in_sqlda ? ib_query-in_sqlda-sqld : 0;
if (bind_n != expected_n) {
- _php_ibase_module_error(Statements expect %d arguments, %d
given TSRMLS_CC,
+ _php_ibase_module_error(Statement expects %d arguments, %d
given TSRMLS_CC,
expected_n, bind_n);
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/informix ifx.ec
iliaa Mon May 31 16:25:36 2004 EDT
Modified files:
/php-src/ext/informix ifx.ec
Log:
Fix build.
http://cvs.php.net/diff.php/php-src/ext/informix/ifx.ec?r1=1.103r2=1.104ty=u
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.103 php-src/ext/informix/ifx.ec:1.104
--- php-src/ext/informix/ifx.ec:1.103 Sun May 30 14:58:46 2004
+++ php-src/ext/informix/ifx.ec Mon May 31 16:25:36 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: ifx.ec,v 1.103 2004/05/30 18:58:46 iliaa Exp $ */
+/* $Id: ifx.ec,v 1.104 2004/05/31 20:25:36 iliaa Exp $ */
/* ---
* if you want a function reference : grep '^\*\*' ifx.ec will give
@@ -126,8 +126,8 @@
#define PHP_IFX_CHECK_CONNECTION(ifx) \
{ \
if (ifx_check() 0) { \
+ char *ifx_err = ifx_error(ifx); \
IFXG(sv_sqlcode) = SQLCODE; \
-char *ifx_err = ifx_error(ifx); \
php_error_docref(NULL TSRMLS_CC, E_WARNING, Set connection %s fails
(%s), ifx, ifx_err); \
efree(ifx_err);\
RETURN_FALSE; \
@@ -289,7 +289,7 @@
PARAMETER char *link;
EXEC SQL END DECLARE SECTION;
{
- char *ifx_err = null;
+ char *ifx_err = NULL;
TSRMLS_FETCH();
EXEC SQL SET CONNECTION :link;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/informix ifx.ec
pajoye Mon May 31 16:59:57 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/informix ifx.ec
Log:
- Missing ';'
http://cvs.php.net/diff.php/php-src/ext/informix/ifx.ec?r1=1.69.2.25r2=1.69.2.26ty=u
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.69.2.25 php-src/ext/informix/ifx.ec:1.69.2.26
--- php-src/ext/informix/ifx.ec:1.69.2.25 Mon May 31 04:33:42 2004
+++ php-src/ext/informix/ifx.ec Mon May 31 16:59:56 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: ifx.ec,v 1.69.2.25 2004/05/31 08:33:42 abies Exp $ */
+/* $Id: ifx.ec,v 1.69.2.26 2004/05/31 20:59:56 pajoye Exp $ */
/* ---
* if you want a function reference : grep '^\*\*' ifx.ec will give
@@ -1419,7 +1419,7 @@
}
if (ifx_check() 0) {
- char *ifx_err = ifx_error(ifx)
+ char *ifx_err = ifx_error(ifx);
IFXG(sv_sqlcode) = SQLCODE;
EXEC SQL DEALLOCATE DESCRIPTOR :i_descrpid;
EXEC SQL free :statemid;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/yp yp.c
iliaa Mon May 31 17:01:18 2004 EDT
Modified files:
/php-src/ext/yp yp.c
Log:
Added missing argument check.
http://cvs.php.net/diff.php/php-src/ext/yp/yp.c?r1=1.44r2=1.45ty=u
Index: php-src/ext/yp/yp.c
diff -u php-src/ext/yp/yp.c:1.44 php-src/ext/yp/yp.c:1.45
--- php-src/ext/yp/yp.c:1.44Mon Apr 26 16:14:09 2004
+++ php-src/ext/yp/yp.c Mon May 31 17:01:18 2004
@@ -16,7 +16,7 @@
| Fredrik Ohrn|
+--+
*/
-/* $Id: yp.c,v 1.44 2004/04/26 20:14:09 iliaa Exp $ */
+/* $Id: yp.c,v 1.45 2004/05/31 21:01:18 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -77,6 +77,10 @@
PHP_FUNCTION(yp_get_default_domain)
{
char *outdomain;
+
+ if (ZEND_NUM_ARGS()) {
+ WRONG_PARAM_COUNT;
+ }
if((YP(error) = yp_get_default_domain(outdomain))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, yperr_string
(YP(error)));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/yp yp.c
iliaa Mon May 31 17:01:20 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/yp yp.c
Log:
MFH: Added missing argument check.
http://cvs.php.net/diff.php/php-src/ext/yp/yp.c?r1=1.31.8.5r2=1.31.8.6ty=u
Index: php-src/ext/yp/yp.c
diff -u php-src/ext/yp/yp.c:1.31.8.5 php-src/ext/yp/yp.c:1.31.8.6
--- php-src/ext/yp/yp.c:1.31.8.5Thu Nov 13 19:32:29 2003
+++ php-src/ext/yp/yp.c Mon May 31 17:01:20 2004
@@ -16,7 +16,7 @@
| Fredrik Ohrn|
+--+
*/
-/* $Id: yp.c,v 1.31.8.5 2003/11/14 00:32:29 iliaa Exp $ */
+/* $Id: yp.c,v 1.31.8.6 2004/05/31 21:01:20 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -77,6 +77,10 @@
PHP_FUNCTION(yp_get_default_domain)
{
char *outdomain;
+
+ if (ZEND_NUM_ARGS()) {
+ WRONG_PARAM_COUNT;
+ }
if((YP(error) = yp_get_default_domain(outdomain))) {
php_error(E_WARNING, yperr_string (YP(error)));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/informix ifx.ec
pajoye Mon May 31 17:04:20 2004 EDT
Modified files:
/php-src/ext/informix ifx.ec
Log:
MFB: missing ';'
http://cvs.php.net/diff.php/php-src/ext/informix/ifx.ec?r1=1.104r2=1.105ty=u
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.104 php-src/ext/informix/ifx.ec:1.105
--- php-src/ext/informix/ifx.ec:1.104 Mon May 31 16:25:36 2004
+++ php-src/ext/informix/ifx.ec Mon May 31 17:04:20 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: ifx.ec,v 1.104 2004/05/31 20:25:36 iliaa Exp $ */
+/* $Id: ifx.ec,v 1.105 2004/05/31 21:04:20 pajoye Exp $ */
/* ---
* if you want a function reference : grep '^\*\*' ifx.ec will give
@@ -433,7 +433,6 @@
IFXG(num_links) = IFXG(num_persistent);
return SUCCESS;
}
-
PHP_MINFO_FUNCTION(ifx)
{
char buf[32];
@@ -444,7 +443,7 @@
php_info_print_table_row(2, Active Persistent links, buf);
sprintf(buf, %ld, IFXG(num_links));
php_info_print_table_row(2, Active links, buf);
- sprintf(buf, %02.2f, (double)(IFX_VERSION/100.0));
+ sprintf(buf, %02.2f, (double)(IFX_VERSION/100.0));
php_info_print_table_row(2, ESQL/C Version, buf);
php_info_print_table_end();
@@ -1419,7 +1418,7 @@
}
if (ifx_check() 0) {
- char *ifx_err = ifx_error(ifx)
+ char *ifx_err = ifx_error(ifx);
IFXG(sv_sqlcode) = SQLCODE;
EXEC SQL DEALLOCATE DESCRIPTOR :i_descrpid;
EXEC SQL free :statemid;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
Hello Zeev,
thanks for the fixes here an in ext/ming
marcus
Sunday, May 30, 2004, 7:32:32 PM, you wrote:
zeev Sun May 30 13:32:32 2004 EDT
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
Fix prototype
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.36r2=1.37ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.36
php-src/ext/spl/spl_iterators.c:1.37
--- php-src/ext/spl/spl_iterators.c:1.36 Tue May 18 16:39:35 2004
+++ php-src/ext/spl/spl_iterators.c Sun May 30 13:32:32 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.36 2004/05/18 20:39:35 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.37 2004/05/30 17:32:32 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -985,7 +985,7 @@
}
}
-/* {{{ proto LimitIterator:__construct(Iterator $it [, int $offset, int $count])
+/* {{{ proto LimitIterator::__construct(Iterator $it [, int $offset, int $count])
Construct a LimitIterator from an Iterator with a given starting
offset and optionally a maximum count */
SPL_METHOD(LimitIterator, __construct)
{
--
Best regards,
Marcusmailto:[EMAIL PROTECTED]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/informix ifx.ec
abies Mon May 31 20:44:19 2004 EDT
Modified files:
/php-src/ext/informix ifx.ec
Log:
Fixed bug #28569 (connection id is not thread safe)
http://cvs.php.net/diff.php/php-src/ext/informix/ifx.ec?r1=1.105r2=1.106ty=u
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.105 php-src/ext/informix/ifx.ec:1.106
--- php-src/ext/informix/ifx.ec:1.105 Mon May 31 17:04:20 2004
+++ php-src/ext/informix/ifx.ec Mon May 31 20:44:19 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: ifx.ec,v 1.105 2004/05/31 21:04:20 pajoye Exp $ */
+/* $Id: ifx.ec,v 1.106 2004/06/01 00:44:19 abies Exp $ */
/* ---
* if you want a function reference : grep '^\*\*' ifx.ec will give
@@ -54,6 +54,12 @@
#include winsock.h
#endif
+#ifdef ZTS
+#define IFX_THRD_ID tsrm_thread_id()
+#else
+#define IFX_THRD_ID 0
+#endif
+
#if HAVE_SYS_TYPES_H
#include sys/types.h
#endif
@@ -123,16 +129,16 @@
typedef char IFX[128];
#define SAFE_STRING(s) ((s) ? (s) : )
-#define PHP_IFX_CHECK_CONNECTION(ifx) \
-{ \
-if (ifx_check() 0) { \
- char *ifx_err = ifx_error(ifx); \
-IFXG(sv_sqlcode) = SQLCODE; \
-php_error_docref(NULL TSRMLS_CC, E_WARNING, Set connection %s fails
(%s), ifx, ifx_err); \
-efree(ifx_err);\
-RETURN_FALSE; \
-} \
-}
+#define PHP_IFX_CHECK_CONNECTION(ifx) \
+ do { \
+ if (ifx_check() 0) { \
+ char *ifx_err = ifx_error(ifx); \
+ IFXG(sv_sqlcode) = SQLCODE; \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Set connection %s
fails (%s), ifx, ifx_err); \
+ efree(ifx_err); \
+ RETURN_FALSE; \
+ } \
+ } while (0)
function_entry ifx_functions[] = {
PHP_FE(ifx_connect,NULL)
@@ -541,7 +547,7 @@
/* create the link */
ifx = (char *) malloc(sizeof(IFX));
IFXG(connectionid)++;
- sprintf(ifx, %s%x, SAFE_STRING(user), IFXG(connectionid));
+ sprintf(ifx, %s%x_%x, SAFE_STRING(user),
IFX_THRD_ID,IFXG(connectionid));
EXEC SQL CONNECT TO :host AS :ifx USER :user USING :passwd
WITH CONCURRENT TRANSACTION;
@@ -644,7 +650,7 @@
ifx = (char *) emalloc(sizeof(IFX));
IFXG(connectionid)++;
- sprintf(ifx, connec%x, IFXG(connectionid));
+ sprintf(ifx, connec%x_%x, IFX_THRD_ID, IFXG(connectionid));
EXEC SQL CONNECT TO :host AS :ifx USER :user USING :passwd WITH
CONCURRENT TRANSACTION;
@@ -1241,10 +1247,10 @@
statement = Z_STRVAL_PP(query);
IFXG(cursorid)++;
- sprintf(statemid, statem%x, IFXG(cursorid));
- sprintf(cursorid, cursor%x, IFXG(cursorid));
- sprintf(descrpid, descrp%x, IFXG(cursorid));
- sprintf(i_descrpid, i_descrp%x, IFXG(cursorid));
+ sprintf(statemid, statem%x_%x, IFX_THRD_ID, IFXG(cursorid));
+ sprintf(cursorid, cursor%x_%x, IFX_THRD_ID, IFXG(cursorid));
+ sprintf(descrpid, descrp%x_%x, IFX_THRD_ID, IFXG(cursorid));
+ sprintf(i_descrpid, i_descrp%x_%x, IFX_THRD_ID,IFXG(cursorid));
EXEC SQL set connection :ifx;
PHP_IFX_CHECK_CONNECTION(ifx);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/informix ifx.ec
abies Mon May 31 20:50:00 2004 EDT Modified files: /php-src/ext/informix ifx.ec Log: Woops, missed one http://cvs.php.net/diff.php/php-src/ext/informix/ifx.ec?r1=1.106r2=1.107ty=u Index: php-src/ext/informix/ifx.ec diff -u php-src/ext/informix/ifx.ec:1.106 php-src/ext/informix/ifx.ec:1.107 --- php-src/ext/informix/ifx.ec:1.106 Mon May 31 20:44:19 2004 +++ php-src/ext/informix/ifx.ec Mon May 31 20:49:59 2004 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: ifx.ec,v 1.106 2004/06/01 00:44:19 abies Exp $ */ +/* $Id: ifx.ec,v 1.107 2004/06/01 00:49:59 abies Exp $ */ /* --- * if you want a function reference : grep '^\*\*' ifx.ec will give @@ -823,10 +823,10 @@ statement = Z_STRVAL_PP(query); IFXG(cursorid)++; - sprintf(statemid, statem%x, IFXG(cursorid)); - sprintf(cursorid, cursor%x, IFXG(cursorid)); - sprintf(descrpid, descrp%x, IFXG(cursorid)); - sprintf(i_descrpid, i_descrp%x, IFXG(cursorid)); + sprintf(statemid, statem%x_%x, IFX_THRD_ID, IFXG(cursorid)); + sprintf(cursorid, cursor%x_%x, IFX_THRD_ID, IFXG(cursorid)); + sprintf(descrpid, descrp%x_%x, IFX_THRD_ID, IFXG(cursorid)); + sprintf(i_descrpid, i_descrp%x_%x, IFX_THRD_ID,IFXG(cursorid)); EXEC SQL set connection :ifx; PHP_IFX_CHECK_CONNECTION(ifx); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
abies Mon May 31 21:12:02 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: #28569 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.669r2=1.1247.2.670ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.669 php-src/NEWS:1.1247.2.670 --- php-src/NEWS:1.1247.2.669 Sun May 30 13:57:36 2004 +++ php-src/NEWSMon May 31 21:12:01 2004 @@ -1,6 +1,8 @@ PHP 4 NEWS ||| ?? Jun 2004, Version 4.3.7 +- Fixed bug #28569 (informix connection id is not thread safe). + (novicky at aarongroup dot cz, Ard) - Fixed bug #28564 (Problem building informix as a shared extension). (roques at mti dot ag, Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
