Merge remote-tracking branch 'origin/MC-31987' into honeycombined24

Author: avattam06

app/code/Magento/PageCache/etc/varnish4.vcl

@@ -108,6 +108,11 @@ sub vcl_recv {
         #unset req.http.Cookie;
     }
 
+     # Authenticated GraphQL requests should not be cached by default
+    if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {
+        return (pass);
+    }
+
     return (hash);
 }
 

app/code/Magento/PageCache/etc/varnish5.vcl

@@ -109,6 +109,11 @@ sub vcl_recv {
         #unset req.http.Cookie;
     }
 
+    # Authenticated GraphQL requests should not be cached by default
+    if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {
+        return (pass);
+    }
+
     return (hash);
 }
 

app/code/Magento/PageCache/etc/varnish6.vcl

@@ -109,6 +109,11 @@ sub vcl_recv {
         #unset req.http.Cookie;
     }
 
+    # Authenticated GraphQL requests should not be cached by default
+    if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {
+        return (pass);
+    }
+
     return (hash);
 }
 

lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php

@@ -192,27 +192,4 @@ public function __sleep()
     {
         return ['content', 'isRedirect', 'statusCode'];
     }
-
-    /**
-     * Sending provided headers.
-     *
-     * Had to be overridden because the original did not work correctly with multi-headers.
-     */
-    public function sendHeaders()
-    {
-        if ($this->headersSent()) {
-            return $this;
-        }
-
-        $status  = $this->renderStatusLine();
-        header($status);
-
-        /** @var \Zend\Http\Header\HeaderInterface $header */
-        foreach ($this->getHeaders() as $header) {
-            header($header->toString(), false);
-        }
-
-        $this->headersSent = true;
-        return $this;
-    }
 }