summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-11 09:26:44 +0200
committerRemi Collet <remi@remirepo.net>2019-10-11 09:26:44 +0200
commit51e1bf8ff085d14a5b7692c002bf74903e80b9fb (patch)
treed5fdfdc238687153a242266f935b3e6af3913c1e
parentff033b4ed78262f6999ba329e149576ace36862d (diff)
improve patch for PHP 7.4HEADmaster
-rw-r--r--php-sabre-http-php74.patch11
-rw-r--r--php-sabre-http.spec5
2 files changed, 14 insertions, 2 deletions
diff --git a/php-sabre-http-php74.patch b/php-sabre-http-php74.patch
index 38cfe2f..9a85b11 100644
--- a/php-sabre-http-php74.patch
+++ b/php-sabre-http-php74.patch
@@ -14,7 +14,16 @@ diff --git a/lib/Auth/Digest.php b/lib/Auth/Digest.php
index 23c28f8..dd35a0b 100644
--- a/lib/Auth/Digest.php
+++ b/lib/Auth/Digest.php
-@@ -135,6 +135,10 @@
+@@ -124,7 +124,7 @@ class Digest extends AbstractAuth {
+ */
+ function getUsername() {
+
+- return $this->digestParts['username'];
++ return (isset($this->digestParts['username']) ? $this->digestParts['username'] : null);
+
+ }
+
+@@ -135,6 +135,10 @@ class Digest extends AbstractAuth {
*/
protected function validate() {
diff --git a/php-sabre-http.spec b/php-sabre-http.spec
index b041a22..3fe3476 100644
--- a/php-sabre-http.spec
+++ b/php-sabre-http.spec
@@ -16,7 +16,7 @@
Name: php-sabre-%{gh_project}
Summary: Library for dealing with http requests and responses
Version: 4.2.4
-Release: 6%{?dist}
+Release: 7%{?dist}
URL: https://github.com/%{gh_owner}/%{gh_project}
License: BSD
@@ -157,6 +157,9 @@ exit $ret
%changelog
+* Fri Oct 11 2019 Remi Collet <remi@remirepo.net> - 4.2.4-7
+- improve patch for PHP 7.4
+
* Thu Oct 10 2019 Remi Collet <remi@remirepo.net> - 4.2.4-6
- add patch for PHP 7.4