Author: chabotc
Date: Sat Sep 13 04:22:48 2008
New Revision: 694933
URL: http://svn.apache.org/viewvc?rev=694933&view=rev
Log:
Removed multipart batching code from converters, forgot a few bits of code
before
Modified:
incubator/shindig/trunk/php/src/social/servlet/RestServlet.php
Modified: incubator/shindig/trunk/php/src/social/servlet/RestServlet.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/servlet/RestServlet.php?rev=694933&r1=694932&r2=694933&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/servlet/RestServlet.php (original)
+++ incubator/shindig/trunk/php/src/social/servlet/RestServlet.php Sat Sep 13
04:22:48 2008
@@ -76,8 +76,6 @@
// The json Batch Route is used by the gadgets
private static $JSON_BATCH_ROUTE = "jsonBatch";
- // The Batch Proxy route is used the one defined in the RESTful API
specification
- private static $BATCH_PROXY_ROUTE = "batchProxy";
public function doGet()
{
@@ -199,7 +197,7 @@
$class = new $class(null);
$response = $class->handleMethod($requestItem);
}
- if ($response->getError() != null && ! $this->isJsonBatchUrl()
&& ! $this->isBatchProxyUrl()) {
+ if ($response->getError() != null && ! $this->isJsonBatchUrl())
{
// Can't use http error codes in batch mode, instead we
return the error code in the response item
$this->outputError($response);
}
@@ -360,9 +358,4 @@
{
return strrpos($_SERVER["REQUEST_URI"],
RestServlet::$JSON_BATCH_ROUTE) !== false;
}
-
- public function isBatchProxyUrl()
- {
- return strrpos($_SERVER["REQUEST_URI"],
RestServlet::$BATCH_PROXY_ROUTE) !== false;
- }
}