diff options
| author | zotlabs <mike@macgirvin.com> | 2018-03-23 21:44:55 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-03-23 21:44:55 -0700 |
| commit | a8d81a68d62e982094110a340341756fbb6df4a9 (patch) | |
| tree | 51f310e1b99b5a8e87d8c349b44f73ea7c3ba6e0 /vendor/sabre/http | |
| parent | abe6ab477531916158c04e3d387cb02e839d28b6 (diff) | |
| parent | 09567da292e4ff1eb89a781b685b26b2f9ba82b4 (diff) | |
| download | volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.gz volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.bz2 volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'vendor/sabre/http')
| -rw-r--r-- | vendor/sabre/http/.travis.yml | 2 | ||||
| -rw-r--r-- | vendor/sabre/http/CHANGELOG.md | 11 | ||||
| -rw-r--r-- | vendor/sabre/http/lib/Auth/Basic.php | 2 | ||||
| -rw-r--r-- | vendor/sabre/http/lib/Sapi.php | 6 | ||||
| -rw-r--r-- | vendor/sabre/http/lib/Version.php | 2 |
5 files changed, 16 insertions, 7 deletions
diff --git a/vendor/sabre/http/.travis.yml b/vendor/sabre/http/.travis.yml index 8ae84d90f..9e4964b9d 100644 --- a/vendor/sabre/http/.travis.yml +++ b/vendor/sabre/http/.travis.yml @@ -9,6 +9,8 @@ php: matrix: fast_finish: true + allow_failures: + - php: hhvm env: matrix: diff --git a/vendor/sabre/http/CHANGELOG.md b/vendor/sabre/http/CHANGELOG.md index 00be2d887..d3dd8b2d9 100644 --- a/vendor/sabre/http/CHANGELOG.md +++ b/vendor/sabre/http/CHANGELOG.md @@ -1,6 +1,13 @@ ChangeLog ========= +4.2.4 (2018-02-23) +------------------ + +* #69: Sending `charset="UTF-8"` on Basic authentication challenges per + [rfc7617][rfc7617]. + + 4.2.3 (2017-06-12) ------------------ @@ -12,7 +19,6 @@ ChangeLog * #72: Handling clients that send invalid `Content-Length` headers. - 4.2.1 (2016-01-06) ------------------ @@ -259,4 +265,5 @@ Before 2.0.0, this package was built-into SabreDAV, where it first appeared in January 2009. [psr-http]: https://github.com/php-fig/fig-standards/blob/master/proposed/http-message.md -[rfc-7240]: http://tools.ietf.org/html/rfc7240 +[rfc7240]: http://tools.ietf.org/html/rfc7240 +[rfc7617]: https://tools.ietf.org/html/rfc7617 diff --git a/vendor/sabre/http/lib/Auth/Basic.php b/vendor/sabre/http/lib/Auth/Basic.php index 60633b957..c263e3f9b 100644 --- a/vendor/sabre/http/lib/Auth/Basic.php +++ b/vendor/sabre/http/lib/Auth/Basic.php @@ -55,7 +55,7 @@ class Basic extends AbstractAuth { */ function requireLogin() { - $this->response->addHeader('WWW-Authenticate', 'Basic realm="' . $this->realm . '"'); + $this->response->addHeader('WWW-Authenticate', 'Basic realm="' . $this->realm . '", charset="UTF-8"'); $this->response->setStatus(401); } diff --git a/vendor/sabre/http/lib/Sapi.php b/vendor/sabre/http/lib/Sapi.php index 6fc6452e4..054380e73 100644 --- a/vendor/sabre/http/lib/Sapi.php +++ b/vendor/sabre/http/lib/Sapi.php @@ -77,12 +77,12 @@ class Sapi { if (is_resource($body) && get_resource_type($body) == 'stream') { if (PHP_INT_SIZE !== 4){ // use the dedicated function on 64 Bit systems - stream_copy_to_stream($body, $output, $contentLength); + stream_copy_to_stream($body, $output, $contentLength); } else { // workaround for 32 Bit systems to avoid stream_copy_to_stream while (!feof($body)) { - fwrite($output, fread($body, 8192)); - } + fwrite($output, fread($body, 8192)); + } } } else { fwrite($output, $body, $contentLength); diff --git a/vendor/sabre/http/lib/Version.php b/vendor/sabre/http/lib/Version.php index aeb080e93..c40532ae8 100644 --- a/vendor/sabre/http/lib/Version.php +++ b/vendor/sabre/http/lib/Version.php @@ -14,6 +14,6 @@ class Version { /** * Full version number */ - const VERSION = '4.2.3'; + const VERSION = '4.2.4'; } |