[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc xmlrpc-epi-php.c

2009-05-22 Thread Felipe Pena
felipe  Fri May 22 12:50:44 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
  Log:
  - MFH: Fixed invalid date checking
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.16&r2=1.39.2.5.2.17&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.16 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.17
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.16   Thu May 14 12:36:19 2009
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri May 22 12:50:44 2009
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.16 2009/05/14 12:36:19 iliaa Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.17 2009/05/22 12:50:44 felipe Exp $ */
 
 /**
 * BUGS:   *
@@ -1302,7 +1302,7 @@
XMLRPC_VALUE v = 
XMLRPC_CreateValueDateTime_ISO8601(NULL, value->value.str.val);
if(v) {
time_t timestamp = (time_t) 
php_parse_date((char *)XMLRPC_GetValueDateTime_ISO8601(v), NULL);
-   if(timestamp) {
+   if (timestamp != -1) {
zval* ztimestamp;
 
MAKE_STD_ZVAL(ztimestamp);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc xmlrpc-epi-php.c

2009-05-14 Thread Ilia Alshanetsky
iliaa   Thu May 14 12:36:19 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
  Log:
  
  MFB: Fixed\ compiler\ warnings
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.15&r2=1.39.2.5.2.16&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.15 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.16
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.15   Wed May 13 14:25:58 2009
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Thu May 14 12:36:19 2009
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.15 2009/05/13 14:25:58 iliaa Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.16 2009/05/14 12:36:19 iliaa Exp $ */
 
 /**
 * BUGS:   *
@@ -67,6 +67,7 @@
 
 #include "php.h"
 #include "ext/standard/info.h"
+#include "ext/date/php_date.h"
 #include "php_ini.h"
 #include "php_xmlrpc.h"
 #include "xmlrpc.h"
@@ -1300,7 +1301,7 @@
if(newtype == xmlrpc_datetime) {
XMLRPC_VALUE v = 
XMLRPC_CreateValueDateTime_ISO8601(NULL, value->value.str.val);
if(v) {
-   time_t timestamp = (time_t) 
php_parse_date(XMLRPC_GetValueDateTime_ISO8601(v), NULL);
+   time_t timestamp = (time_t) 
php_parse_date((char *)XMLRPC_GetValueDateTime_ISO8601(v), NULL);
if(timestamp) {
zval* ztimestamp;
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc xmlrpc-epi-php.c /ext/xmlrpc/tests bug45556.phpt

2009-01-27 Thread Felipe Pena
felipe  Tue Jan 27 15:02:44 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
/php-src/ext/xmlrpc/tests   bug45556.phpt 
  Log:
  MFH:
  - Fix compile warning
  - Fixed test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.12&r2=1.39.2.5.2.13&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.12 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.13
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.12   Wed Dec 31 11:17:46 2008
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Tue Jan 27 15:02:43 2009
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.12 2008/12/31 11:17:46 sebastian Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.13 2009/01/27 15:02:43 felipe Exp $ */
 
 /**
 * BUGS:   *
@@ -658,7 +658,7 @@
}
}

-   if (out.xmlrpc_out.xml_elem_opts.encoding != ENCODING_DEFAULT) {
+   if (strcmp(out.xmlrpc_out.xml_elem_opts.encoding, ENCODING_DEFAULT) != 
0) {
efree((char *)out.xmlrpc_out.xml_elem_opts.encoding);
}
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug45556.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/xmlrpc/tests/bug45556.phpt
diff -u php-src/ext/xmlrpc/tests/bug45556.phpt:1.1.2.1 
php-src/ext/xmlrpc/tests/bug45556.phpt:1.1.2.2
--- php-src/ext/xmlrpc/tests/bug45556.phpt:1.1.2.1  Fri Jul 18 17:35:18 2008
+++ php-src/ext/xmlrpc/tests/bug45556.phpt  Tue Jan 27 15:02:43 2009
@@ -25,16 +25,7 @@
 
 ?>
 --EXPECTF--
-
 Warning: xmlrpc_server_call_method(): Invalid callback 'foobar' passed in %s 
on line %d
-expat reports error code 5
-   description: Invalid document end
-   line: 1
-   column: 1
-   byte index: 0
-   total bytes: 0
-
-   data beginning 0 before byte index: foo
  
 Warning: xmlrpc_server_call_method(): xml parse error: [line 1, column 1, 
message: Invalid document end] Unable to add introspection data returned from 
bar::test() in %s on line %d
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc xmlrpc-epi-php.c

2008-07-18 Thread Felipe Pena
felipe  Fri Jul 18 17:34:07 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
  Log:
  - Fixed bug #45556 (Return value from callback isn't freed)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.10&r2=1.39.2.5.2.11&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.10 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.11
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.10   Fri Jul 18 15:52:38 2008
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri Jul 18 17:34:07 2008
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.10 2008/07/18 15:52:38 felipe Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.11 2008/07/18 17:34:07 felipe Exp $ */
 
 /**
 * BUGS:   *
@@ -877,15 +877,12 @@
  */
 static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
 {
-   zval *retval_ptr, **php_function;
+   zval retval, **php_function;
zval* callback_params[1];
char *php_function_name;
xmlrpc_callback_data* pData = (xmlrpc_callback_data*)data;
TSRMLS_FETCH();
 
-   MAKE_STD_ZVAL(retval_ptr);
-   Z_TYPE_P(retval_ptr) = IS_NULL;
-
/* setup data hoojum */
callback_params[0] = pData->caller_params;
 
@@ -896,14 +893,14 @@
 
if (zend_is_callable(*php_function, 0, 
&php_function_name)) {
/* php func prototype: function string 
user_func($user_params) */
-   if (call_user_function(CG(function_table), 
NULL, *php_function, retval_ptr, 1, callback_params TSRMLS_CC) == SUCCESS) {
+   if (call_user_function(CG(function_table), 
NULL, *php_function, &retval, 1, callback_params TSRMLS_CC) == SUCCESS) {
XMLRPC_VALUE xData;
STRUCT_XMLRPC_ERROR err = {0};
 
/* return value should be a string */
-   convert_to_string(retval_ptr);
+   convert_to_string(&retval);
 
-   xData = 
XMLRPC_IntrospectionCreateDescription(Z_STRVAL_P(retval_ptr), &err);
+   xData = 
XMLRPC_IntrospectionCreateDescription(Z_STRVAL(retval), &err);
 
if(xData) {

if(!XMLRPC_ServerAddIntrospectionData(server, xData)) {
@@ -919,6 +916,7 @@
php_error_docref(NULL 
TSRMLS_CC, E_WARNING, "Unable to add introspection data returned from %s()", 
php_function_name);
}
}
+   zval_dtor(&retval);
} else {
/* user func failed */
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, "Error calling user introspection callback: %s()", 
php_function_name);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc xmlrpc-epi-php.c /ext/xmlrpc/tests bug45555.phpt

2008-07-18 Thread Felipe Pena
felipe  Fri Jul 18 15:52:38 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/xmlrpc/tests   bug4.phpt 

  Modified files:  
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
  Log:
  - Fixed bug #4 (Segfault with invalid non-string as 
register_introspection_callback)
(patch by chris_se at gmx dot ne)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.9&r2=1.39.2.5.2.10&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.9 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.10
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.9Fri Jul 18 14:56:58 2008
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri Jul 18 15:52:38 2008
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.9 2008/07/18 14:56:58 felipe Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.10 2008/07/18 15:52:38 felipe Exp $ */
 
 /**
 * BUGS:   *
@@ -879,6 +879,7 @@
 {
zval *retval_ptr, **php_function;
zval* callback_params[1];
+   char *php_function_name;
xmlrpc_callback_data* pData = (xmlrpc_callback_data*)data;
TSRMLS_FETCH();
 
@@ -893,35 +894,39 @@
while(1) {

if(zend_hash_get_current_data(Z_ARRVAL_P(pData->server->introspection_map), 
(void**)&php_function) == SUCCESS) {
 
-   /* php func prototype: function string 
user_func($user_params) */
-   if(call_user_function(CG(function_table), NULL, 
*php_function, retval_ptr, 1, callback_params TSRMLS_CC) == SUCCESS) {
-   XMLRPC_VALUE xData;
-   STRUCT_XMLRPC_ERROR err = {0};
-
-   /* return value should be a string */
-   convert_to_string(retval_ptr);
-
-   xData = 
XMLRPC_IntrospectionCreateDescription(Z_STRVAL_P(retval_ptr), &err);
-
-   if(xData) {
-   
if(!XMLRPC_ServerAddIntrospectionData(server, xData)) {
-   php_error_docref(NULL 
TSRMLS_CC, E_WARNING, "Unable to add introspection data returned from %s(), 
improper element structure", Z_STRVAL_PP(php_function));
-   }
-   XMLRPC_CleanupValue(xData);
-   } else {
-   /* could not create description */
-   if(err.xml_elem_error.parser_code) {
-   php_error_docref(NULL 
TSRMLS_CC, E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] 
Unable to add introspection data returned from %s()", 
-   err.xml_elem_error.column, 
err.xml_elem_error.line, err.xml_elem_error.parser_error, 
Z_STRVAL_PP(php_function));
+   if (zend_is_callable(*php_function, 0, 
&php_function_name)) {
+   /* php func prototype: function string 
user_func($user_params) */
+   if (call_user_function(CG(function_table), 
NULL, *php_function, retval_ptr, 1, callback_params TSRMLS_CC) == SUCCESS) {
+   XMLRPC_VALUE xData;
+   STRUCT_XMLRPC_ERROR err = {0};
+
+   /* return value should be a string */
+   convert_to_string(retval_ptr);
+
+   xData = 
XMLRPC_IntrospectionCreateDescription(Z_STRVAL_P(retval_ptr), &err);
+
+   if(xData) {
+   
if(!XMLRPC_ServerAddIntrospectionData(server, xData)) {
+   php_error_docref(NULL 
TSRMLS_CC, E_WARNING, "Unable to add introspection data returned from %s(), 
improper element structure", php_function_name);
+   }
+   XMLRPC_CleanupValue(xData);
} else {
-   php_error_docref(NULL 
TSRMLS_CC, E_WARNING, "Unable to add introspection data returned from %s()", 
-   Z_STRVAL_PP(php_function));
+   /* could not create description 
*/
+   
if(err.xml_elem_error.parser_code) {
+   php_error_docref(NULL 
TSRMLS_CC, E_WARNING, "xml parse error: [line %ld, column

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc xmlrpc-epi-php.c

2008-07-18 Thread Felipe Pena
felipe  Fri Jul 18 14:56:59 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
  Log:
  - MFB: Fix ws
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.8&r2=1.39.2.5.2.9&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.8 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.9
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.8Mon Dec 31 07:20:14 2007
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri Jul 18 14:56:58 2008
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.8 2007/12/31 07:20:14 sebastian Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.9 2008/07/18 14:56:58 felipe Exp $ */
 
 /**
 * BUGS:   *
@@ -356,65 +356,61 @@
}
}
 
- /* encoding code set */
- if(zend_hash_find(Z_ARRVAL_P(output_opts), 
-   ENCODING_KEY, ENCODING_KEY_LEN + 1, 
-   (void**)&val) == SUCCESS) {
-if(Z_TYPE_PP(val) == IS_STRING) {
-   options->xmlrpc_out.xml_elem_opts.encoding = 
estrdup(Z_STRVAL_PP(val));
-}
- }
-
- /* escaping options */
- if(zend_hash_find(Z_ARRVAL_P(output_opts), 
-   ESCAPING_KEY, ESCAPING_KEY_LEN + 1, 
-   (void**)&val) == SUCCESS) {
-/* multiple values allowed.  check if array */
-if(Z_TYPE_PP(val) == IS_ARRAY) {
-   zval** iter_val;
-   zend_hash_internal_pointer_reset(Z_ARRVAL_PP(val));
-   options->xmlrpc_out.xml_elem_opts.escaping = 
xml_elem_no_escaping;
-   while(1) {
-  if(zend_hash_get_current_data(Z_ARRVAL_PP(val), 
(void**)&iter_val) == SUCCESS) {
- if(Z_TYPE_PP(iter_val) == IS_STRING && 
Z_STRVAL_PP(iter_val)) {
-if(!strcmp(Z_STRVAL_PP(iter_val), 
ESCAPING_VALUE_CDATA)) {
-   options->xmlrpc_out.xml_elem_opts.escaping 
|= xml_elem_cdata_escaping;
-}
-else if(!strcmp(Z_STRVAL_PP(iter_val), 
ESCAPING_VALUE_NON_ASCII)) {
-   options->xmlrpc_out.xml_elem_opts.escaping 
|= xml_elem_non_ascii_escaping;
-}
-else if(!strcmp(Z_STRVAL_PP(iter_val), 
ESCAPING_VALUE_NON_PRINT)) {
-   options->xmlrpc_out.xml_elem_opts.escaping 
|= xml_elem_non_print_escaping;
-}
-else if(!strcmp(Z_STRVAL_PP(iter_val), 
ESCAPING_VALUE_MARKUP)) {
-   options->xmlrpc_out.xml_elem_opts.escaping 
|= xml_elem_markup_escaping;
-}
- }
-  }
-  else {
- break;
-  }
-
-  zend_hash_move_forward(Z_ARRVAL_PP(val));
-   }
-}
-/* else, check for single value */
-else if(Z_TYPE_PP(val) == IS_STRING) {
-   if(!strcmp(Z_STRVAL_PP(val), ESCAPING_VALUE_CDATA)) {
-  options->xmlrpc_out.xml_elem_opts.escaping = 
xml_elem_cdata_escaping;
-   }
-   else if(!strcmp(Z_STRVAL_PP(val), 
ESCAPING_VALUE_NON_ASCII)) {
-  options->xmlrpc_out.xml_elem_opts.escaping = 
xml_elem_non_ascii_escaping;
-   }
-   else if(!strcmp(Z_STRVAL_PP(val), 
ESCAPING_VALUE_NON_PRINT)) {
-  options->xmlrpc_out.xml_elem_opts.escaping = 
xml_elem_non_print_escaping;
-   }
-   else if(!strcmp(Z_STRVAL_PP(val), 
ESCAPING_VALUE_MARKUP)) {
-  options->xmlrpc_out.xml_elem_opts.escaping = 
xml_elem_markup_escaping;
-   }
-}
- }
- }
+   /* encoding code set */
+   if(zend_hash_find(Z_ARRVAL_P(output_opts), 
ENCODING_KEY, ENCODING_KEY_LEN + 1, (void**)&val) == SUCCESS) {
+   if(Z_TYPE_PP(val) == IS_STRING) {
+   
options->xmlrpc_out.xml_elem_opts.encoding = estrdup(Z_STRVAL_PP(val));
+   }
+

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc xmlrpc-epi-php.c

2006-11-13 Thread Antony Dovgal
tony2001Mon Nov 13 12:49:29 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
  Log:
  MFH: fix compile warning
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.2&r2=1.39.2.5.2.3&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.2 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.3
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.2Mon Aug 14 08:18:01 2006
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Mon Nov 13 12:49:28 2006
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.2 2006/08/14 08:18:01 tony2001 Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.3 2006/11/13 12:49:28 tony2001 Exp $ */
 
 /**
 * BUGS:   *
@@ -689,7 +689,7 @@
}

if (out.xmlrpc_out.xml_elem_opts.encoding != ENCODING_DEFAULT) {
-   efree(out.xmlrpc_out.xml_elem_opts.encoding);
+   efree((char *)out.xmlrpc_out.xml_elem_opts.encoding);
}
 }
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc xmlrpc-epi-php.c /ext/xmlrpc/tests 001.phpt 002.phpt

2006-08-14 Thread Antony Dovgal
tony2001Mon Aug 14 08:18:01 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/xmlrpc/tests   001.phpt 002.phpt 

  Modified files:  
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
  Log:
  fix segfault and leak in ext/xmlrpc
  add tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.1&r2=1.39.2.5.2.2&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.1 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.2
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.1Fri Aug 11 17:43:04 2006
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Mon Aug 14 08:18:01 2006
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.1 2006/08/11 17:43:04 tony2001 Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.2 2006/08/14 08:18:01 tony2001 Exp $ */
 
 /**
 * BUGS:   *
@@ -671,6 +671,7 @@
if (Z_TYPE_PP(method) == IS_NULL) {
XMLRPC_RequestSetRequestType(xRequest, 
xmlrpc_request_response);
} else {
+   convert_to_string_ex(method);
XMLRPC_RequestSetMethodName(xRequest, 
Z_STRVAL_PP(method));
XMLRPC_RequestSetRequestType(xRequest, 
xmlrpc_request_call);
}
@@ -740,7 +741,7 @@
 
   if(XMLRPC_RequestGetRequestType(response) == xmlrpc_request_call) {
  if(method_name_out) {
-convert_to_string(method_name_out);
+zval_dtor(method_name_out);
 Z_TYPE_P(method_name_out) = IS_STRING;
 Z_STRVAL_P(method_name_out) = 
estrdup(XMLRPC_RequestGetMethodName(response));
 Z_STRLEN_P(method_name_out) = strlen(Z_STRVAL_P(method_name_out));

http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/001.phpt?view=markup&rev=1.1
Index: php-src/ext/xmlrpc/tests/001.phpt
+++ php-src/ext/xmlrpc/tests/001.phpt
--TEST--
xmlrpc_encode_request() with wrong arguments
--SKIPIF--

--FILE--

--EXPECTF-- 
string(174) "

-1

 
  
   1
  
 


"
string(160) "



 
  
   1
  
 


"

Notice: Array to string conversion in %s on line %d
string(177) "

Array

 
  
   1
  
 


"
string(175) "

3.4

 
  
   1
  
 


"
Done

http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/002.phpt?view=markup&rev=1.1
Index: php-src/ext/xmlrpc/tests/002.phpt
+++ php-src/ext/xmlrpc/tests/002.phpt
--TEST--
xmlrpc_encode_request() and various arguments
--SKIPIF--

--FILE--

--EXPECTF-- 
array(0) {
}
string(6) "method"
array(1) {
  [0]=>
  int(1)
}
string(6) "method"
array(1) {
  [0]=>
  string(5) "param"
}
string(6) "method"
array(1) {
  [0]=>
  string(0) ""
}
string(2) "-1"

Notice: Array to string conversion in %s on line %d
array(1) {
  [0]=>
  int(1)
}
string(5) "Array"
Done

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php