Merge pull request #1627 from guzzle/revert-1612-minor-clean-up

Revert "Minor refactoring"
guzzle · Oct 23, 2016 · 310b854 · 310b854
2 parents eede767 + 0324c92
commit 310b854
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -191,10 +191,13 @@ private function configureDefaults(array $config)
         if (!isset($this->config['headers'])) {
             $this->config['headers'] = ['User-Agent' => default_user_agent()];
         } else {
-            $lowercasedHeaders = array_change_key_case($this->config['headers'], CASE_LOWER);
-            if (!isset($lowercasedHeaders['user-agent'])) {
-                $this->config['headers']['User-Agent'] = default_user_agent();
+            // Add the User-Agent header if one was not already set.
+            foreach (array_keys($this->config['headers']) as $name) {
+                if (strtolower($name) === 'user-agent') {
+                    return;
+                }
             }
+            $this->config['headers']['User-Agent'] = default_user_agent();
         }
     }
 
@@ -231,9 +234,13 @@ private function prepareDefaults($options)
         $result = $options + $defaults;
 
         // Remove null values.
-        return array_filter($result, function ($value) {
-            return !is_null($value);
-        });
+        foreach ($result as $k => $v) {
+            if ($v === null) {
+                unset($result[$k]);
+            }
+        }
+
+        return $result;
     }
 
     /**