Skip to content
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

Conversion of MessageBody to accept Pin in poll_next #1332

Merged
merged 32 commits into from
Feb 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e50ed55
add test crashing with segfault according to #1321
dunnock Jan 28, 2020
20a18fb
This is a squashed commit:
dunnock Jan 29, 2020
650caac
Merge branch 'master' into bodystream-1321
dunnock Jan 30, 2020
30959cb
Rollback actix-http-test dependency to show the issue
dunnock Jan 30, 2020
c3fce1c
merge with msg-body
dunnock Jan 31, 2020
e548e0f
rollback changes to actix-web, awc and test-server for now
dunnock Jan 31, 2020
2271b11
disable weird poll test until actix-web based on actix-http:2
dunnock Jan 31, 2020
82c7703
rollback missed dependencies and CHANGES in crates except actix-http
dunnock Jan 31, 2020
c50a574
change actix-http version to alpha
dunnock Jan 31, 2020
99b72a6
remove extra whitespaces and Unpins
dunnock Jan 31, 2020
4135f16
unlink MessageBody from Unpin
dunnock Feb 3, 2020
3851a37
Fix minor grammatical errors (#1341)
levinotik Feb 6, 2020
728b944
Extensions module improvement and tests. (#1297)
zero-systems Feb 7, 2020
6406f56
Fix/suppress warnings
JohnTitor Feb 7, 2020
53ff3ad
More ignore test causes timeout
JohnTitor Feb 7, 2020
63730c1
Merge pull request #1345 from JohnTitor/fix-warnings
JohnTitor Feb 7, 2020
7d40b66
Add some Actions workflows
JohnTitor Feb 7, 2020
cde3ae5
Remove Travis config
JohnTitor Feb 7, 2020
d32f038
Get rid of one more unsafe
dunnock Feb 10, 2020
8742ae9
refactor dispatcher to avoid possible UB with DispatcherState Pin
dunnock Feb 10, 2020
0ccaf39
Add Unpin to Body to get rid of unsafe in MessageBody
dunnock Feb 10, 2020
05a606b
Fix EncoderBody enum to align with Body::Message
dunnock Feb 10, 2020
8f39df7
Fixed condition for finishing transfer of response
dunnock Feb 10, 2020
4484b3f
Merge pull request #1347 from actix/bye-travis
JohnTitor Feb 11, 2020
a1835d6
Disable coverage for PRs
JohnTitor Feb 13, 2020
9b3f724
Merge pull request #1354 from actix/JohnTitor-patch-1
JohnTitor Feb 13, 2020
e5f116c
rollback actix-http version change
dunnock Feb 15, 2020
6ab7cfa
Remove descriptions about undefined `uds` feature from docs (#1356)
masnagam Feb 15, 2020
b4d837b
trigger retest
dunnock Feb 16, 2020
356b9b4
Merge branch 'master' of /~https://github.com/actix/actix-web into body…
dunnock Feb 16, 2020
d2388a8
use mem::replace instead of mem::take rust 1.40+
dunnock Feb 16, 2020
7371142
point actix-http tests to ./actix-http subdir
dunnock Feb 17, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 90 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: CI (Linux)

on: [push, pull_request]

jobs:
build_and_test:
strategy:
fail-fast: false
matrix:
version:
- 1.39.0 # MSRV
- stable
- nightly

name: ${{ matrix.version }} - x86_64-unknown-linux-gnu
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master

- name: Install ${{ matrix.version }}
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.version }}-x86_64-unknown-linux-gnu
profile: minimal
override: true

- name: Generate Cargo.lock
uses: actions-rs/cargo@v1
with:
command: generate-lockfile
- name: Cache cargo registry
uses: actions/cache@v1
with:
path: ~/.cargo/registry
key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
- name: Cache cargo index
uses: actions/cache@v1
with:
path: ~/.cargo/git
key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
- name: Cache cargo build
uses: actions/cache@v1
with:
path: target
key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-build-trimmed-${{ hashFiles('**/Cargo.lock') }}

- name: check build
uses: actions-rs/cargo@v1
with:
command: check
args: --all --bins --examples --tests

- name: tests
uses: actions-rs/cargo@v1
timeout-minutes: 40
with:
command: test
args: --all --all-features --no-fail-fast -- --nocapture

- name: tests (actix-http)
uses: actions-rs/cargo@v1
timeout-minutes: 40
with:
command: test
args: --manifest-path=actix-http/Cargo.toml --no-default-features --features=rustls -- --nocapture

- name: tests (awc)
uses: actions-rs/cargo@v1
timeout-minutes: 40
with:
command: test
args: --package=awc --no-default-features --features=rustls -- --nocapture

- name: Generate coverage file
if: matrix.version == 'stable' && github.ref == 'refs/heads/master'
run: |
cargo install cargo-tarpaulin
cargo tarpaulin --out Xml
- name: Upload to Codecov
if: matrix.version == 'stable' && github.ref == 'refs/heads/master'
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: cobertura.xml

- name: Clear the cargo caches
run: |
cargo install cargo-cache --no-default-features --features ci-autoclean
cargo-cache
35 changes: 35 additions & 0 deletions .github/workflows/upload-doc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Upload documentation

on:
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
if: github.repository == 'actix/actix-web'

steps:
- uses: actions/checkout@master

- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable-x86_64-unknown-linux-gnu
profile: minimal
override: true

- name: check build
uses: actions-rs/cargo@v1
with:
command: doc
args: --no-deps --all-features

- name: Tweak HTML
run: echo "<meta http-equiv=refresh content=0;url=os_balloon/index.html>" > target/doc/index.html

- name: Upload documentation
run: |
git clone /~https://github.com/davisp/ghp-import.git
./ghp-import/ghp_import.py -n -p -f -m "Documentation upload" -r https://${{ secrets.GITHUB_TOKEN }}@github.com/"${{ github.repository }}.git" target/doc
1 change: 1 addition & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,4 @@ jobs:
--skip=test_slow_request
--skip=test_connection_force_close
--skip=test_connection_server_close
--skip=test_connection_wait_queue_force_close
61 changes: 0 additions & 61 deletions .travis.yml

This file was deleted.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ members = [
"actix-cors",
"actix-files",
"actix-framed",
"actix-session",
"actix-identity",
# "actix-session",
# "actix-identity",
"actix-multipart",
"actix-web-actors",
"actix-web-codegen",
Expand Down Expand Up @@ -71,7 +71,7 @@ actix-threadpool = "0.3.1"
actix-tls = "1.0.0"

actix-web-codegen = "0.2.0"
actix-http = "1.0.1"
actix-http = { version = "1.0.1" }
awc = { version = "1.0.1", default-features = false }

bytes = "0.5.3"
Expand Down Expand Up @@ -108,7 +108,7 @@ codegen-units = 1

[patch.crates-io]
actix-web = { path = "." }
actix-http = { path = "actix-http" }
#actix-http = { path = "actix-http" }
actix-http-test = { path = "test-server" }
actix-web-codegen = { path = "actix-web-codegen" }
actix-cors = { path = "actix-cors" }
Expand Down
1 change: 1 addition & 0 deletions actix-files/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use derive_more::Display;
#[derive(Display, Debug, PartialEq)]
pub enum FilesError {
/// Path is not a directory
#[allow(dead_code)]
#[display(fmt = "Path is not a directory. Unable to serve static files")]
IsNotDirectory,

Expand Down
4 changes: 4 additions & 0 deletions actix-http/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

* Update the `time` dependency to 0.2.5

* Breaking change: trait MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next()

* MessageBody is not implemented for &'static [u8] anymore

### Fixed

* Allow `SameSite=None` cookies to be sent in a response.
Expand Down
10 changes: 5 additions & 5 deletions actix-http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ failure = ["fail-ure"]
secure-cookies = ["ring"]

[dependencies]
actix-service = "1.0.1"
actix-service = "1.0.5"
actix-codec = "0.2.0"
actix-connect = "1.0.1"
actix-utils = "1.0.3"
actix-connect = "1.0.2"
actix-utils = "1.0.6"
actix-rt = "1.0.0"
actix-threadpool = "0.3.1"
actix-tls = { version = "1.0.0", optional = true }
Expand Down Expand Up @@ -89,8 +89,8 @@ flate2 = { version = "1.0.13", optional = true }
fail-ure = { version = "0.1.5", package="failure", optional = true }

[dev-dependencies]
actix-server = "1.0.0"
actix-connect = { version = "1.0.0", features=["openssl"] }
actix-server = "1.0.1"
actix-connect = { version = "1.0.2", features=["openssl"] }
actix-http-test = { version = "1.0.0", features=["openssl"] }
actix-tls = { version = "1.0.0", features=["openssl"] }
futures = "0.3.1"
Expand Down
Loading