Merge remote-tracking branch 'origin/1.1' into 2.0

skurfuerst · skurfuerst · commit 12bdafe596e1 · 2018-03-05T08:53:54.000+01:00
diff --git a/Classes/Transfer/RequestService.php b/Classes/Transfer/RequestService.php
@@ -90,7 +90,8 @@ public function request($method, ElasticSearchClient $client, $path = null, $arg
             $requestUri->setUsername($uri->getUsername());
             $requestUri->setPassword($uri->getPassword());
         }
-
+        
+        $request->setHeader('Content-Type', 'application/json');
         $response = $this->browser->sendRequest($request);
 
         return new Response($response, $this->browser->getLastRequest());
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ This project connects the Flow Framework to Elasticsearch; enabling two main fun
 
 Related package:
 
-* [Flowpack.ElasticSearch.ContentRepositoryAdaptor](https://github.com/Flowpack/Flowpack.ElasticSearch.ContentRepositoryAdaptor): An adapter to support the Neos Content Repository 
+* [Flowpack.ElasticSearch.ContentRepositoryAdaptor](https://github.com/Flowpack/Flowpack.ElasticSearch.ContentRepositoryAdaptor): An adapter to support the Neos Content Repository
 indexing and searching
 
 More documentation:

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ public function request($method, ElasticSearchClient $client, $path = null, $arg`
`90`	`90`	`$requestUri->setUsername($uri->getUsername());`
`91`	`91`	`$requestUri->setPassword($uri->getPassword());`
`92`	`92`	`}`
`93`		`-`
	`93`	`+`
	`94`	`+ $request->setHeader('Content-Type', 'application/json');`
`94`	`95`	`$response = $this->browser->sendRequest($request);`
`95`	`96`
`96`	`97`	`return new Response($response, $this->browser->getLastRequest());`