mirror of https://github.com/perkeep/perkeep.git
382794c6ba
The Picasa importer was deadlocking inside the golang.org/x/oauth2 package because the Picasa code was mutating its parent's context and accidentally creating a cycle of *oauth2.reuseTokenSource values (double-acquisition of the reuseTokenSource's sync.Mutex was the deadlock) The Picasa code really just wanted to create a subcontext from the base context, where the subcontext did the oauth2 wrapping, but then picasa was storing that subcontext in the camlistore.org/pkg/importer-provided mutable "RunContext" structure's public, embedded "context.Context" field. Unfortunately, the picasa importer code had already used that *RunContext (pre-mutation) as the context.Context for the base HTTP client. This change changes the camlistore.org/pkg/importer.RunContext to not have a public embedded Context field. Instead, it only has a read-only accessor to get at the base context, similar to Go 1.7's net/http.Request.Context() field. This will prevent this class of error in the future. Fixes #698 Change-Id: I9114b64aa1bfd7ea83b36ea1ab18ed88b4a44f7e |
||
|---|---|---|
| .. | ||
| atom | ||
| rdf | ||
| rss | ||
| feed.go | ||
| parse.go | ||