Skip to content
This repository was archived by the owner on Nov 3, 2023. It is now read-only.

Fix #7280, ER2 client not working on PHP 5.6+ #7330

Closed
wants to merge 1 commit into from
Closed

Fix #7280, ER2 client not working on PHP 5.6+ #7330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions system/modules/repository/classes/RepositoryBackendModule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,11 @@ protected function getExtensionList($aOptions)
case 'local':
return $this->RepositoryServer->getExtensionList((object)$aOptions);
case 'soap':
// PHP 5.6 now have cookie support for SOAP, but using cookies in the request end up with a
// "bad request" response, so we unset them before sending it. (see #7280)
if (isset($this->client->_cookies)) {
unset($this->client->_cookies);
}
return $this->client->getExtensionList($aOptions);
default:
return array();
Expand Down
10 changes: 10 additions & 0 deletions system/modules/repository/classes/RepositoryCatalog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,11 @@ private function getAuthorList($aOptions)
case 'local':
return $this->RepositoryServer->getAuthorList((object)$aOptions);
case 'soap':
// PHP 5.6 now have cookie support for SOAP, but using cookies in the request end up with a
// "bad request" response, so we unset them before sending it. (see #7280)
if (isset($this->client->_cookies)) {
unset($this->client->_cookies);
}
return $this->client->getAuthorList($aOptions);
default:
return array();
Expand All @@ -238,6 +243,11 @@ private function getTagList($aOptions)
case 'local':
return $this->RepositoryServer->getTagList((object)$aOptions);
case 'soap':
// PHP 5.6 now have cookie support for SOAP, but using cookies in the request end up with a
// "bad request" response, so we unset them before sending it. (see #7280)
if (isset($this->client->_cookies)) {
unset($this->client->_cookies);
}
return $this->client->getTagList($aOptions);
default:
return array();
Expand Down
15 changes: 15 additions & 0 deletions system/modules/repository/classes/RepositoryManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,6 +1354,11 @@ private function getFileList($aOptions)
case 'local':
return $this->RepositoryServer->getFileList((object)$aOptions);
case 'soap':
// PHP 5.6 now have cookie support for SOAP, but using cookies in the request end up with a
// "bad request" response, so we unset them before sending it. (see #7280)
if (isset($this->client->_cookies)) {
unset($this->client->_cookies);
}
return $this->client->getFileList($aOptions);
default:
return array();
Expand All @@ -1371,6 +1376,11 @@ private function getPackage($aOptions)
case 'local':
return $this->RepositoryServer->getPackage((object)$aOptions);
case 'soap':
// PHP 5.6 now have cookie support for SOAP, but using cookies in the request end up with a
// "bad request" response, so we unset them before sending it. (see #7280)
if (isset($this->client->_cookies)) {
unset($this->client->_cookies);
}
return $this->client->getPackage($aOptions);
default:
return array();
Expand All @@ -1388,6 +1398,11 @@ private function recordAction($aOptions)
case 'local':
return $this->RepositoryServer->recordAction((object)$aOptions);
case 'soap':
// PHP 5.6 now have cookie support for SOAP, but using cookies in the request end up with a
// "bad request" response, so we unset them before sending it. (see #7280)
if (isset($this->client->_cookies)) {
unset($this->client->_cookies);
}
return $this->client->recordAction($aOptions);
default:
return array();
Expand Down