diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-20 13:37:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-20 13:37:53 +0200 |
| commit | 1823b16fa15894f72fc01724766289dbecf5a62a (patch) | |
| tree | 1b7d21c15a1003a8c5631a15393d906c0ef3482f /ext/curl/interface.c | |
| parent | 9003cd142553384c3d271b12407186d5352868ad (diff) | |
| parent | 9ccf85419849db587a973673e382faf3b3a9db43 (diff) | |
| download | php-git-1823b16fa15894f72fc01724766289dbecf5a62a.tar.gz | |
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
Merging master to fix Windows build
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 0deae0f227..8050351d94 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1920,9 +1920,9 @@ 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; if (ch->handlers->read->stream) { Z_ADDREF_P(ch->handlers->read->stream); |