com php-src: Merge branch 'PHP-5.4': ext/curl/interface.c

From: Date: Thu, 16 Aug 2012 18:51:28 +0000
Subject: com php-src: Merge branch 'PHP-5.4': ext/curl/interface.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-69857@lists.php.net to get a copy of this message
Commit: 2118ab9ab4cb4ea8b473852559b0914347992767 Author: Pierrick Charron <pierrick@php.net> Thu, 16 Aug 2012 14:51:28 -0400 Parents: f84947c688203b627895078218647599085333ed 8ac61a3e60329a10dfc85036ef46d78e53f8de95 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2118ab9ab4cb4ea8b473852559b0914347992767 Log: Merge branch 'PHP-5.4' * PHP-5.4: Fixed bug #62839 Bugs: https://bugs.php.net/62839 Changed paths: MM ext/curl/interface.c Diff: diff --cc ext/curl/interface.c index 0deae0f,b57ce1b...8050351 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@@ -1920,10 -1606,11 +1920,10 @@@ PHP_FUNCTION(curl_copy_handle dupch->uses = 0; ch->uses++; if (ch->handlers->write->stream) { - Z_ADDREF_P(dupch->handlers->write->stream); - dupch->handlers->write->stream = ch->handlers->write->stream; + Z_ADDREF_P(ch->handlers->write->stream); } + dupch->handlers->write->stream = ch->handlers->write->stream; dupch->handlers->write->method = ch->handlers->write->method; - dupch->handlers->write->type = ch->handlers->write->type; if (ch->handlers->read->stream) { Z_ADDREF_P(ch->handlers->read->stream); }

« previous php.cvs (#69857) next »