[PECL-CVS] [pecl-search_engine-solr] master: Merge pull request #99 from bix0r/prepare-curl-update
[email protected] (Birgir Haraldsson via GitHub) Tue, 12 May 2026 08:41:19 +0000
| Newsgroups | php.pecl.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: Birgir Haraldsson (bix0r)
Committer: GitHub (web-flow)
Pusher: bix0r
Date: 2026-05-12T10:41:13+02:00
Commit: https://github.com/php/pecl-search_engine-solr/commit/7c91827eb6a35e9dbebd2c3b6d95e862034c1048
Raw diff: https://github.com/php/pecl-search_engine-solr/commit/7c91827eb6a35e9dbebd2c3b6d95e862034c1048.diff
Merge pull request #99 from bix0r/prepare-curl-update
Change test outputs because of curl changes
Changed paths:
M tests/003.solrclient_options.phpt
M tests/019.solrclient_getdebug.phpt
Diff:
diff --git a/tests/003.solrclient_options.phpt b/tests/003.solrclient_options.phpt
index 24e48051..2f4e8d4d 100644
--- a/tests/003.solrclient_options.phpt
+++ b/tests/003.solrclient_options.phpt
@@ -112,8 +112,8 @@ HTTP/1.1 200 OK
Content-Type: application/xml; charset=UTF-8
Content-Length: 0
-SolrClientException 1004: Solr HTTP Error 7: 'Couldn't connect to server'
-SolrClientException 1004: Solr HTTP Error 7: 'Couldn't connect to server'
+SolrClientException 1004: Solr HTTP Error 7: 'Could%s connect to server'
+SolrClientException 1004: Solr HTTP Error 7: 'Could%s connect to server'
SolrIllegalArgumentException 4000: The SolrClient options cannot be an empty array
diff --git a/tests/019.solrclient_getdebug.phpt b/tests/019.solrclient_getdebug.phpt
index ff4b66d6..a22eedd5 100644
--- a/tests/019.solrclient_getdebug.phpt
+++ b/tests/019.solrclient_getdebug.phpt
@@ -34,6 +34,8 @@ foreach ( $lines as $line) {
0 === strpos($line, 'TCP_NODELAY') ||
0 === strpos($line, 'Accept-Encoding') ||
0 === strpos($line, 'Curl_http_done') ||
+ 0 === strpos($line, 'Request completely sent off') ||
+ 0 === strpos($line, 'using HTTP/1.x') ||
0 === strpos($line, 'processing:')
) {
$print = false;