Merge pull request #341 from basdenooijer/master

basdenooijer · basdenooijer · commit 90d006c65eff · 2015-06-14T19:22:39.000+02:00
Fix curl headers for solr &gt; 5
diff --git a/library/Solarium/Core/Client/Adapter/Curl.php b/library/Solarium/Core/Client/Adapter/Curl.php
@@ -156,7 +156,11 @@ public function createHandle($request, $endpoint)
         }
 
         if (!isset($options['headers']['Content-Type'])) {
-            $options['headers']['Content-Type'] = 'text/xml; charset=utf-8';
+            if($method == Request::METHOD_GET){
+                $options['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+            } else {
+                $options['headers']['Content-Type'] = 'application/xml; charset=utf-8';
+            }
         }
 
         // Try endpoint authentication first, fallback to request for backwards compatibility

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,11 @@ public function createHandle($request, $endpoint)`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`if (!isset($options['headers']['Content-Type'])) {`
`159`		`- $options['headers']['Content-Type'] = 'text/xml; charset=utf-8';`
	`159`	`+ if($method == Request::METHOD_GET){`
	`160`	`+ $options['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';`
	`161`	`+ } else {`
	`162`	`+ $options['headers']['Content-Type'] = 'application/xml; charset=utf-8';`
	`163`	`+ }`
`160`	`164`	`}`
`161`	`165`
`162`	`166`	`// Try endpoint authentication first, fallback to request for backwards compatibility`