Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/7.3' into 8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dlubitz committed Jan 4, 2024
2 parents 67e4d99 + 136c347 commit a276704
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Neos.Flow/Classes/Configuration/ConfigurationManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public function registerConfigurationType(string $configurationType, $configurat
if ($configurationLoader === null) {
$configurationLoader = new MergeLoader(new YamlSource(), $configurationType);

// B/C layer
// B/C layer
} elseif (is_string($configurationLoader)) {
$configurationLoader = $this->convertLegacyProcessingType($configurationType, $configurationLoader);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
`7.3.18 (2023-12-06) <https://github.com/neos/flow-development-collection/releases/tag/7.3.18>`_
================================================================================================

Overview of merged pull requests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

`Revert "BUGFIX: Sanitize uploaded svg files for suspicious contents" <https://github.com/neos/flow-development-collection/pull/3249>`_
---------------------------------------------------------------------------------------------------------------------------------------

As discussed in team meeting, this reverts commit `a1642ef31f19a974f34a302c98c13c77b6422ba1 <https://github.com/neos/flow-development-collection/commit/a1642ef31f19a974f34a302c98c13c77b6422ba1>`_
as it raises issues when workong with streams (https://github.com/neos/flow-development-collection/issues/3246).

Original PR: https://github.com/neos/flow-development-collection/pull/3172

See also: https://github.com/neos/flow-development-collection/issues/3248



* Packages: ``Flow`` ``Utility.MediaTypes``

`BUGFIX: Assume content exists, if stream size is unknown <https://github.com/neos/flow-development-collection/pull/3250>`_
---------------------------------------------------------------------------------------------------------------------------

If a PSR7 stream is returned from an ``ActionController`` action, no content arrives at the client, if the stream has an unknown size.

Why is that? Because the check in our ``ActionResponse`` in ``hasContent()`` is implemented like this:

$this->content->getSize() > 0

If a stream returns ``null`` here, because the size is unknown, we should assume content exists...

There should be no change in behavior, even if the stream is in fact empty. Because that would lead to ``hasContent()`` returning ``true``, and the HTTP response being built in ``ActionResponse`` would get the stream as content. When being delivered that would evaluate to "a stream from an empty string", so there will be (again) no difference, if you look at what the ``MessageTrait``does if the internal stream is ``null``:

```php
public function getBody(): StreamInterface
{
if (!$this->stream) {
$this->stream = Utils::streamFor('');
}
return $this->stream;
}
```

**Upgrade instructions**

**Review instructions**


* Packages: ``Flow``

`BUGFIX: Update requirements.txt <https://github.com/neos/flow-development-collection/pull/3242>`_
--------------------------------------------------------------------------------------------------

Update requirements to build documentation based on security suggestions.

* Packages: ``Flow``

`Detailed log <https://github.com/neos/flow-development-collection/compare/7.3.17...7.3.18>`_
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 comments on commit a276704

Please sign in to comment.