Skip to content
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 82044a4 + 432a56f commit a877196f6e40d725e9c1a3910249c2b7a9295113 @saltybeagle saltybeagle committed Feb 21, 2012
Showing with 7 additions and 3 deletions.
  1. +7 −3 src/HTTP/Request/Adapter/Phpstream.php
View
10 src/HTTP/Request/Adapter/Phpstream.php
@@ -34,9 +34,12 @@ public function __construct()
public function sendRequest()
{
- $proxyurl = '';
+ $proxyurl = '';
+ $request_fulluri = false;
+
if (!is_null($this->proxy)) {
- $proxyurl = $this->proxy->url;
+ $proxyurl = $this->proxy->url;
+ $request_fulluri = true;
}
$info = array(
$this->uri->protocol => array(
@@ -46,9 +49,11 @@ public function sendRequest()
'proxy' => $proxyurl,
'ignore_errors' => true,
'max_redirects' => 3,
+ 'request_fulluri' => $request_fulluri,
)
);
// create context with proper junk
+
$ctx = stream_context_create(
$info
);
@@ -90,7 +95,6 @@ public function sendRequest()
foreach($headers as $line) {
$this->processHeader($line);
}
-
return new Request\Response(
$details,$body,new Request\Headers($this->headers),$this->cookies);
}

0 comments on commit a877196

Please sign in to comment.
Something went wrong with that request. Please try again.