Skip to content

Commit cc924e8

Browse files
marco-cmarco-c
committed
Bug 1990108 (part 2) - Update ohttp and bhttp crates to git rev bf6a983845cc0b540effb3a615e92d914dfcfd0b. r=necko-reviewers,supply-chain-reviewers,toolkit-telemetry-reviewers,valentin,janerik
Differential Revision: https://phabricator.services.mozilla.com/D265724 UltraBlame original commit: 9f0926c563e4255870826bb7bd0e80fdc3e9eaeb
1 parent 65ce8ea commit cc924e8

File tree

26 files changed

+1606
-7943
lines changed

26 files changed

+1606
-7943
lines changed

‎.cargo/config.toml.in‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,62 @@ github
836836
.
837837
com
838838
/
839+
martinthomson
840+
/
841+
ohttp
842+
.
843+
git
844+
?
845+
rev
846+
=
847+
bf6a983845cc0b540effb3a615e92d914dfcfd0b
848+
"
849+
]
850+
git
851+
=
852+
"
853+
https
854+
:
855+
/
856+
/
857+
github
858+
.
859+
com
860+
/
861+
martinthomson
862+
/
863+
ohttp
864+
.
865+
git
866+
"
867+
rev
868+
=
869+
"
870+
bf6a983845cc0b540effb3a615e92d914dfcfd0b
871+
"
872+
replace
873+
-
874+
with
875+
=
876+
"
877+
vendored
878+
-
879+
sources
880+
"
881+
[
882+
source
883+
.
884+
"
885+
git
886+
+
887+
https
888+
:
889+
/
890+
/
891+
github
892+
.
893+
com
894+
/
839895
mozilla
840896
/
841897
application

‎Cargo.lock‎

Lines changed: 22 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2480,6 +2480,128 @@ ad5f3d56a5a4519eff52af4ff85293431466ef5c
24802480
"
24812481
}
24822482
#
2483+
patch
2484+
ohttp
2485+
-
2486+
app
2487+
-
2488+
services
2489+
relies
2490+
on
2491+
a
2492+
version
2493+
yet
2494+
to
2495+
be
2496+
released
2497+
.
2498+
However
2499+
even
2500+
if
2501+
a
2502+
new
2503+
version
2504+
was
2505+
released
2506+
it
2507+
#
2508+
will
2509+
have
2510+
bumped
2511+
the
2512+
toml
2513+
crate
2514+
to
2515+
a
2516+
version
2517+
which
2518+
would
2519+
cause
2520+
dupes
2521+
here
2522+
.
2523+
We
2524+
should
2525+
remove
2526+
this
2527+
and
2528+
revert
2529+
back
2530+
#
2531+
to
2532+
a
2533+
published
2534+
version
2535+
when
2536+
we
2537+
can
2538+
upgrade
2539+
both
2540+
a
2541+
-
2542+
s
2543+
and
2544+
m
2545+
-
2546+
c
2547+
to
2548+
the
2549+
same
2550+
version
2551+
.
2552+
ohttp
2553+
=
2554+
{
2555+
git
2556+
=
2557+
"
2558+
https
2559+
:
2560+
/
2561+
/
2562+
github
2563+
.
2564+
com
2565+
/
2566+
martinthomson
2567+
/
2568+
ohttp
2569+
.
2570+
git
2571+
"
2572+
rev
2573+
=
2574+
"
2575+
bf6a983845cc0b540effb3a615e92d914dfcfd0b
2576+
"
2577+
}
2578+
bhttp
2579+
=
2580+
{
2581+
git
2582+
=
2583+
"
2584+
https
2585+
:
2586+
/
2587+
/
2588+
github
2589+
.
2590+
com
2591+
/
2592+
martinthomson
2593+
/
2594+
ohttp
2595+
.
2596+
git
2597+
"
2598+
rev
2599+
=
2600+
"
2601+
bf6a983845cc0b540effb3a615e92d914dfcfd0b
2602+
"
2603+
}
2604+
#
24832605
application
24842606
-
24852607
services

‎netwerk/protocol/http/binary_http/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ bhttp
7878
"
7979
0
8080
.
81-
3
81+
6
8282
"
8383
thin
8484
-

‎netwerk/protocol/http/binary_http/src/lib.rs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ bhttp
8787
{
8888
Message
8989
Mode
90+
StatusCode
9091
}
9192
;
9293
use
@@ -1467,6 +1468,12 @@ allocate
14671468
InitBinaryHttpResponse
14681469
{
14691470
status
1471+
:
1472+
status
1473+
.
1474+
into
1475+
(
1476+
)
14701477
headers
14711478
content
14721479
}
@@ -1846,8 +1853,23 @@ Message
18461853
:
18471854
response
18481855
(
1856+
StatusCode
1857+
:
1858+
:
1859+
try_from
1860+
(
18491861
status
18501862
)
1863+
.
1864+
map_err
1865+
(
1866+
|
1867+
_
1868+
|
1869+
NS_ERROR_FAILURE
1870+
)
1871+
?
1872+
)
18511873
;
18521874
let
18531875
mut

0 commit comments

Comments
 (0)