Kohana v3.3.2

This commit is contained in:
Deon George
2014-09-06 23:43:07 +10:00
parent f96694b18f
commit 8888719653
236 changed files with 1685 additions and 996 deletions

View File

@@ -2,7 +2,7 @@
/**
* [Request_Client_External] Curl driver performs external requests using the
* php-curl extention. This is the default driver for all external requests.
*
*
* @package Kohana
* @category Base
* @author Kohana Team
@@ -63,7 +63,7 @@ class Kohana_Request_Client_Curl extends Request_Client_External {
$this->_options[CURLOPT_RETURNTRANSFER] = TRUE;
$this->_options[CURLOPT_HEADER] = FALSE;
// Apply any additional options set to
// Apply any additional options set to
$options += $this->_options;
$uri = $request->uri();
@@ -110,8 +110,9 @@ class Kohana_Request_Client_Curl extends Request_Client_External {
}
/**
* Sets the appropriate curl request options. Uses the responding options
* for POST and PUT, uses CURLOPT_CUSTOMREQUEST otherwise
* Sets the appropriate curl request options. Uses the responding option
* for POST or CURLOPT_CUSTOMREQUEST otherwise
*
* @param Request $request
* @param array $options
* @return array
@@ -122,9 +123,6 @@ class Kohana_Request_Client_Curl extends Request_Client_External {
case Request::POST:
$options[CURLOPT_POST] = TRUE;
break;
case Request::PUT:
$options[CURLOPT_PUT] = TRUE;
break;
default:
$options[CURLOPT_CUSTOMREQUEST] = $request->method();
break;
@@ -132,4 +130,4 @@ class Kohana_Request_Client_Curl extends Request_Client_External {
return $options;
}
} // End Kohana_Request_Client_Curl
}