Skip to content

Commit

Permalink
Merge branch 'master' into 3.next
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Jan 16, 2017
2 parents 194a508 + fa88503 commit 40362ba
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/Http/Client/Adapter/Stream.php
Expand Up @@ -202,6 +202,7 @@ protected function _buildOptions(Request $request, $options)
$this->_contextOptions['max_redirects'] = (int)$options['redirect'];
}
if (isset($options['proxy']['proxy'])) {
$this->_contextOptions['request_fulluri'] = true;
$this->_contextOptions['proxy'] = $options['proxy']['proxy'];
}
}
Expand Down

0 comments on commit 40362ba

Please sign in to comment.