From: Pierrick Charron <pierrick@php.net>
Date: Thu, 16 Aug 2012 18:51:28 +0000 (-0400)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2118ab9ab4cb4ea8b473852559b0914347992767;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62839
---

2118ab9ab4cb4ea8b473852559b0914347992767
diff --cc ext/curl/interface.c
index 0deae0f227,b57ce1bd07..8050351d94
--- 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);
  	}