I was still getting some errors when applying the patch on a clean trunk checkout, so I've merged those bits of the diff manually, however please do double check if I did so correctly in patching file php/src/gadgets/oauth/OAuthFetcher.php which had: Hunk #3 FAILED at 44. Hunk #10 FAILED at 507. 2 out of 11 hunks FAILED -- saving rejects to file php/src/gadgets/oauth/OAuthFetcher.php.rej
-- Chris On Mon, Mar 16, 2009 at 7:14 AM, Pan Jie(潘劼) <pan...@google.com> wrote: > Location for my svn client and code review base is: > http://svn.apache.org/repos/asf/incubator/shindig/trunkI've fixed that > typo and updated my patch. > > > On Sun, Mar 15, 2009 at 1:34 AM, Chris Chabot <chab...@google.com> wrote: > >> Any chance you could re-base this patch on the trunk? I'm getting failures >> at: >> >> patching file php/src/gadgets/oauth/OAuthFetcher.php >> Hunk #3 FAILED at 44. >> Hunk #4 succeeded at 119 (offset -5 lines). >> Hunk #5 succeeded at 134 (offset -5 lines). >> Hunk #6 succeeded at 307 (offset -5 lines). >> Hunk #7 succeeded at 360 (offset -5 lines). >> Hunk #8 succeeded at 371 (offset -5 lines). >> Hunk #9 succeeded at 387 (offset -5 lines). >> Hunk #10 FAILED at 497. >> Hunk #11 succeeded at 579 (offset -5 lines). >> 2 out of 11 hunks FAILED -- saving rejects to file >> php/src/gadgets/oauth/OAuthFetcher.php.rej >> >> And some warnings at: >> patching file php/src/gadgets/SigningFetcher.php >> Hunk #1 succeeded at 51 with fuzz 2. >> Hunk #2 succeeded at 59 with fuzz 2. >> Hunk #3 succeeded at 70 with fuzz 2. >> Hunk #4 succeeded at 81 with fuzz 2. >> (though i guess those are safe to ignore) >> >> Patch it self looked good to me at first glace, only one small typo in the >> config/container.php (Srorage instead of Storage) in a comment. >> >> >> On Fri, Mar 13, 2009 at 9:08 AM, <panjie....@gmail.com> wrote: >> >>> Reviewers: shindig-dev, chabotc, chabotc, >>> >>> Description: >>> MakeRequest has 3 kinds of fetching remote content: 'SIGNED', 'OAUTH' >>> and 'NONE'. SIGNED and OAUTH contents are not cached. I refactored those >>> function and use BasicRemoteContent->fetch in MakeRequestHandler. >>> BasicRemoteContent->fetch will cache all remote content fetchings. >>> >>> I want to make BasicRemoteContent the same as DefaultRequestPipeline in >>> Java. So >>> all remote content request will be handled by BasicRemoteContent and >>> caching/invalidating seems much easier. >>> >>> For making CacheStorage a singleton especially for CacheStorageMemcache, >>> I kinda >>> think that CacheStorage for each prefix should be different. Or we can >>> make >>> CacheStorageMemcache::memcache a singleton. >>> >>> I added error_report(E_ALL | E_STRICT) for unittest which exposed >>> failures and I will fix those in next patches. >>> >>> Please review this at http://codereview.appspot.com/26062 >>> >>> Affected files: >>> php/config/container.php >>> php/src/common/Cache.php >>> php/src/common/CacheStorage.php >>> php/src/common/RemoteContent.php >>> php/src/common/RemoteContentFetcher.php >>> php/src/common/sample/BasicRemoteContent.php >>> php/src/common/sample/CacheStorageMemcache.php >>> php/src/gadgets/GadgetContext.php >>> php/src/gadgets/MakeRequestHandler.php >>> php/src/gadgets/ProxyBase.php >>> php/src/gadgets/ProxyHandler.php >>> php/src/gadgets/SigningFetcher.php >>> php/src/gadgets/oauth/OAuthFetcher.php >>> php/src/gadgets/oauth/OAuthFetcherFactory.php >>> php/test/ShindigAllTests.php >>> php/test/common/BasicRemoteContentTest.php >>> php/test/common/CacheFileTest.php >>> php/test/common/CacheMemcacheTest.php >>> php/test/index.php >>> >>> >>> >> > > > -- > Warm Regards, > > Pan Jie > pan...@google.com >
