stas Mon, 01 Aug 2011 04:29:37 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314007
Log:
fix params parsing
Changed paths:
U php/php-src/branches/PHP_5_4/ext/dom/document.c
U php/php-src/branches/PHP_5_4/ext/interbase/interbase.c
U php/php-src/branches/PHP_5_4/ext/ldap/ldap.c
U php/php-src/trunk/ext/dom/document.c
U php/php-src/trunk/ext/interbase/interbase.c
U php/php-src/trunk/ext/ldap/ldap.c
Modified: php/php-src/branches/PHP_5_4/ext/dom/document.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/dom/document.c 2011-08-01 04:25:30 UTC
(rev 314006)
+++ php/php-src/branches/PHP_5_4/ext/dom/document.c 2011-08-01 04:29:37 UTC
(rev 314007)
@@ -2157,7 +2157,8 @@
dom_object *intern;
dom_doc_propsptr doc_prop;
char *source;
- int source_len, refcount, ret, options = 0;
+ int source_len, refcount, ret;
+ long options = 0;
htmlParserCtxtPtr ctxt;
id = getThis();
Modified: php/php-src/branches/PHP_5_4/ext/interbase/interbase.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/interbase/interbase.c 2011-08-01
04:25:30 UTC (rev 314006)
+++ php/php-src/branches/PHP_5_4/ext/interbase/interbase.c 2011-08-01
04:29:37 UTC (rev 314007)
@@ -1125,7 +1125,8 @@
PHP_FUNCTION(ibase_trans)
{
- unsigned short i, argn, link_cnt = 0, tpb_len = 0;
+ unsigned short i, link_cnt = 0, tpb_len = 0;
+ int argn;
char last_tpb[TPB_MAX_SIZE];
ibase_db_link **ib_link = NULL;
ibase_trans *ib_trans;
Modified: php/php-src/branches/PHP_5_4/ext/ldap/ldap.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/ldap/ldap.c 2011-08-01 04:25:30 UTC
(rev 314006)
+++ php/php-src/branches/PHP_5_4/ext/ldap/ldap.c 2011-08-01 04:29:37 UTC
(rev 314007)
@@ -587,7 +587,7 @@
*/
static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
{
- zval *link, *base_dn, **filter, *attrs, **attr;
+ zval *link, *base_dn, **filter, *attrs = NULL, **attr;
long attrsonly, sizelimit, timelimit, deref;
char *ldap_base_dn = NULL, *ldap_filter = NULL, **ldap_attrs = NULL;
ldap_linkdata *ld = NULL;
Modified: php/php-src/trunk/ext/dom/document.c
===================================================================
--- php/php-src/trunk/ext/dom/document.c 2011-08-01 04:25:30 UTC (rev
314006)
+++ php/php-src/trunk/ext/dom/document.c 2011-08-01 04:29:37 UTC (rev
314007)
@@ -2157,7 +2157,8 @@
dom_object *intern;
dom_doc_propsptr doc_prop;
char *source;
- int source_len, refcount, ret, options = 0;
+ int source_len, refcount, ret;
+ long options = 0;
htmlParserCtxtPtr ctxt;
id = getThis();
Modified: php/php-src/trunk/ext/interbase/interbase.c
===================================================================
--- php/php-src/trunk/ext/interbase/interbase.c 2011-08-01 04:25:30 UTC (rev
314006)
+++ php/php-src/trunk/ext/interbase/interbase.c 2011-08-01 04:29:37 UTC (rev
314007)
@@ -1125,7 +1125,8 @@
PHP_FUNCTION(ibase_trans)
{
- unsigned short i, argn, link_cnt = 0, tpb_len = 0;
+ unsigned short i, link_cnt = 0, tpb_len = 0;
+ int argn;
char last_tpb[TPB_MAX_SIZE];
ibase_db_link **ib_link = NULL;
ibase_trans *ib_trans;
Modified: php/php-src/trunk/ext/ldap/ldap.c
===================================================================
--- php/php-src/trunk/ext/ldap/ldap.c 2011-08-01 04:25:30 UTC (rev 314006)
+++ php/php-src/trunk/ext/ldap/ldap.c 2011-08-01 04:29:37 UTC (rev 314007)
@@ -587,7 +587,7 @@
*/
static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
{
- zval *link, *base_dn, **filter, *attrs, **attr;
+ zval *link, *base_dn, **filter, *attrs = NULL, **attr;
long attrsonly, sizelimit, timelimit, deref;
char *ldap_base_dn = NULL, *ldap_filter = NULL, **ldap_attrs = NULL;
ldap_linkdata *ld = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
