google/google-api-php-client — pull request #121 by mishan (2014-03-09 01:34:25+00:00)
Title: Fix Google_IO_{Curl,Stream} setOptions

Fix Google_IO_{Curl,Stream} setOptions
- array_merge fores reindex on associative array, nuking the keys. + operator for arrays specifically does the intended behavior of preserving the keys.

This took me for a bit of a loop -- I had upgraded our google-api-php-client lib and was getting an error with curl_setopt when calling `setOptions(array(CURLOPT_PROXY => '...'));`

Doing a var_dump() on $this->options revealed the keys had been turned into indexes by array_merge. I have verified everything works as desired when using the + operator.