Skip to content

net: Support no_proxy and https_proxy#41689

Merged
TimvdLippe merged 3 commits intoservo:mainfrom
Narfinger:proxy-env
Jan 6, 2026
Merged

net: Support no_proxy and https_proxy#41689
TimvdLippe merged 3 commits intoservo:mainfrom
Narfinger:proxy-env

Conversation

@Narfinger
Copy link
Contributor

@Narfinger Narfinger commented Jan 5, 2026

This now respects the no_proxy and https_proxy variables with a matching pref (read from the environment).

We now have a new ProxyConnector which uses the hyper_util match to either construct a Tunnel or clone the ServoHttpConnector inside.

This could potentially be slower if every connection is proxied as we redo the tunnel for every new connection. I think this is how the structure is intended to be used as
technically the http_proxy variable can have different proxy assignments per uri.

Signed-off-by: Narfinger Narfinger@users.noreply.github.com

Testing: Tested via setting the no_proxy variable and testing those websites vs proxied websites.
Fixes: #41687

Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>
@servo-highfive servo-highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jan 5, 2026
Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>
Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>
@servo-highfive servo-highfive removed the S-awaiting-review There is new code that needs to be reviewed. label Jan 6, 2026
@jschwe jschwe changed the title net: Use no_proxy variable net: Support no_proxy and https_proxy Jan 6, 2026
@jschwe jschwe added this pull request to the merge queue Jan 6, 2026
@servo-highfive servo-highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jan 6, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 6, 2026
@servo-highfive servo-highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jan 6, 2026
@TimvdLippe TimvdLippe added this pull request to the merge queue Jan 6, 2026
@servo-highfive servo-highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jan 6, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 6, 2026
@servo-highfive servo-highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jan 6, 2026
@TimvdLippe TimvdLippe added this pull request to the merge queue Jan 6, 2026
@servo-highfive servo-highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jan 6, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 6, 2026
@servo-highfive servo-highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jan 6, 2026
@yezhizhen
Copy link
Member

Seems to be a issue with Apache server, which contains Kotlin resource to build Android. I just tried and the resource can be fetched now. Let's run that test.

@yezhizhen yezhizhen added the T-android Do a try run on Android label Jan 6, 2026
@github-actions github-actions bot removed the T-android Do a try run on Android label Jan 6, 2026
@github-actions
Copy link

github-actions bot commented Jan 6, 2026

🔨 Triggering try run (#20749145398) for Android

@github-actions
Copy link

github-actions bot commented Jan 6, 2026

⚠️ Try run (#20749145398) failed!

@yezhizhen
Copy link
Member

A problem occurred configuring root project 'apk'. > Could not resolve all artifacts for configuration ':classpath'. > Could not download kotlin-stdlib-jdk8-1.9.20.jar (org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20) > Could not get resource 'https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.20/kotlin-stdlib-jdk8-1.9.20.jar'. > Could not GET 'https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.20/kotlin-stdlib-jdk8-1.9.20.jar'. Received status code 403 from server: Forbidden 

I don't know why runner cannot get these.

@Narfinger
Copy link
Contributor Author

There is some problem on github currently. There is already a discussion on zulip: #general > Android builds are busted atm

@TimvdLippe TimvdLippe added this pull request to the merge queue Jan 6, 2026
@servo-highfive servo-highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jan 6, 2026
Merged via the queue into servo:main with commit ea48632 Jan 6, 2026
58 of 61 checks passed
@servo-highfive servo-highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jan 6, 2026
@Narfinger Narfinger deleted the proxy-env branch January 7, 2026 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

5 participants