Merge branch '5.4' into 5.5
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 21 Jun 2022 08:58:08 +0000 (10:58 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 21 Jun 2022 08:58:08 +0000 (10:58 +0200)
1  2 
wcfsetup/install/files/lib/system/api/composer.lock
wcfsetup/install/files/lib/system/api/composer/installed.json
wcfsetup/install/files/lib/system/api/composer/installed.php
wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/CHANGELOG.md
wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/README.md
wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/composer.json

index 17fc952e12eea73ba49ee285424fd12a5c10d6bd,db4f59cfa25c7da82067c40a3c622449d825f2bb..259ceea2c9e764074c339528b65b1abd966cf508
          },
          {
              "name": "guzzlehttp/guzzle",
-             "version": "7.4.4",
 -            "version": "dev-7.3.0-woltlab",
++            "version": "7.4.5",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/WoltLab/guzzle",
 -                "reference": "e18604e1114d6b279be2915d3d6a44152ae1c2c4"
 +                "url": "https://github.com/guzzle/guzzle.git",
-                 "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8"
++                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e3ff079b22820c2029d4c2a87796b6a0b8716ad8",
-                 "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8",
 -                "url": "https://api.github.com/repos/WoltLab/guzzle/zipball/e18604e1114d6b279be2915d3d6a44152ae1c2c4",
 -                "reference": "e18604e1114d6b279be2915d3d6a44152ae1c2c4",
++                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
++                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
                  "shasum": ""
              },
              "require": {
                  "ext-json": "*",
 -                "guzzlehttp/promises": "^1.4",
 +                "guzzlehttp/promises": "^1.5",
-                 "guzzlehttp/psr7": "^1.8.3 || ^2.1",
+                 "guzzlehttp/psr7": "^1.9 || ^2.4",
                  "php": "^7.2.5 || ^8.0",
 -                "psr/http-client": "^1.0"
 +                "psr/http-client": "^1.0",
 +                "symfony/deprecation-contracts": "^2.2 || ^3.0"
              },
              "provide": {
                  "psr/http-client-implementation": "1.0"
                  "rest",
                  "web service"
              ],
-                 "source": "https://github.com/guzzle/guzzle/tree/7.4.4"
 +            "support": {
 +                "issues": "https://github.com/guzzle/guzzle/issues",
-             "time": "2022-06-09T21:39:15+00:00"
++                "source": "https://github.com/guzzle/guzzle/tree/7.4.5"
 +            },
 +            "funding": [
 +                {
 +                    "url": "https://github.com/GrahamCampbell",
 +                    "type": "github"
 +                },
 +                {
 +                    "url": "https://github.com/Nyholm",
 +                    "type": "github"
 +                },
 +                {
 +                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
 +                    "type": "tidelift"
 +                }
 +            ],
+             "time": "2022-06-20T22:16:13+00:00"
          },
          {
              "name": "guzzlehttp/promises",
index de228f36033c735a69454e6f4141f036bb67d19c,9807523ea80bd242465124bb19cb303abd74dd80..c3f026b2e8e73d9f6842eaa2be6a34d7e431bb0b
          },
          {
              "name": "guzzlehttp/guzzle",
-             "version": "7.4.4",
-             "version_normalized": "7.4.4.0",
 -            "version": "dev-7.3.0-woltlab",
 -            "version_normalized": "dev-7.3.0-woltlab",
++            "version": "7.4.5",
++            "version_normalized": "7.4.5.0",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/WoltLab/guzzle",
 -                "reference": "e18604e1114d6b279be2915d3d6a44152ae1c2c4"
 +                "url": "https://github.com/guzzle/guzzle.git",
-                 "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8"
++                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e3ff079b22820c2029d4c2a87796b6a0b8716ad8",
-                 "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8",
 -                "url": "https://api.github.com/repos/WoltLab/guzzle/zipball/e18604e1114d6b279be2915d3d6a44152ae1c2c4",
 -                "reference": "e18604e1114d6b279be2915d3d6a44152ae1c2c4",
++                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
++                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
                  "shasum": ""
              },
              "require": {
                  "ext-json": "*",
 -                "guzzlehttp/promises": "^1.4",
 +                "guzzlehttp/promises": "^1.5",
-                 "guzzlehttp/psr7": "^1.8.3 || ^2.1",
+                 "guzzlehttp/psr7": "^1.9 || ^2.4",
                  "php": "^7.2.5 || ^8.0",
 -                "psr/http-client": "^1.0"
 +                "psr/http-client": "^1.0",
 +                "symfony/deprecation-contracts": "^2.2 || ^3.0"
              },
              "provide": {
                  "psr/http-client-implementation": "1.0"
                  "rest",
                  "web service"
              ],
-                 "source": "https://github.com/guzzle/guzzle/tree/7.4.4"
 +            "support": {
 +                "issues": "https://github.com/guzzle/guzzle/issues",
++                "source": "https://github.com/guzzle/guzzle/tree/7.4.5"
 +            },
 +            "funding": [
 +                {
 +                    "url": "https://github.com/GrahamCampbell",
 +                    "type": "github"
 +                },
 +                {
 +                    "url": "https://github.com/Nyholm",
 +                    "type": "github"
 +                },
 +                {
 +                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
 +                    "type": "tidelift"
 +                }
 +            ],
              "install-path": "../guzzlehttp/guzzle"
          },
          {
index b39121db66b0a179487cba07d07b2f6a6a77788b,fb0fa17d8213671293a56f09bf3e542581aeb68b..f1e0a3c8b566717f10f616896569650de387dc3c
              'dev_requirement' => false,
          ),
          'guzzlehttp/guzzle' => array(
-             'pretty_version' => '7.4.4',
-             'version' => '7.4.4.0',
-             'reference' => 'e3ff079b22820c2029d4c2a87796b6a0b8716ad8',
 -            'pretty_version' => 'dev-7.3.0-woltlab',
 -            'version' => 'dev-7.3.0-woltlab',
 -            'reference' => 'e18604e1114d6b279be2915d3d6a44152ae1c2c4',
++            'pretty_version' => '7.4.5',
++            'version' => '7.4.5.0',
++            'reference' => '1dd98b0564cb3f6bd16ce683cb755f94c10fbd82',
              'type' => 'library',
              'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
 -            'aliases' => array(
 -                0 => '7.3.0',
 -            ),
 +            'aliases' => array(),
              'dev_requirement' => false,
          ),
          'guzzlehttp/promises' => array(
index 241443f2b5ae661199704735f89113e6911b1ac3,e303af28149b862a033dc731f98cbec44dbab9e4..3aaf11bf95c5d83f2e02c6d86ce96c59acde217d
@@@ -2,51 -2,6 +2,56 @@@
  
  Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version.
  
++## 7.4.5 - 2022-06-20
++
++* Fix change in port should be considered a change in origin
++* Fix `CURLOPT_HTTPAUTH` option not cleared on change of origin
++
 +## 7.4.4 - 2022-06-09
 +
 +* Fix failure to strip Authorization header on HTTP downgrade
 +* Fix failure to strip the Cookie header on change in host or HTTP downgrade
 +
 +## 7.4.3 - 2022-05-25
 +
 +* Fix cross-domain cookie leakage
 +
 +## 7.4.2 - 2022-03-20
 +
 +### Fixed
 +
 +- Remove curl auth on cross-domain redirects to align with the Authorization HTTP header
 +- Reject non-HTTP schemes in StreamHandler
 +- Set a default ssl.peer_name context in StreamHandler to allow `force_ip_resolve`
 +
 +## 7.4.1 - 2021-12-06
 +
 +### Changed
 +
 +- Replaced implicit URI to string coercion [#2946](https://github.com/guzzle/guzzle/pull/2946)
 +- Allow `symfony/deprecation-contracts` version 3 [#2961](https://github.com/guzzle/guzzle/pull/2961)
 +
 +### Fixed
 +
 +- Only close curl handle if it's done [#2950](https://github.com/guzzle/guzzle/pull/2950)
 +
 +## 7.4.0 - 2021-10-18
 +
 +### Added
 +
 +- Support PHP 8.1 [#2929](https://github.com/guzzle/guzzle/pull/2929), [#2939](https://github.com/guzzle/guzzle/pull/2939)
 +- Support `psr/log` version 2 and 3 [#2943](https://github.com/guzzle/guzzle/pull/2943)
 +
 +### Fixed
 +
 +- Make sure we always call `restore_error_handler()` [#2915](https://github.com/guzzle/guzzle/pull/2915)
 +- Fix progress parameter type compatibility between the cURL and stream handlers [#2936](https://github.com/guzzle/guzzle/pull/2936)
 +- Throw `InvalidArgumentException` when an incorrect `headers` array is provided [#2916](https://github.com/guzzle/guzzle/pull/2916), [#2942](https://github.com/guzzle/guzzle/pull/2942)
 +
 +### Changed
 +
 +- Be more strict with types [#2914](https://github.com/guzzle/guzzle/pull/2914), [#2917](https://github.com/guzzle/guzzle/pull/2917), [#2919](https://github.com/guzzle/guzzle/pull/2919), [#2945](https://github.com/guzzle/guzzle/pull/2945)
 +
  ## 7.3.0 - 2021-03-23
  
  ### Added
index c96b246ebcda763599f2b5e4841da31189a9dc75,5e03bb67dcd6c037edabe812c24253382dd6d0fe..f287fa98d1981fc6ad37f1bef044aaa33fc41a55
@@@ -42,9 -42,9 +42,9 @@@ $promise->wait()
  
  We use GitHub issues only to discuss bugs and new features. For support please refer to:
  
 -- [Documentation](http://guzzlephp.org/)
 -- [Stack Overflow](http://stackoverflow.com/questions/tagged/guzzle)
 -- [#guzzle](https://app.slack.com/client/T0D2S9JCT/CE6UAAKL4) channel on [PHP-HTTP Slack](http://slack.httplug.io/)
 +- [Documentation](https://docs.guzzlephp.org)
 +- [Stack Overflow](https://stackoverflow.com/questions/tagged/guzzle)
- - [#guzzle](https://app.slack.com/client/T0D2S9JCT/CE6UAAKL4) channel on [PHP-HTTP Slack](http://slack.httplug.io/)
++- [#guzzle](https://app.slack.com/client/T0D2S9JCT/CE6UAAKL4) channel on [PHP-HTTP Slack](https://slack.httplug.io/)
  - [Gitter](https://gitter.im/guzzle/guzzle)
  
  
@@@ -73,22 -73,7 +73,22 @@@ composer require guzzlehttp/guzzl
  [guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
  [guzzle-6-repo]: https://github.com/guzzle/guzzle/tree/6.5
  [guzzle-7-repo]: https://github.com/guzzle/guzzle
--[guzzle-3-docs]: http://guzzle3.readthedocs.org
--[guzzle-5-docs]: http://docs.guzzlephp.org/en/5.3/
--[guzzle-6-docs]: http://docs.guzzlephp.org/en/6.5/
--[guzzle-7-docs]: http://docs.guzzlephp.org/en/latest/
++[guzzle-3-docs]: https://guzzle3.readthedocs.io/
++[guzzle-5-docs]: https://docs.guzzlephp.org/en/5.3/
++[guzzle-6-docs]: https://docs.guzzlephp.org/en/6.5/
++[guzzle-7-docs]: https://docs.guzzlephp.org/en/latest/
 +
 +
 +## Security
 +
 +If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/guzzle/security/policy) for more information.
 +
 +## License
 +
 +Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information.
 +
 +## For Enterprise
 +
 +Available as part of the Tidelift Subscription
 +
 +The maintainers of Guzzle and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-guzzlehttp-guzzle?utm_source=packagist-guzzlehttp-guzzle&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
index 9d60de424c1f6d9e174497f6e0fc4d05362d503e,b2623a9438a9b98203e7332b1d491bac983bd1fe..7e043b038fa594ef235f2548047c11e967aefe0f
      "require": {
          "php": "^7.2.5 || ^8.0",
          "ext-json": "*",
 -        "guzzlehttp/promises": "^1.4",
 +        "guzzlehttp/promises": "^1.5",
-         "guzzlehttp/psr7": "^1.8.3 || ^2.1",
+         "guzzlehttp/psr7": "^1.9 || ^2.4",
 -        "psr/http-client": "^1.0"
 +        "psr/http-client": "^1.0",
 +        "symfony/deprecation-contracts": "^2.2 || ^3.0"
      },
      "provide": {
          "psr/http-client-implementation": "1.0"