Author: chabotc
Date: Sun Nov 23 07:41:49 2008
New Revision: 719996
URL: http://svn.apache.org/viewvc?rev=719996&view=rev
Log:
Add missing require's (autload is inherently slow, so the smarter the requires
the higher performance) & fix up 3 possible warnings
Modified:
incubator/shindig/trunk/php/src/common/sample/BasicRemoteContent.php
incubator/shindig/trunk/php/src/gadgets/servlet/GadgetRenderingServlet.php
incubator/shindig/trunk/php/src/social/oauth/OAuth.php
incubator/shindig/trunk/php/src/social/service/RestRequestItem.php
incubator/shindig/trunk/php/src/social/servlet/ApiServlet.php
incubator/shindig/trunk/php/src/social/servlet/DataServiceServlet.php
Modified: incubator/shindig/trunk/php/src/common/sample/BasicRemoteContent.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/common/sample/BasicRemoteContent.php?rev=719996&r1=719995&r2=719996&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/common/sample/BasicRemoteContent.php
(original)
+++ incubator/shindig/trunk/php/src/common/sample/BasicRemoteContent.php Sun
Nov 23 07:41:49 2008
@@ -32,6 +32,7 @@
if (! $context->getIgnoreCache() && ! $request->isPost() &&
($cachedRequest = $cache->get($request->toHash(),
$context->getRefreshInterval())) !== false) {
$ret = $cachedRequest;
} else {
+ syslog(5," fetching: ".print_r($request, true));
$ret = $remoteContentFetcher->fetchRequest($request);
// only cache requests that returned a 200 OK and is not a POST
if ($request->getHttpCode() == '200' && ! $request->isPost()) {
Modified:
incubator/shindig/trunk/php/src/gadgets/servlet/GadgetRenderingServlet.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/servlet/GadgetRenderingServlet.php?rev=719996&r1=719995&r2=719996&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/servlet/GadgetRenderingServlet.php
(original)
+++ incubator/shindig/trunk/php/src/gadgets/servlet/GadgetRenderingServlet.php
Sun Nov 23 07:41:49 2008
@@ -32,6 +32,7 @@
require 'src/gadgets/Substitutions.php';
require 'src/gadgets/LocaleSpec.php';
require 'src/gadgets/LocaleMessageBundle.php';
+require 'src/gadgets/GadgetBlacklist.php';
require 'src/common/Locale.php';
require 'src/gadgets/UserPref.php';
require 'src/gadgets/ViewSpec.php';
@@ -45,6 +46,10 @@
require 'src/gadgets/JsLibrary.php';
require 'src/gadgets/HttpUtil.php';
require 'src/gadgets/ContainerConfig.php';
+require 'src/common/JsMin.php';
+require 'src/common/SecurityTokenDecoder.php';
+require 'src/common/SecurityToken.php';
+require 'src/common/BlobCrypter.php';
require 'src/gadgets/rewrite/ContentRewriter.php';
require 'src/gadgets/rewrite/ContentRewriteFeature.php';
Modified: incubator/shindig/trunk/php/src/social/oauth/OAuth.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/oauth/OAuth.php?rev=719996&r1=719995&r2=719996&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/oauth/OAuth.php (original)
+++ incubator/shindig/trunk/php/src/social/oauth/OAuth.php Sun Nov 23 07:41:49
2008
@@ -219,7 +219,7 @@
// next check for the auth header, we need to do some extra stuff
// if that is the case, namely suck in the parameters from GET or POST
// so that we can include them in the signature
- if (@substr($request_headers['Authorization'], 0, 5) == "OAuth") {
+ if (isset($request_headers['Authorization']) &&
@substr($request_headers['Authorization'], 0, 5) == "OAuth") {
$header_parameters =
OAuthRequest::split_header($request_headers['Authorization']);
$parameters = array_merge($req_parameters, $header_parameters);
$req = new OAuthRequest($http_method, $http_url, $parameters);
Modified: incubator/shindig/trunk/php/src/social/service/RestRequestItem.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/service/RestRequestItem.php?rev=719996&r1=719995&r2=719996&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/service/RestRequestItem.php
(original)
+++ incubator/shindig/trunk/php/src/social/service/RestRequestItem.php Sun Nov
23 07:41:49 2008
@@ -126,8 +126,10 @@
* @param urlTemplate The template the url follows
*/
public function applyUrlTemplate($urlTemplate) {
- $paramPieces = parse_url($this->url);
- $this->parseQuery($paramPieces['query']);
+ $paramPieces = @parse_url($this->url);
+ if (isset($paramPieces['query'])) {
+ $this->parseQuery($paramPieces['query']);
+ }
$actualUrl = explode("/", $paramPieces['path']);
$expectedUrl = explode("/", $urlTemplate);
for ($i = 1; $i < count($actualUrl); $i ++) {
Modified: incubator/shindig/trunk/php/src/social/servlet/ApiServlet.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/servlet/ApiServlet.php?rev=719996&r1=719995&r2=719996&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/servlet/ApiServlet.php (original)
+++ incubator/shindig/trunk/php/src/social/servlet/ApiServlet.php Sun Nov 23
07:41:49 2008
@@ -18,47 +18,37 @@
* under the License.
*/
-require 'src/common/HttpServlet.php';
-require 'src/common/SecurityTokenDecoder.php';
-require 'src/common/SecurityToken.php';
-require 'src/common/BlobCrypter.php';
-require 'src/common/OAuthLookupService.php';
-require 'src/social/model/Activity.php';
-require 'src/social/model/Address.php';
-require 'src/social/model/ApiCollection.php';
-require 'src/social/model/BodyType.php';
-require 'src/social/model/Email.php';
-require 'src/social/model/Enum.php';
-require 'src/social/model/IdSpec.php';
-require 'src/social/model/MediaItem.php';
-require 'src/social/model/Message.php';
-require 'src/social/model/Name.php';
-require 'src/social/model/Organization.php';
-require 'src/social/model/Person.php';
-require 'src/social/model/Phone.php';
-require 'src/social/model/Url.php';
-require 'src/social/spi/GroupId.php';
-require 'src/social/spi/UserId.php';
-require 'src/social/spi/RestfulCollection.php';
+require 'src/social/service/DataRequestHandler.php';
+require 'src/social/service/PersonHandler.php';
require 'src/social/spi/ActivityService.php';
-require 'src/social/spi/AppDataService.php';
require 'src/social/spi/PersonService.php';
-require 'src/social/service/RestRequestItem.php';
-require 'src/social/service/DataRequestHandler.php';
+require 'src/social/spi/AppDataService.php';
+require 'src/social/spi/MessagesService.php';
require 'src/social/service/ActivityHandler.php';
require 'src/social/service/AppDataHandler.php';
-require 'src/social/service/PersonHandler.php';
-require 'src/social/service/ResponseItem.php';
-require 'src/social/converters/OutputConverter.php';
-require 'src/social/converters/OutputBasicXmlConverter.php';
-require 'src/social/converters/OutputAtomConverter.php';
-require 'src/social/converters/OutputJsonConverter.php';
-require 'src/social/converters/OutputXmlConverter.php';
+require 'src/social/service/MessagesHandler.php';
+require 'src/common/SecurityToken.php';
+require 'src/common/BlobCrypter.php';
require 'src/social/converters/InputConverter.php';
-require 'src/social/converters/InputBasicXmlConverter.php';
-require 'src/social/converters/InputAtomConverter.php';
require 'src/social/converters/InputJsonConverter.php';
-require 'src/social/converters/InputXmlConverter.php';
+require 'src/social/converters/OutputConverter.php';
+require 'src/social/converters/OutputJsonConverter.php';
+require 'src/social/service/RequestItem.php';
+require 'src/social/service/RestRequestItem.php';
+require 'src/social/service/RpcRequestItem.php';
+require 'src/social/spi/GroupId.php';
+require 'src/social/spi/UserId.php';
+require 'src/social/spi/CollectionOptions.php';
+require 'src/common/Cache.php';
+require 'src/social/model/ComplexField.php';
+require 'src/social/model/Name.php';
+require 'src/social/model/Enum.php';
+require 'src/social/model/Person.php';
+require 'src/social/model/ListField.php';
+require 'src/social/model/Photo.php';
+require 'src/social/spi/RestfulCollection.php';
+require 'src/social/spi/DataCollection.php';
+require 'src/social/service/ResponseItem.php';
require 'src/social/oauth/OAuth.php';
/**
Modified: incubator/shindig/trunk/php/src/social/servlet/DataServiceServlet.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/servlet/DataServiceServlet.php?rev=719996&r1=719995&r2=719996&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/servlet/DataServiceServlet.php
(original)
+++ incubator/shindig/trunk/php/src/social/servlet/DataServiceServlet.php Sun
Nov 23 07:41:49 2008
@@ -92,7 +92,7 @@
$code = '500 Internal Server Error';
break;
}
- header("HTTP/1.0 $code", true);
+ @header("HTTP/1.0 $code", true);
if ($unauthorized) {
header("WWW-Authenticate: OAuth realm", true);
}
