[Quickfw-git] SF.net Git: quickfw branch, master, updated. 9405be9712192701be2ec7649867568480587d08

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  9405be9712192701be2ec7649867568480587d08 (commit)
       via  e06d7939a955565ef7b24fb20b4c38886b80cf15 (commit)
      from  fe12734cda0119707eb89e609e4f9c7fc51e3dcc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9405be9712192701be2ec7649867568480587d08
Author: Ivan1986 <iva...@li...>
Date:   Mon Apr 12 17:21:22 2010 +0400

    Добавлен PhpDOC в Curl

diff --git a/lib/Curl.php b/lib/Curl.php
index de6a0fb..4a36bee 100644
--- a/lib/Curl.php
+++ b/lib/Curl.php
@@ -6,14 +6,23 @@
  */
 class Curl
 {
+	/** @var array Массив кук */
 	public $cookies = array();
+	/** @var string файл, в котором хранятся куки */
 	public $cookie_file = '';
+	/** @var boolean сохранять файл с куками постоянно */
 	public $persist_cookie_file = false;
+	/** @var array массив заголовков запроса */
 	public $headers = array();
+	/** @var array массив дополнительных опций Curl */
 	public $options = array();
+	/** @var string заголовок referer */
 	public $referer = '';
+	/** @var string заголовок USER_AGENT */
 	public $user_agent = '';
+	/** @var string адрес прокси */
 	public $proxy = '';
+	/** @var integer таймаут в секундах */
 	public $timeout = 0;
 
 	protected $error = '';

commit e06d7939a955565ef7b24fb20b4c38886b80cf15
Author: Ivan1986 <iva...@li...>
Date:   Mon Apr 12 17:17:37 2010 +0400

    Поддержка https и таймаута в Curl

diff --git a/lib/Curl.php b/lib/Curl.php
index 5a3d493..de6a0fb 100644
--- a/lib/Curl.php
+++ b/lib/Curl.php
@@ -14,6 +14,7 @@ class Curl
 	public $referer = '';
 	public $user_agent = '';
 	public $proxy = '';
+	public $timeout = 0;
 
 	protected $error = '';
 	protected $clear;
@@ -115,6 +116,12 @@ class Curl
 			CURLOPT_RETURNTRANSFER => true,
 			CURLOPT_PROXY => $this->proxy,
 
+			CURLOPT_CONNECTTIMEOUT => $this->timeout,
+			CURLOPT_TIMEOUT => $this->timeout,
+
+			CURLOPT_SSL_VERIFYPEER => 0,
+			CURLOPT_SSL_VERIFYHOST => 0,
+
 			CURLOPT_USERAGENT => $this->user_agent,
 			CURLOPT_REFERER => $this->referer,
 

-----------------------------------------------------------------------

Summary of changes:
 lib/Curl.php |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
quickfw