Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use hosts-replaced URL only when loading resources #6416

Merged
merged 1 commit into from Aug 5, 2015
Merged

Use hosts-replaced URL only when loading resources #6416

merged 1 commit into from Aug 5, 2015

Conversation

@jgraham
Copy link
Contributor

jgraham commented Jun 18, 2015

Review on Reviewable
@highfive
Copy link

highfive commented Jun 18, 2015

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jun 18, 2015

Critic review: https://critic.hoppipolla.co.uk/r/5320

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.
@jgraham
Copy link
Contributor Author

jgraham commented Jun 18, 2015

r? @Manishearth I'm not really sure that this is perfect; I couldn't decide which urls to put in error messages, and it generally feels a bit fragile.
components/script/Cargo.toml Outdated
@@ -21,6 +21,9 @@ path = "../util"
[dependencies.msg]
path = "../msg"

[dependencies.net]
path = "../net"

This comment has been minimized.

Sign in to view
@jdm

jdm Jun 19, 2015

Member

Nope! net_traits exists for a reason.

This comment has been minimized.

Sign in to view
@jgraham

jgraham Jun 19, 2015

Author Contributor

Oh look, a @jdm!

You want the whole of the HOSTS_FILE stuff moved into net_traits then?

This comment has been minimized.

Sign in to view
@Manishearth

Manishearth Jun 19, 2015

Member

Yes. Or make it polymorphic on a trait in net_traits. The former is okay.
@Manishearth
Copy link
Member

Manishearth commented Jun 19, 2015

Mostly LGTM except for the dependency.

Also, there should be some comments about what the various _url variables mean.
@Ms2ger
Copy link
Contributor

Ms2ger commented Jun 20, 2015 

components/compositing/constellation.rs:602: (much) overlong line
components/compositing/constellation.rs:605: (much) overlong line
@jgraham jgraham force-pushed the jgraham:hosts_replaced branch from b3b392d to 159f4b6 Jun 22, 2015
@jgraham jgraham force-pushed the jgraham:hosts_replaced branch from 159f4b6 to 295cd53 Jun 22, 2015
components/net_traits/Cargo.toml Outdated
@@ -24,4 +24,5 @@ log = "*"
url = "0.2.35"
hyper = "0.5"
euclid = "0.1"

regex = "0.1.33"
regex_macros = "0.1.19"

This comment has been minimized.

Sign in to view
@waddlesplash

waddlesplash Jun 23, 2015

Any reason you got rid of the EOL at the end of the file?
components/net_traits/lib.rs Outdated
@@ -1,17 +1,21 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

This comment has been minimized.

Sign in to view
@waddlesplash

waddlesplash Jun 23, 2015

Isn't there supposed to be a newline between the license header and the first #! line?
@jgraham jgraham force-pushed the jgraham:hosts_replaced branch from 295cd53 to 617ef72 Jun 23, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Jun 25, 2015

☔ The latest upstream changes (presumably #6460) made this pull request unmergeable. Please resolve the merge conflicts.
@jgraham jgraham force-pushed the jgraham:hosts_replaced branch from 617ef72 to 9ded0ae Jun 26, 2015
@jdm jdm added the S-needs-rebase label Jun 26, 2015
@jgraham jgraham force-pushed the jgraham:hosts_replaced branch 2 times, most recently from 8cd704c to 15ca46f Jun 29, 2015
@jgraham jgraham removed the S-needs-rebase label Jun 29, 2015
@jdm
Copy link
Member

jdm commented Jul 6, 2015

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2015

📌 Commit 15ca46f has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2015

⌛ Testing commit 15ca46f with merge 00116d6...
bors-servo pushed a commit that referenced this pull request Jul 6, 2015
bors-servo
Auto merge of #6416 - jgraham:hosts_replaced, r=jdm
00116d6 
Use hosts-replaced URL only when loading resources



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6416)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2015

💔 Test failed - gonk
@jdm
Copy link
Member

jdm commented Aug 5, 2015

@bors-servo: r+
Makes sense.
@bors-servo
Copy link
Contributor

bors-servo commented Aug 5, 2015

📌 Commit 49a1cfe has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Aug 5, 2015

⌛ Testing commit 49a1cfe with merge aaa98d1...
bors-servo pushed a commit that referenced this pull request Aug 5, 2015
bors-servo
Auto merge of #6416 - jgraham:hosts_replaced, r=jdm
aaa98d1 
Use hosts-replaced URL only when loading resources



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6416)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 5, 2015

💔 Test failed - mac1
@jdm
Copy link
Member

jdm commented Aug 5, 2015 



/XMLHttpRequest/timeout-cors-async.htm
--------------------------------------
FAIL XMLHttpRequest: timeout event and cross-origin request
@jdm jdm added S-tests-failed and removed S-awaiting-merge labels Aug 5, 2015
@jdm
Copy link
Member

jdm commented Aug 5, 2015

This PR really doesn't want to merge!
@jgraham
Use hosts-replaced URL only when loading resources
Loading status checks…
f52276d
@jgraham jgraham force-pushed the jgraham:hosts_replaced branch from 49a1cfe to f52276d Aug 5, 2015
@jgraham
Copy link
Contributor Author

jgraham commented Aug 5, 2015

Seems like there shouldn't have been any metadata updates at all. Which makes some sense as wptrunner hasn't been updated to use the right host name.
@jdm
Copy link
Member

jdm commented Aug 5, 2015

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented Aug 5, 2015

📌 Commit f52276d has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Aug 5, 2015

⌛ Testing commit f52276d with merge 8602d01...
bors-servo pushed a commit that referenced this pull request Aug 5, 2015
bors-servo
Auto merge of #6416 - jgraham:hosts_replaced, r=jdm
Loading status checks…
8602d01 
Use hosts-replaced URL only when loading resources



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6416)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 5, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3
@bors-servo bors-servo merged commit f52276d into servo:master Aug 5, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
This was referenced Aug 5, 2015
Closed
Closed
@mbrubeck mbrubeck mentioned this pull request Aug 5, 2015
Merged
bors-servo pushed a commit that referenced this pull request Aug 6, 2015
bors-servo
Auto merge of #6998 - mbrubeck:upgrade, r=Manishearth
e302474 
Update to unicode-bidi 0.2.1

Also includes some missing changes from #6416.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6998)
<!-- Reviewable:end -->
bors-servo pushed a commit that referenced this pull request Aug 6, 2015
bors-servo
Auto merge of #6998 - mbrubeck:upgrade, r=Manishearth
Loading status checks…
d2ba81e 
Update to unicode-bidi 0.2.1

Also includes some missing changes from #6416.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6998)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

9 participants
@jgraham @highfive @hoppipolla-critic-bot @Manishearth @Ms2ger @bors-servo @jdm @metajack @waddlesplash
You can’t perform that action at this time.