tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed combined Content-Type and encoding header parsing in RestfulServer for DataFormatter::get_by_mimetype()

Browse Source 
BUGFIX Returning 409 Conflict HTTP Header when trying to create a resource on an existing URL through RestfulServer

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64439 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-10-16 17:35:27 +00:00
parent 00eaa1b5b7
commit 3c55ea4f01
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/RestfulServer.php
View File

@ -34,7 +34,7 @@
* - GET /api/v1/(ClassName)/(ID) - gets a database record
* - GET /api/v1/(ClassName)/(ID)/(Relation) - get all of the records linked to this database record by the given reatlion
* - GET /api/v1/(ClassName)?(Field)=(Val)&(Field)=(Val) - searches for matching database records
*
* - POST /api/v1/(ClassName) - create a new database record
* - PUT /api/v1/(ClassName)/(ID) - updates a database record
* - PUT /api/v1/(ClassName)/(ID)/(Relation) - updates a relation, replacing the existing record(s) (NOT IMPLEMENTED YET)
* - POST /api/v1/(ClassName)/(ID)/(Relation) - updates a relation, appending to the existing record(s) (NOT IMPLEMENTED YET)
@ -67,6 +67,9 @@
* - {@link DataObject::canCreate()}
* See {@link DataObject} documentation for further details.
*
* You can specify the character-encoding for any input on the HTTP Content-Type.
* At the moment, only UTF-8 is supported. All output is made in UTF-8 regardless of Accept headers.
*
* @todo Finish RestfulServer_Item and RestfulServer_List implementation and re-enable $url_handlers
* @todo Implement PUT/POST/DELETE for relations
* @todo Access-Control for relations (you might be allowed to view Members and Groups, but not their relation with each other)
@ -273,7 +276,9 @@ class RestfulServer extends Controller {
*/
protected function getDataFormatter($includeAcceptHeader = false) {
$extension = $this->request->getExtension();
$contentType = $this->request->getHeader('Content-Type');
$contentTypeWithEncoding = $this->request->getHeader('Content-Type');
preg_match('/([^;]*)/',$contentTypeWithEncoding, $contentTypeMatches);
$contentType = $contentTypeMatches[0];
$accept = $this->request->getHeader('Accept');
$mimetypes = $this->request->getAcceptMimetypes();
@ -372,6 +377,11 @@ class RestfulServer extends Controller {
* rather than a "Conflict" message.
*/
protected function postHandler($className, $id) {
if($id) {
$this->response->setStatusCode(409);
return 'Conflict';
}
if(!singleton($className)->canCreate()) return $this->permissionFailure();
$obj = new $className();