Merge pull request googleapis#122 from mishan/fix-io-setoptions-take2

Make sure Google_IO_{Curl,Stream} setOptions allows overriding defaults

Author: ianbarber

src/Google/IO/Curl.php

@@ -96,7 +96,7 @@ public function executeRequest(Google_Http_Request $request)
  */
  public function setOptions($options)
  {
- $this->options += $options;
+ $this->options = $options + $this->options;
  }
 
  /**

src/Google/IO/Stream.php

@@ -135,7 +135,7 @@ public function executeRequest(Google_Http_Request $request)
  */
  public function setOptions($options)
  {
- $this->options += $options;
+ $this->options = $options + $this->options;
  }
 
  /**