Skip to content

Commit 83eb54b

Browse files
Merge branch '4.4' into 5.0
* 4.4: (28 commits) bug #34554 [HttpClient] Fix early cleanup of pushed HTTP/2 responses (lyrixx) Fix tests [Console] Fix commands description with numeric namespaces [HttpFoundation] Fixed typo [DI] Skip unknown method calls for factories in check types pass [EventDispatcher] Better error reporting when arguments to dispatch() are swapped improve upgrade instructions for twig.exception_controller configuration [HttpFoundation] Update CHANGELOG for PdoSessionHandler BC BREAK in 4.4 [Serializer] CsvEncoder::NO_HEADERS_KEY ignored when used in constructor [Form] Keep preferred_choices order for choice groups [Debug] work around failing chdir() on Darwin [PhpUnitBridge] Read configuration CLI directive [DI] Missing test on YamlFileLoader Revert "minor #34608 [Process] add tests for php executable finder if file does not exist (ahmedash95)" Simpler example for Apache basic auth workaround [Console] Fix trying to access array offset on value of type int [Config] Remove extra sprintf arg [HttpKernel] fix typo [HttpKernel] Support typehint to deprecated FlattenException in controller Add preview mode support for Html and Serializer error renderers ...
2 parents c5c226b + 8bccc59 commit 83eb54b

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

BinaryFileResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ public static function trustXSendfileTypeHeader()
340340
}
341341

342342
/**
343-
* If this is set to true, the file will be unlinked after the request is send
343+
* If this is set to true, the file will be unlinked after the request is sent
344344
* Note: If the X-Sendfile header is used, the deleteFileAfterSend setting will not be used.
345345
*
346346
* @return $this

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ CHANGELOG
1717
* passing arguments to `Request::isMethodSafe()` is deprecated.
1818
* `ApacheRequest` is deprecated, use the `Request` class instead.
1919
* passing a third argument to `HeaderBag::get()` is deprecated, use method `all()` instead
20+
* [BC BREAK] `PdoSessionHandler` with MySQL changed the type of the lifetime column,
21+
make sure to run `ALTER TABLE sessions MODIFY sess_lifetime INTEGER UNSIGNED NOT NULL` to
22+
update your database.
2023
* `PdoSessionHandler` now precalculates the expiry timestamp in the lifetime column,
2124
make sure to run `CREATE INDEX EXPIRY ON sessions (sess_lifetime)` to update your database
2225
to speed up garbage collection of expired sessions.

ServerBag.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ public function getHeaders()
4343
/*
4444
* php-cgi under Apache does not pass HTTP Basic user/pass to PHP by default
4545
* For this workaround to work, add these lines to your .htaccess file:
46-
* RewriteCond %{HTTP:Authorization} ^(.+)$
47-
* RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
46+
* RewriteCond %{HTTP:Authorization} .+
47+
* RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
4848
*
4949
* A sample .htaccess file:
5050
* RewriteEngine On
51-
* RewriteCond %{HTTP:Authorization} ^(.+)$
52-
* RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
51+
* RewriteCond %{HTTP:Authorization} .+
52+
* RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
5353
* RewriteCond %{REQUEST_FILENAME} !-f
5454
* RewriteRule ^(.*)$ app.php [QSA,L]
5555
*/

0 commit comments

Comments
 (0)