Commit Graph

10 Commits

Author SHA1 Message Date
Josh Matthews
5f71922341 servo: Merge #11472 - Report blank lines that follow an open brace (from jdm:wip); r=mbrubeck
This automates something that I find myself frequently commenting on in PRs.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 3ec20d9cf517c67f4d280e8958cc58c4c2b4fbb2
2016-05-27 18:14:25 -05:00
Simon Sapin
b7019c2535 servo: Merge #9840 - Update to rust-url 1.0 (from servo:url-1.0); r=asajeffrey
**Do not merge yet:** rust-url 1.0 is not published yet and may still get breaking changes. The goal of this PR for now is to demonstrate API usage.

Depends on:

* <s>https://github.com/servo/rust-url/pull/176</s>
* <s>https://github.com/alexcrichton/cookie-rs/pull/42</s>
* <s>https://github.com/hyperium/hyper/pull/740</s>
* https://github.com/cyderize/rust-websocket/pull/70
* https://github.com/jgraham/webdriver-rust/pull/28

Source-Repo: https://github.com/servo/servo
Source-Revision: 84ab7e9fe8f4a6528995eff3eb6e814cb724c364
2016-04-23 11:28:31 -07:00
Anthony Ramine
ec275ffee7 servo: Merge #9888 - Update to Rust 2016-03-05 (from servo:rustup); r=Manishearth
Blocked by https://github.com/Manishearth/rust-tenacious/pull/14.

Source-Repo: https://github.com/servo/servo
Source-Revision: 743e0c9c878a78da873fed4edaa9c8284b2fd12d
2016-03-06 16:03:42 +05:00
Sam Gibson
ead2896473 servo: Merge #9757 - Trigger WebSocket error event (from jdm:websocket-errors-rebase); r=jdm
Trigger a WebSocket error after receiving an invalid message from the server. Rebased from #8868. Fixes #7861.

Source-Repo: https://github.com/servo/servo
Source-Revision: 26b40afe237f97ebd81d537e8ed1201c7c1e4011
2016-02-26 13:44:06 +05:00
Simon Sapin
987a89c8e9 servo: Merge #9660 - Update websocket (from servo:websocketup); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 7840aae1b9b35206ac8826b627969c1ac5423daf
2016-02-23 23:21:54 +05:00
Rebecca
114769dd9e servo: Merge #9662 - Add support for websocket cookies (from rebstar6:websocket_cookies); r=jdm
Addresses both cookies in request and response. Resolves #9540.

Source-Repo: https://github.com/servo/servo
Source-Revision: bc034845b7e543e4e71fa21d6bf99e9f10ddb6c5
2016-02-18 02:14:01 +05:00
James Sanders
5ec543f6a7 servo: Merge #9358 - Clean up websocket closing code (from jsanders:refactor-websocket-closing); r=jdm
Fixes #7860.

This also changes quite a bit about how close codes are implemented, I believe bringing them closer in line with the spec. Instead of saving off the close code sent by the client, it uses the code from the server's closing handshake. It also handles `NO_STATUS` in what I believe is the correct manner. Making this work required a change to the test harness to make the `/echo` websocket handler echo the code sent by the client and handle `NO_STATUS` properly, rather than always replying with `NORMAL`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6663f28f0de308c9365b360cd8ad9ee9e43127ee
2016-01-19 20:38:09 +05:00
rohan.prinja
c098aafd20 servo: Merge #9201 - task -> thread (from ajnirp:8512-task-thread); r=jdm
for #8512

Source-Repo: https://github.com/servo/servo
Source-Revision: d3e2f94f2024f4735f836588ed11303a0abafdf8
2016-01-10 15:19:04 +05:00
jmr0
78d7bb6514 servo: Merge #8825 - adding initial support for websocket subprotocol negotation (from jmr0:master); r=jdm
Addresses #8177

I also noticed some bugs/gaps (and at least one of my TODO's can be an E-Easy)

cc @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 63923bc7c923587652fb966f1f45009e483b1ebf
2015-12-18 04:53:15 +05:00
Nova Fallen
6d9c2b508a servo: Merge #8867 - Move websocket creation to resource task (from nfallen:6638-websocket_loader); r=jdm
This is a pull request for part of https://github.com/servo/servo/issues/6638

It includes the following changes:
-The websocket networking code (ie. making a connection, receiving data, and sending data) has been extracted out of components/script/dom/websocket.rs and into the new file components/net/websocket_loader.rs.
-websocket.rs now communicates with the resource task (components/net/resource_task.rs) to instruct it to initiate a new websocket connection
- websocket_loader.rs now provides an API sent over an IPCChannel that allows websocket.rs to receive feedback about this process and to subsequently send and receive data

Source-Repo: https://github.com/servo/servo
Source-Revision: 951ab565d150b4f108254e06a14ccbe7f1005469
2015-12-08 20:10:50 +05:00