]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorPierrick Charron <pierrick@php.net>
Thu, 16 Aug 2012 18:51:28 +0000 (14:51 -0400)
committerPierrick Charron <pierrick@php.net>
Thu, 16 Aug 2012 18:51:28 +0000 (14:51 -0400)
* PHP-5.4:
  Fixed bug #62839

1  2 
ext/curl/interface.c

index 0deae0f2270bdd97821da8d5ff83f11f27f9f53d,b57ce1bd0790094daf9864c0f30d36f5517d1d06..8050351d948c657653133de1798df19b4e2bbf9a
@@@ -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);
        }