Allows method emulation to be determined via X-HTTP-Method-Override request header.

cnanney · cnanney · commit 6be49b5583eb · 2012-01-19T23:02:57.000-06:00
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
@@ -403,10 +403,18 @@ protected function _detect_output_format()
 	protected function _detect_method()
 	{
 		$method = strtolower($this->input->server('REQUEST_METHOD'));
+		$request_headers = apache_request_headers();
 
-		if ($this->config->item('enable_emulate_request') && $this->input->post('_method'))
+		if ($this->config->item('enable_emulate_request'))
 		{
-			$method =  strtolower($this->input->post('_method'));
+			if ($this->input->post('_method'))
+			{
+				$method = strtolower($this->input->post('_method'));
+			}
+			else if (isset($request_headers['X-HTTP-Method-Override']))
+			{
+				$method = strtolower($request_headers['X-HTTP-Method-Override']);
+			}
 		}
 
 		if (in_array($method, array('get', 'delete', 'post', 'put')))

Original file line number	Diff line number	Diff line change
`@@ -403,10 +403,18 @@ protected function _detect_output_format()`
`403`	`403`	`protected function _detect_method()`
`404`	`404`	`{`
`405`	`405`	`$method = strtolower($this->input->server('REQUEST_METHOD'));`
	`406`	`+ $request_headers = apache_request_headers();`
`406`	`407`
`407`		`- if ($this->config->item('enable_emulate_request') && $this->input->post('_method'))`
	`408`	`+ if ($this->config->item('enable_emulate_request'))`
`408`	`409`	`{`
`409`		`- $method = strtolower($this->input->post('_method'));`
	`410`	`+ if ($this->input->post('_method'))`
	`411`	`+ {`
	`412`	`+ $method = strtolower($this->input->post('_method'));`
	`413`	`+ }`
	`414`	`+ else if (isset($request_headers['X-HTTP-Method-Override']))`
	`415`	`+ {`
	`416`	`+ $method = strtolower($request_headers['X-HTTP-Method-Override']);`
	`417`	`+ }`
`410`	`418`	`}`
`411`	`419`
`412`	`420`	`if (in_array($method, array('get', 'delete', 'post', 'put')))`