Merge branch 'phpng' of git.php.net:php-src into phpng

1 files changed, 7 insertions, 7 deletions

diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 763ff69404..3fb2ba6bb6 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -326,14 +326,14 @@ static int add_double(zval* list, char* id, double num) {
 	else   return add_next_index_double(list, num);
 }
 
-static int add_string(zval* list, char* id, char* string, int duplicate) {
-	if(id) return add_assoc_string(list, id, string, duplicate);
-	else   return add_next_index_string(list, string, duplicate);
+static int add_string(zval* list, char* id, char* string) {
+	if(id) return add_assoc_string(list, id, string);
+	else   return add_next_index_string(list, string);
 }
 
-static int add_stringl(zval* list, char* id, char* string, uint length, int duplicate) {
-	if(id) return add_assoc_stringl(list, id, string, length, duplicate);
-	else   return add_next_index_stringl(list, string, length, duplicate);
+static int add_stringl(zval* list, char* id, char* string, uint length) {
+	if(id) return add_assoc_stringl(list, id, string, length);
+	else   return add_next_index_stringl(list, string, length);
 }
 
 #endif
@@ -541,7 +541,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep
 					break;
 				case xmlrpc_boolean:
 					convert_to_boolean(val);
-					xReturn = XMLRPC_CreateValueBoolean(key, Z_LVAL_P(val));
+					xReturn = XMLRPC_CreateValueBoolean(key, Z_TYPE_P(val) == IS_TRUE);
 					break;
 				case xmlrpc_int:
 					convert_to_long(val);