Merge remote-tracking branch 'origin/master'

esd-projects · May 31, 2019 · bcd9dcb · bcd9dcb
2 parents 1a43bd7 + 0f0832f
commit bcd9dcb
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/src/Core/Server/Beans/Http/MessageTrait.php b/src/Core/Server/Beans/Http/MessageTrait.php
@@ -167,14 +167,14 @@ public function withHeader($name, $value)
         $value = $this->trimHeaderValues($value);
         $normalized = strtolower($name);
 
-        $new = clone $this;
-        if (isset($new->headerNames[$normalized])) {
-            unset($new->headers[$new->headerNames[$normalized]]);
+
+        if (isset($this->headerNames[$normalized])) {
+            unset($this->headers[$this->headerNames[$normalized]]);
         }
-        $new->headerNames[$normalized] = $name;
-        $new->headers[$name] = $value;
+        $this->headerNames[$normalized] = $name;
+        $this->headers[$name] = $value;
 
-        return $new;
+        return $this;
     }
 
     /**
@@ -212,16 +212,15 @@ public function withAddedHeader($name, $value)
         $value = $this->trimHeaderValues($value);
         $normalized = strtolower($name);
 
-        $new = clone $this;
-        if (isset($new->headerNames[$normalized])) {
-            $name = $this->headerNames[$normalized];
-            $new->headers[$name] = array_merge($this->headers[$name], $value);
+        if (isset($this->headerNames[$normalized])) {
+            $this->headerNames[$normalized];
+            $this->headers[$name] = array_merge($this->headers[$name], $value);
         } else {
-            $new->headerNames[$normalized] = $name;
-            $new->headers[$name] = $value;
+            $this->headerNames[$normalized] = $name;
+            $this->headers[$name] = $value;
         }
 
-        return $new;
+        return $this;
     }
 
     /**
@@ -244,10 +243,9 @@ public function withoutHeader($name)
 
         $name = $this->headerNames[$normalized];
 
-        $new = clone $this;
-        unset($new->headers[$name], $new->headerNames[$normalized]);
+        unset($this->headers[$name], $this->headerNames[$normalized]);
 
-        return $new;
+        return $this;
     }
 
     /**