Merge pull request #841 from WordPress/release/2.0.9

Release 2.0.9

.github/workflows/cs.yml

@@ -20,7 +20,7 @@ jobs:
 
  steps:
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Install PHP
  uses: shivammathur/setup-php@v2

.github/workflows/lint.yml

@@ -26,7 +26,7 @@ jobs:
 
  steps:
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Install PHP
  uses: shivammathur/setup-php@v2

.github/workflows/quicktest.yml

@@ -27,7 +27,7 @@ jobs:
 
  steps:
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Install PHP
  uses: shivammathur/setup-php@v2
@@ -53,16 +53,22 @@ jobs:
  - name: Setup Python
  uses: actions/setup-python@v2
  with:
- python-version: '3.8'
+ python-version: '3.10'
 
  - name: Setup proxy server
  run: pip3 install mitmproxy
 
+ - name: Check mitmproxy version
+ run: mitmdump --version
+
  - name: Start test server
  run: |
  PORT=8080 vendor/bin/start.sh
  echo "REQUESTS_TEST_HOST_HTTP=localhost:8080" >> $GITHUB_ENV
 
+ - name: Ping localhost domain
+ run: ping -c1 localhost
+
  - name: Start proxy server
  run: |
  PORT=9002 tests/utils/proxy/start.sh
@@ -75,12 +81,6 @@ jobs:
  - name: Ensure the HTTPS test instance on Render is spun up
  run: curl -s -I https://requests-test-server.onrender.com/ > /dev/null
 
- - name: Check mitmproxy version
- run: mitmdump --version
-
- - name: Ping localhost domain
- run: ping -c1 localhost
-
  - name: Access localhost on port 8080
  run: curl -i http://localhost:8080
 

.github/workflows/test.yml

@@ -37,7 +37,7 @@ jobs:
 
  steps:
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Install PHP
  uses: shivammathur/setup-php@v2
@@ -67,16 +67,22 @@ jobs:
  - name: Setup Python
  uses: actions/setup-python@v2
  with:
- python-version: '3.8'
+ python-version: '3.10'
 
  - name: Setup proxy server
  run: pip3 install mitmproxy
 
+ - name: Check mitmproxy version
+ run: mitmdump --version
+
  - name: Start test server
  run: |
  PORT=8080 vendor/bin/start.sh
  echo "REQUESTS_TEST_HOST_HTTP=localhost:8080" >> $GITHUB_ENV
 
+ - name: Ping localhost domain
+ run: ping -c1 localhost
+
  - name: Start proxy server
  run: |
  PORT=9002 tests/utils/proxy/start.sh
@@ -89,12 +95,6 @@ jobs:
  - name: Ensure the HTTPS test instance on Render is spun up
  run: curl -s -I https://requests-test-server.onrender.com/ > /dev/null
 
- - name: Check mitmproxy version
- run: mitmdump --version
-
- - name: Ping localhost domain
- run: ping -c1 localhost
-
  - name: Access localhost on port 8080
  run: curl -i http://localhost:8080
 

.github/workflows/update-cacert.yml

@@ -55,7 +55,7 @@ jobs:
  fi
 
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Restore etags cache for certificate files
  uses: actions/cache@v2

.github/workflows/update-website.yml

@@ -49,7 +49,7 @@ jobs:
  fi
 
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
  with:
  ref: ${{ steps.base_branch.outputs.BRANCH }}
 
@@ -111,7 +111,7 @@ jobs:
  fi
 
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
  with:
  ref: gh-pages
 
@@ -183,7 +183,7 @@ jobs:
 
  # Test that the site builds correctly.
  - name: Checkout the newly created branch
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  ref: feature/auto-ghpages-update-${{ steps.get_pr_info.outputs.REF }}
 

CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+2.0.9
+-----
+
+### Overview of changes
+- Hotfix: Rollback changes from PR [#657]. [#839] Props [@tomsommer][gh-tomsommer] & [@laszlof][gh-laszlof]
+
+[#839]: https://github.com/WordPress/Requests/pull/839
+
 2.0.8
 -----
 
@@ -1015,6 +1023,7 @@ Initial release!
 [gh-jrfnl]: https://github.com/jrfnl
 [gh-KasperFranz]: https://github.com/KasperFranz
 [gh-kwuerl]: https://github.com/kwuerl
+[gh-laszlof]: https://github.com/laszlof
 [gh-laurentmartelli]: https://github.com/laurentmartelli
 [gh-mbabker]: https://github.com/mbabker
 [gh-mircobabini]: https://github.com/mircobabini
@@ -1039,6 +1048,7 @@ Initial release!
 [gh-TimothyBJacobs]: https://github.com/TimothyBJacobs
 [gh-tnorthcutt]: https://github.com/tnorthcutt
 [gh-todeveni]: https://github.com/todeveni
+[gh-tomsommer]: https://github.com/tomsommer
 [gh-tonebender]: https://github.com/tonebender
 [gh-twdnhfr]: https://github.com/twdnhfr
 [gh-TysonAndre]: https://github.com/TysonAndre

src/Requests.php

@@ -148,7 +148,7 @@ class Requests {
  *
  * @var string
  */
- const VERSION = '2.0.8';
+ const VERSION = '2.0.9';
 
  /**
  * Selected transport name

src/Transport/Curl.php

@@ -25,7 +25,6 @@
 final class Curl implements Transport {
  const CURL_7_10_5 = 0x070A05;
  const CURL_7_16_2 = 0x071002;
- const CURL_7_22_0 = 0x071600;
 
  /**
  * Raw HTTP data
@@ -364,7 +363,7 @@ private function setup_handle($url, $headers, $data, $options) {
  $options['hooks']->dispatch('curl.before_request', [&$this->handle]);
 
  // Force closing the connection for old versions of cURL (<7.22).
- if ($this->version < self::CURL_7_22_0 && !isset($headers['Connection'])) {
+ if (!isset($headers['Connection'])) {
  $headers['Connection'] = 'close';
  }