Bug#1105220: [pkg-php-pear] Bug#1105220: unblock: php-embed/4.4.16-1
Control: retitle: -1 unblock: php-embed/4.4.17-1
Hi,
On 13/05/2025 18:32, David Prévot wrote:
[…]
[ Impact ]
Not much impact expected.
Obviously, I was wrong, and upstream just released a s/+/-/ fix on their
recent change.
[ Tests ]
Tests at build time, as well as autopkgtest (and thus
reverse-dependencies have also been tested).
[ Risks ]
Code change is trivial.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
I’d have it uploaded to experimental if I had realized sooner I needed
to bug you, sorry.
Sorry, sorry, sorry…
unblock php-embed/4.4.17-1
diff -Nru php-embed-4.4.15/CHANGELOG.md php-embed-4.4.17/CHANGELOG.md
--- php-embed-4.4.15/CHANGELOG.md 2025-01-02 17:53:09.000000000 +0100
+++ php-embed-4.4.17/CHANGELOG.md 2025-05-13 14:42:29.000000000 +0200
@@ -4,6 +4,14 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [4.4.17] - 2025-05-13
+### Fixed
+- Adapters hostname detection [#556].
+
+## [4.4.16] - 2025-05-09
+### Fixed
+- Adapters hostname detection [#555].
+
## [4.4.15] - 2025-01-02
### Fixed
- Type bug [#553].
@@ -254,7 +262,11 @@
[#548]: https://github.com/oscarotero/Embed/issues/548
[#551]: https://github.com/oscarotero/Embed/issues/551
[#553]: https://github.com/oscarotero/Embed/issues/553
+[#555]: https://github.com/oscarotero/Embed/issues/555
+[#556]: https://github.com/oscarotero/Embed/issues/556
+[4.4.17]: https://github.com/oscarotero/Embed/compare/v4.4.16...v4.4.17
+[4.4.16]: https://github.com/oscarotero/Embed/compare/v4.4.15...v4.4.16
[4.4.15]: https://github.com/oscarotero/Embed/compare/v4.4.14...v4.4.15
[4.4.14]: https://github.com/oscarotero/Embed/compare/v4.4.13...v4.4.14
[4.4.13]: https://github.com/oscarotero/Embed/compare/v4.4.12...v4.4.13
diff -Nru php-embed-4.4.15/debian/changelog php-embed-4.4.17/debian/changelog
--- php-embed-4.4.15/debian/changelog 2025-02-24 19:28:12.000000000 +0100
+++ php-embed-4.4.17/debian/changelog 2025-05-14 08:47:59.000000000 +0200
@@ -1,3 +1,27 @@
+php-embed (4.4.17-1) unstable; urgency=medium
+
+ [ Timothée Jaussoin ]
+ * Fix the subdomain detection, substr was using a wrong offset length
+
+ [ Oscar Otero ]
+ * new version
+
+ -- David Prévot <taffit@debian.org> Wed, 14 May 2025 08:47:59 +0200
+
+php-embed (4.4.16-1) unstable; urgency=medium
+
+ [ Dieter Holvoet ]
+ * Only match exact main and subdomains
+ * Stop using regex
+
+ [ Oscar Otero ]
+ * new version
+
+ [ David Prévot ]
+ * Update Standards-Version to 4.7.2
+
+ -- David Prévot <taffit@debian.org> Sun, 11 May 2025 09:06:24 +0200
+
php-embed (4.4.15-2) unstable; urgency=medium
* Modernize PHPUnit syntax
diff -Nru php-embed-4.4.15/debian/control php-embed-4.4.17/debian/control
--- php-embed-4.4.15/debian/control 2025-02-24 19:14:58.000000000 +0100
+++ php-embed-4.4.17/debian/control 2025-05-11 09:05:00.000000000 +0200
@@ -20,7 +20,7 @@
php-xml,
phpab,
phpunit
-Standards-Version: 4.7.1
+Standards-Version: 4.7.2
Homepage: https://github.com/oscarotero/Embed
Vcs-Git: https://salsa.debian.org/php-team/pear/php-embed.git
Vcs-Browser: https://salsa.debian.org/php-team/pear/php-embed
diff -Nru php-embed-4.4.15/src/ExtractorFactory.php php-embed-4.4.17/src/ExtractorFactory.php
--- php-embed-4.4.15/src/ExtractorFactory.php 2025-01-02 17:53:09.000000000 +0100
+++ php-embed-4.4.17/src/ExtractorFactory.php 2025-05-13 14:42:29.000000000 +0200
@@ -46,7 +46,14 @@
$class = $this->default;
foreach ($this->adapters as $adapterHost => $adapter) {
- if (substr($host, -strlen($adapterHost)) === $adapterHost) {
+ // Check if $host is the same domain as $adapterHost.
+ if ($host === $adapterHost) {
+ $class = $adapter;
+ break;
+ }
+
+ // Check if $host is a subdomain of $adapterHost.
+ if (substr($host, -strlen($adapterHost) - 1) === ".{$adapterHost}") {
$class = $adapter;
break;
}
Reply to: