Merge branch '5.4' into 5.5
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 25 May 2022 13:45:38 +0000 (15:45 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 25 May 2022 13:45:38 +0000 (15:45 +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/src/Cookie/SetCookie.php

index 0570916731408978f10d54eb9c91fe120f99c206,32e87e77dae5af718c84a19eaec295e047eda286..3f9017bf1f90994f493f32e60dbe6d10fff053fa
          },
          {
              "name": "guzzlehttp/guzzle",
-             "version": "7.4.2",
 -            "version": "dev-7.3.0-woltlab",
++            "version": "7.4.3",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/WoltLab/guzzle",
 -                "reference": "8d6f25546061237fb3fcf41df57f8a1c854af519"
 +                "url": "https://github.com/guzzle/guzzle.git",
-                 "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4"
++                "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4",
-                 "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4",
 -                "url": "https://api.github.com/repos/WoltLab/guzzle/zipball/8d6f25546061237fb3fcf41df57f8a1c854af519",
 -                "reference": "8d6f25546061237fb3fcf41df57f8a1c854af519",
++                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
++                "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
                  "shasum": ""
              },
              "require": {
                  "rest",
                  "web service"
              ],
-                 "source": "https://github.com/guzzle/guzzle/tree/7.4.2"
 +            "support": {
 +                "issues": "https://github.com/guzzle/guzzle/issues",
-             "time": "2022-03-20T14:16:28+00:00"
++                "source": "https://github.com/guzzle/guzzle/tree/7.4.3"
 +            },
 +            "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-05-25T13:24:33+00:00"
          },
          {
              "name": "guzzlehttp/promises",
index da8af9a7fd26e9fb5f6f15dfbae2733447fe8214,652d5a76574e60b002e60a19d4cb6d36928a59fe..60332ca07cc250c0993afa70f126da77444af03a
          },
          {
              "name": "guzzlehttp/guzzle",
-             "version": "7.4.2",
-             "version_normalized": "7.4.2.0",
 -            "version": "dev-7.3.0-woltlab",
 -            "version_normalized": "dev-7.3.0-woltlab",
++            "version": "7.4.3",
++            "version_normalized": "7.4.3.0",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/WoltLab/guzzle",
 -                "reference": "8d6f25546061237fb3fcf41df57f8a1c854af519"
 +                "url": "https://github.com/guzzle/guzzle.git",
-                 "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4"
++                "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4",
-                 "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4",
 -                "url": "https://api.github.com/repos/WoltLab/guzzle/zipball/8d6f25546061237fb3fcf41df57f8a1c854af519",
 -                "reference": "8d6f25546061237fb3fcf41df57f8a1c854af519",
++                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
++                "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
                  "shasum": ""
              },
              "require": {
                  "rest",
                  "web service"
              ],
-                 "source": "https://github.com/guzzle/guzzle/tree/7.4.2"
 +            "support": {
 +                "issues": "https://github.com/guzzle/guzzle/issues",
++                "source": "https://github.com/guzzle/guzzle/tree/7.4.3"
 +            },
 +            "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 70da23125bebb64f4e436d43093de7757016548b,618d38e97a55fa279d0e999f8dfb2779e6dc7fb5..751ec5a04bda9a2820aadd9722bd80b1e739d3b0
              'dev_requirement' => false,
          ),
          'guzzlehttp/guzzle' => array(
-             'pretty_version' => '7.4.2',
-             'version' => '7.4.2.0',
 -            'pretty_version' => 'dev-7.3.0-woltlab',
 -            'version' => 'dev-7.3.0-woltlab',
++            'pretty_version' => '7.4.3',
++            'version' => '7.4.3.0',
              'type' => 'library',
              'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
              'aliases' => array(),
-             'reference' => 'ac1ec1cd9b5624694c3a40be801d94137afb12b4',
 -            'reference' => '8d6f25546061237fb3fcf41df57f8a1c854af519',
++            'reference' => '74a8602c6faec9ef74b7a9391ac82c5e65b1cdab',
              'dev_requirement' => false,
          ),
          'guzzlehttp/promises' => array(
index a078bfbbbd8a982b5f77460491f6b05817ae4952,e303af28149b862a033dc731f98cbec44dbab9e4..8d19ea86edd35f6df10791a8cf7086a0840b20d5
@@@ -2,42 -2,6 +2,46 @@@
  
  Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version.
  
++## 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 0025aa7a1271aa539fd924993f965fef86daefcb,5e03bb67dcd6c037edabe812c24253382dd6d0fe..c96b246ebcda763599f2b5e4841da31189a9dc75
@@@ -42,8 -42,8 +42,8 @@@ $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)
++- [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/)
  - [Gitter](https://gitter.im/guzzle/guzzle)