Skip to content

Commit 4226129

Browse files
jrfnljrfnl
authored
Merge pull request #841 from WordPress/release/2.0.9
Release 2.0.9
2 parents fae75bc + 61e53a0 commit 4226129

File tree

9 files changed

+34
-25
lines changed

9 files changed

+34
-25
lines changed

Diff for: ‎.github/workflows/cs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424

2525
- name: Install PHP
2626
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout code
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
3030

3131
- name: Install PHP
3232
uses: shivammathur/setup-php@v2

Diff for: ‎.github/workflows/quicktest.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout code
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v4
3131

3232
- name: Install PHP
3333
uses: shivammathur/setup-php@v2
@@ -53,16 +53,22 @@ jobs:
5353
- name: Setup Python
5454
uses: actions/setup-python@v2
5555
with:
56-
python-version: '3.8'
56+
python-version: '3.10'
5757

5858
- name: Setup proxy server
5959
run: pip3 install mitmproxy
6060

61+
- name: Check mitmproxy version
62+
run: mitmdump --version
63+
6164
- name: Start test server
6265
run: |
6366
PORT=8080 vendor/bin/start.sh
6467
echo "REQUESTS_TEST_HOST_HTTP=localhost:8080" >> $GITHUB_ENV
6568
69+
- name: Ping localhost domain
70+
run: ping -c1 localhost
71+
6672
- name: Start proxy server
6773
run: |
6874
PORT=9002 tests/utils/proxy/start.sh
@@ -75,12 +81,6 @@ jobs:
7581
- name: Ensure the HTTPS test instance on Render is spun up
7682
run: curl -s -I https://requests-test-server.onrender.com/ > /dev/null
7783

78-
- name: Check mitmproxy version
79-
run: mitmdump --version
80-
81-
- name: Ping localhost domain
82-
run: ping -c1 localhost
83-
8484
- name: Access localhost on port 8080
8585
run: curl -i http://localhost:8080
8686

Diff for: ‎.github/workflows/test.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: Checkout code
40-
uses: actions/checkout@v2
40+
uses: actions/checkout@v4
4141

4242
- name: Install PHP
4343
uses: shivammathur/setup-php@v2
@@ -67,16 +67,22 @@ jobs:
6767
- name: Setup Python
6868
uses: actions/setup-python@v2
6969
with:
70-
python-version: '3.8'
70+
python-version: '3.10'
7171

7272
- name: Setup proxy server
7373
run: pip3 install mitmproxy
7474

75+
- name: Check mitmproxy version
76+
run: mitmdump --version
77+
7578
- name: Start test server
7679
run: |
7780
PORT=8080 vendor/bin/start.sh
7881
echo "REQUESTS_TEST_HOST_HTTP=localhost:8080" >> $GITHUB_ENV
7982
83+
- name: Ping localhost domain
84+
run: ping -c1 localhost
85+
8086
- name: Start proxy server
8187
run: |
8288
PORT=9002 tests/utils/proxy/start.sh
@@ -89,12 +95,6 @@ jobs:
8995
- name: Ensure the HTTPS test instance on Render is spun up
9096
run: curl -s -I https://requests-test-server.onrender.com/ > /dev/null
9197

92-
- name: Check mitmproxy version
93-
run: mitmdump --version
94-
95-
- name: Ping localhost domain
96-
run: ping -c1 localhost
97-
9898
- name: Access localhost on port 8080
9999
run: curl -i http://localhost:8080
100100

Diff for: ‎.github/workflows/update-cacert.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
fi
5656
5757
- name: Checkout code
58-
uses: actions/checkout@v2
58+
uses: actions/checkout@v4
5959

6060
- name: Restore etags cache for certificate files
6161
uses: actions/cache@v2

Diff for: ‎.github/workflows/update-website.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
fi
5050
5151
- name: Checkout code
52-
uses: actions/checkout@v2
52+
uses: actions/checkout@v4
5353
with:
5454
ref: ${{ steps.base_branch.outputs.BRANCH }}
5555

@@ -111,7 +111,7 @@ jobs:
111111
fi
112112
113113
- name: Checkout code
114-
uses: actions/checkout@v2
114+
uses: actions/checkout@v4
115115
with:
116116
ref: gh-pages
117117

@@ -183,7 +183,7 @@ jobs:
183183

184184
# Test that the site builds correctly.
185185
- name: Checkout the newly created branch
186-
uses: actions/checkout@v3
186+
uses: actions/checkout@v4
187187
with:
188188
ref: feature/auto-ghpages-update-${{ steps.get_pr_info.outputs.REF }}
189189

Diff for: ‎CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Changelog
22
=========
33

4+
2.0.9
5+
-----
6+
7+
### Overview of changes
8+
- Hotfix: Rollback changes from PR [#657]. [#839] Props [@tomsommer][gh-tomsommer] & [@laszlof][gh-laszlof]
9+
10+
[#839]: https://github.com/WordPress/Requests/pull/839
11+
412
2.0.8
513
-----
614

@@ -1015,6 +1023,7 @@ Initial release!
10151023
[gh-jrfnl]: https://github.com/jrfnl
10161024
[gh-KasperFranz]: https://github.com/KasperFranz
10171025
[gh-kwuerl]: https://github.com/kwuerl
1026+
[gh-laszlof]: https://github.com/laszlof
10181027
[gh-laurentmartelli]: https://github.com/laurentmartelli
10191028
[gh-mbabker]: https://github.com/mbabker
10201029
[gh-mircobabini]: https://github.com/mircobabini
@@ -1039,6 +1048,7 @@ Initial release!
10391048
[gh-TimothyBJacobs]: https://github.com/TimothyBJacobs
10401049
[gh-tnorthcutt]: https://github.com/tnorthcutt
10411050
[gh-todeveni]: https://github.com/todeveni
1051+
[gh-tomsommer]: https://github.com/tomsommer
10421052
[gh-tonebender]: https://github.com/tonebender
10431053
[gh-twdnhfr]: https://github.com/twdnhfr
10441054
[gh-TysonAndre]: https://github.com/TysonAndre

Diff for: ‎src/Requests.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class Requests {
148148
*
149149
* @var string
150150
*/
151-
const VERSION = '2.0.8';
151+
const VERSION = '2.0.9';
152152

153153
/**
154154
* Selected transport name

Diff for: ‎src/Transport/Curl.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
final class Curl implements Transport {
2626
const CURL_7_10_5 = 0x070A05;
2727
const CURL_7_16_2 = 0x071002;
28-
const CURL_7_22_0 = 0x071600;
2928

3029
/**
3130
* Raw HTTP data
@@ -364,7 +363,7 @@ private function setup_handle($url, $headers, $data, $options) {
364363
$options['hooks']->dispatch('curl.before_request', [&$this->handle]);
365364

366365
// Force closing the connection for old versions of cURL (<7.22).
367-
if ($this->version < self::CURL_7_22_0 && !isset($headers['Connection'])) {
366+
if (!isset($headers['Connection'])) {
368367
$headers['Connection'] = 'close';
369368
}
370369

0 commit comments

Comments
 (0)