com php-src: fix merge mistake: ext/xmlrpc/xmlrpc-epi-php.c

From: Date: Tue, 05 Jan 2016 12:33:22 +0000
Subject: com php-src: fix merge mistake: ext/xmlrpc/xmlrpc-epi-php.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90548@lists.php.net to get a copy of this message
Commit: 56839f5a76fe76c2856aef3ea2bdce98de847891 Author: Anatol Belski <ab@php.net> Mon, 4 Jan 2016 17:33:23 +0100 Parents: f3c1863aa2721343245b63ac7bd68cfdc3dd41f3 Branches: PHP-7.0.2 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56839f5a76fe76c2856aef3ea2bdce98de847891 Log: fix merge mistake Changed paths: M ext/xmlrpc/xmlrpc-epi-php.c Diff: diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index af71f38..377d05a 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -517,7 +517,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep if (Z_TYPE(val) != IS_STRING) { zval newvalue; ZVAL_DUP(&newvalue, &val); - convert_to_string(newvalue); + convert_to_string(&newvalue); xReturn = XMLRPC_CreateValueBase64(key, Z_STRVAL(newvalue), Z_STRLEN(newvalue)); zval_dtor(&newvalue); } else {

« previous php.cvs (#90548) next »