cvs: pear /HTTP_Client/Client CookieManager.php

avb Sat May 19 17:26:25 2007 UTC

Modified files:
/pear/HTTP_Client/Client CookieManager.php
Log:
Added a parameter toggling session cookies serialization (they were previously always deleted)

http://cvs.php.net/viewvc.cgi/pear/H...&diff_format=u
Index: pear/HTTP_Client/Client/CookieManager.php
diff -u pear/HTTP_Client/Client/CookieManager.php:1.6 pear/HTTP_Client/Client/CookieManager.php:1.7
--- pear/HTTP_Client/Client/CookieManager.php:1.6 Sat May 19 14:57:31 2007
+++ pear/HTTP_Client/Client/CookieManager.php Sat May 19 17:26:25 2007
@@ -39,7 +39,7 @@
* @package HTTP_Client
* @author Alexey Borzov <avb@php.net>
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id: CookieManager.php,v 1.6 2007/05/19 14:57:31 avb Exp $
+ * @version CVS: $Id: CookieManager.php,v 1.7 2007/05/19 17:26:25 avb Exp $
* @link http://pear.php.net/package/HTTP_Client
*/

@@ -60,15 +60,35 @@
*/
var $_cookies = array();

+ /**
+ * Whether session cookies should be serialized on object serialization
+ * @var boolean
+ * @access private
+ */
+ var $_serializeSessionCookies = false;
+

/**
* Constructor
*
- * @access public
+ * @param boolean Whether session cookies should be serialized
+ * @access public
+ * @see serializeSessionCookies()
+ */
+ function HTTP_Client_CookieManager($serializeSession = false)
+ {
+ $this->serializeSessionCookies($serializeSession);
+ }
+
+ /**
+ * Sets whether session cookies should be serialized when serializing object
+ *
+ * @param boolean
+ * @access public
*/
- function HTTP_Client_CookieManager()
+ function serializeSessionCookies($serialize)
{
- // abstract
+ $this->_serializeSessionCookies = (bool)$serialize;
}


@@ -207,16 +227,20 @@


/**
- * Magic serialization function, removes session cookies
+ * Magic serialization function
+ *
+ * Removes session cookies if $_serializeSessionCookies is false (default)
*/
function __sleep()
{
- foreach ($this->_cookies as $hash => $cookie) {
- if (empty($cookie['expires'])) {
- unset($this->_cookies[$hash]);
+ if (!$this->_serializeSessionCookies) {
+ foreach ($this->_cookies as $hash => $cookie) {
+ if (empty($cookie['expires'])) {
+ unset($this->_cookies[$hash]);
+ }
}
}
- return array('_cookies');
+ return array('_cookies', '_serializeSessionCookies');
}


@@ -226,7 +250,7 @@
function __wakeup()
{
foreach ($this->_cookies as $hash => $cookie) {
- if (strtotime($cookie['expires']) < time()) {
+ if (!empty($cookie['expires']) && strtotime($cookie['expires']) < time()) {
unset($this->_cookies[$hash]);
}
}