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

Implement incomplete opening, sending, and closing behaviour for WebSock... #5939

Merged
merged 1 commit into from May 5, 2015
Merged

Implement incomplete opening, sending, and closing behaviour for WebSock... #5939

merged 1 commit into from May 5, 2015

Conversation

@jdm
Copy link
Member

jdm commented May 5, 2015

...ets using rust-websocket.

Authors:
Shivaji Vidhale savidhal@ncsu.edu
William Galliher wpgallih@ncsu.edu
Allen Chen achen4@ncsu.edu
Rucha Jogaikar rsjogaik@ncsu.edu

Review on Reviewable
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented May 5, 2015

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

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.
@jdm
Copy link
Member Author

jdm commented May 5, 2015

Rebased from #5899 with all necessary fixes applied, and now with tests enabled. This should be ready to merge as soon as we unfreeze the tree.
@jdm jdm mentioned this pull request May 5, 2015
Closed
@bors-servo
Copy link
Contributor

bors-servo commented May 5, 2015

☔ The latest upstream changes (presumably #5935) made this pull request unmergeable. Please resolve the merge conflicts.
@wpgallih @jdm
Implement incomplete opening, sending, and closing behaviour for WebS…
Loading status checks…
5afec62 
…ockets using rust-websocket.

Authors:
Shivaji Vidhale <savidhal@ncsu.edu>
William Galliher <wpgallih@ncsu.edu>
Allen Chen <achen4@ncsu.edu>
Rucha Jogaikar <rsjogaik@ncsu.edu>
@jdm jdm force-pushed the jdm:websocket branch from 0babdce to 5afec62 May 5, 2015
@jdm
Copy link
Member Author

jdm commented May 5, 2015

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

bors-servo commented May 5, 2015

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

bors-servo commented May 5, 2015

⌛ Testing commit 5afec62 with merge 9450b66...
bors-servo pushed a commit that referenced this pull request May 5, 2015
bors-servo
Auto merge of #5939 - jdm:websocket, r=jdm
9450b66 
...ets using rust-websocket.

Authors:
Shivaji Vidhale <savidhal@ncsu.edu>
William Galliher <wpgallih@ncsu.edu>
Allen Chen <achen4@ncsu.edu>
Rucha Jogaikar <rsjogaik@ncsu.edu>

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

bors-servo commented May 5, 2015

💔 Test failed - mac2
@jdm
Copy link
Member Author

jdm commented May 5, 2015

@bors-servo: retry
@bors-servo
Copy link
Contributor

bors-servo commented May 5, 2015

⌛ Testing commit 5afec62 with merge 6d2f70a...
bors-servo pushed a commit that referenced this pull request May 5, 2015
bors-servo
Auto merge of #5939 - jdm:websocket, r=jdm
Loading status checks…
6d2f70a 
...ets using rust-websocket.

Authors:
Shivaji Vidhale <savidhal@ncsu.edu>
William Galliher <wpgallih@ncsu.edu>
Allen Chen <achen4@ncsu.edu>
Rucha Jogaikar <rsjogaik@ncsu.edu>

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

bors-servo commented May 5, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2
@bors-servo bors-servo merged commit 5afec62 into servo:master May 5, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@jdm jdm deleted the jdm:websocket branch Aug 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@jdm @hoppipolla-critic-bot @bors-servo @highfive @wpgallih
You can’t perform that action at this time.