geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-08-31 12:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slightly change how HTTP options are initialized and handled.

Browse Source
This commit is contained in:
Daniele Alessandri
2011-06-06 12:18:37 +02:00
parent e5a85dfce8
commit ff7812282e
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/Network/WebdisConnection.php
+11 -10
View File
@@ -119,13 +119,11 @@ class WebdisConnection implements IConnectionSingle {
}
protected function getHttpOptions() {
$options = null;
if (isset($this->_parameters->user, $this->_parameters->pass)) {
$parameters = $this->_parameters;
$options = array(
'httpauth' => "{$parameters->user}:{$parameters->pass}",
'httpauthtype' => HTTP_AUTH_BASIC,
);
$options = array();
$parameters = $this->_parameters;
if (isset($parameters->user, $parameters->pass)) {
$options['httpauth'] = "{$parameters->user}:{$parameters->pass}";
$options['httpauthtype'] = HTTP_AUTH_BASIC;
}
return $options;
}
@@ -134,11 +132,14 @@ class WebdisConnection implements IConnectionSingle {
$commandId = $this->getCommandId($command);
$arguments = implode('/', array_map('urlencode', $command->getArguments()));
$request = new HttpRequest($this->_webdisUrl, HttpRequest::METH_POST, $this->getHttpOptions());
$request = new HttpRequest($this->_webdisUrl, HttpRequest::METH_POST);
if ($options = $this->getHttpOptions()) {
$request->setOptions($options);
}
$request->setBody("$commandId/$arguments.raw");
$request->send();
phpiredis_reader_feed($this->_reader, $request->getResponseBody());
$response = $request->send();
phpiredis_reader_feed($this->_reader, $response->getBody());
$reply = phpiredis_reader_get_reply($this->_reader);
if ($reply instanceof IReplyObject) {