Merge pull request laravel#1384 from machuga/patch-1

daylerees · daylerees · commit 5e3a8de1ba19 · 2012-10-24T10:51:16.000-07:00
Update LaravelRequest.php to alllow PUT/DELETE/PATCH on PHP5.4 built-in server
diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/LaravelRequest.php b/laravel/vendor/Symfony/Component/HttpFoundation/LaravelRequest.php
@@ -13,7 +13,8 @@ static public function createFromGlobals()
     {
         $request = new static($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
 
-        if (0 === strpos($request->server->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded')
+        if ((0 === strpos($request->server->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded')
+    		|| (0 === strpos($request->server->get('HTTP_CONTENT_TYPE'), 'application/x-www-form-urlencoded')))
             && in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), array('PUT', 'DELETE', 'PATCH'))
         ) {
             parse_str($request->getContent(), $data);

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ static public function createFromGlobals()`
`13`	`13`	`{`
`14`	`14`	`$request = new static($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);`
`15`	`15`
`16`		`- if (0 === strpos($request->server->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded')`
	`16`	`+ if ((0 === strpos($request->server->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded')`
	`17`	`+ \|\| (0 === strpos($request->server->get('HTTP_CONTENT_TYPE'), 'application/x-www-form-urlencoded')))`
`17`	`18`	`&& in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), array('PUT', 'DELETE', 'PATCH'))`
`18`	`19`	`) {`
`19`	`20`	`parse_str($request->getContent(), $data);`