[Finishes #108285908] Revert revert proxy#5557
Merged
Merged
Conversation
Contributor
|
LGTM |
Bjvanminnen
added a commit
that referenced
this pull request
Nov 20, 2015
[Finishes #108285908] Revert revert proxy
deploy-code-org
added a commit
that referenced
this pull request
Nov 20, 2015
1a5cbc7 Merge pull request #5557 from code-dot-org/revert-revert-proxy (Bjvanminnen) fbcc9a0 Merge pull request #4946 from code-dot-org/skip-npm-install-if-already-installed (Brad Buchanan) 3de1b51 Comment nvm workaround [ci skip] (Brad Buchanan) 703c04c Merge pull request #5462 from code-dot-org/generalize-mobile-audio-unlock (Brad Buchanan) 2d5cd5e Automatically built. (Continuous Integration) d367880 Merge pull request #5552 from code-dot-org/delete_first_screen (Mehal Shah)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Initial attempt broke a couple of our levels, because they use a background images served from images.code.org, and did not include a content_type.
Fix is that in cases where we aren't explicitly given a content_type we try to derive it from the filename. This is obviously imperfect, since I can now proxy assets of arbitrary types as long as (a) the server doesn't return a content_type and (b) the filename claims to be one of our allowable types. I'm not sure whether that is something that we care about, as it's not really so different than a server mis-claiming the wrong content type.