Mglaser has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305680
Change subject: ExtendedSearch/SolrPhpClient
......................................................................
ExtendedSearch/SolrPhpClient
Some versions of Apache Tomcat server (at least 8.5) return an empty
reason phrase in the status line:
"HTTP/1.1 200 \r\n" instead of "HTTP/1.1 200 OK\r\n"
This change fixes the 'ping' function that is based upon the statusline.
NEEDS CHERRY-PICK TO REL1_23
Change-Id: I1955e5eaf41098a3b7fa43f15ff9e9b2e5d45d41
---
M ExtendedSearch/includes/SolrPhpClient/Service.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/80/305680/1
diff --git a/ExtendedSearch/includes/SolrPhpClient/Service.php
b/ExtendedSearch/includes/SolrPhpClient/Service.php
index a18a6c7..162f3cd 100644
--- a/ExtendedSearch/includes/SolrPhpClient/Service.php
+++ b/ExtendedSearch/includes/SolrPhpClient/Service.php
@@ -626,7 +626,7 @@
}
//finally, check the response header line
- if ($response != 'HTTP/1.1 200 OK')
+ if ( strpos($response, 'HTTP/1.1 200') !== 0 )
{
return false;
}
@@ -954,4 +954,4 @@
return $this->_sendRawGet($this->_searchUrl .
$this->_queryDelimiter . $queryString);
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/305680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1955e5eaf41098a3b7fa43f15ff9e9b2e5d45d41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
