Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

27 files changed, 1050 insertions, 1050 deletions

diff --git a/extlib/Auth/OpenID/Consumer.php b/extlib/Auth/OpenID/Consumer.php
index 500890b65..c75ef4c06 100644
--- a/extlib/Auth/OpenID/Consumer.php
+++ b/extlib/Auth/OpenID/Consumer.php
@@ -1059,7 +1059,7 @@ class Auth_OpenID_GenericConsumer {
             }
         }
 
-        // Fragments do not influence discovery, so we can't compare a
+        // Fragments do not influence discovery, so we cannot compare a
         // claimed identifier with a fragment to discovered
         // information.
         list($defragged_claimed_id, $_) =
diff --git a/extlib/Auth/OpenID/Discover.php b/extlib/Auth/OpenID/Discover.php
index 62aeb1d2b..9bb3ee357 100644
--- a/extlib/Auth/OpenID/Discover.php
+++ b/extlib/Auth/OpenID/Discover.php
@@ -515,7 +515,7 @@ function Auth_OpenID_discoverXRI($iname, &$fetcher)
 
 function Auth_OpenID_discover($uri, &$fetcher)
 {
-    // If the fetcher (i.e., PHP) doesn't support SSL, we can't do
+    // If the fetcher (i.e., PHP) doesn't support SSL, we cannot do
     // discovery on an HTTPS URL.
     if ($fetcher->isHTTPS($uri) && !$fetcher->supportsSSL()) {
         return array($uri, array());
@@ -527,7 +527,7 @@ function Auth_OpenID_discover($uri, &$fetcher)
         $result = Auth_OpenID_discoverURI($uri, $fetcher);
     }
 
-    // If the fetcher doesn't support SSL, we can't interact with
+    // If the fetcher doesn't support SSL, we cannot interact with
     // HTTPS server URLs; remove those endpoints from the list.
     if (!$fetcher->supportsSSL()) {
         $http_endpoints = array();
diff --git a/extlib/Auth/OpenID/FileStore.php b/extlib/Auth/OpenID/FileStore.php
index 29d8d20e7..d9962e153 100644
--- a/extlib/Auth/OpenID/FileStore.php
+++ b/extlib/Auth/OpenID/FileStore.php
@@ -496,7 +496,7 @@ class Auth_OpenID_FileStore extends Auth_OpenID_OpenIDStore {
 
             return true;
         } else {
-            // Couldn't open directory.
+            // Could not open directory.
             return false;
         }
     }
diff --git a/extlib/DB.php b/extlib/DB.php
index a511979e6..4ef66f66f 100644
--- a/extlib/DB.php
+++ b/extlib/DB.php
@@ -1341,7 +1341,7 @@ class DB_result
          * returning the total number of rows that would have been returned,
          * rather than the real number. As a result, we'll just do the limit
          * calculations for fbsql in the same way as a database with emulated
-         * limits. Unfortunately, we can't just do this in DB_fbsql::numRows()
+         * limits. Unfortunately, we cannot just do this in DB_fbsql::numRows()
          * because that only gets the result resource, rather than the full
          * DB_Result object. */
         if (($this->dbh->features['limit'] === 'emulate'
diff --git a/extlib/DB/DataObject/Generator.php b/extlib/DB/DataObject/Generator.php
index ff6e42c7d..e14e3ef7f 100644
--- a/extlib/DB/DataObject/Generator.php
+++ b/extlib/DB/DataObject/Generator.php
@@ -632,7 +632,7 @@ class DB_DataObject_Generator extends DB_DataObject
                 echo "*****************************************************************\n".
                      "**               WARNING COLUMN NAME UNUSABLE                  **\n".
                      "** Found column '{$t->name}', of type  '{$t->type}'            **\n".
-                     "** Since this column name can't be converted to a php variable **\n".
+                     "** Since this column name cannot be converted to a php variable **\n".
                      "** name, and the whole idea of mapping would result in a mess  **\n".
                      "** This column has been ignored...                             **\n".
                      "*****************************************************************\n";
@@ -910,7 +910,7 @@ class DB_DataObject_Generator extends DB_DataObject
                 echo "*****************************************************************\n".
                      "**               WARNING COLUMN NAME UNUSABLE                  **\n".
                      "** Found column '{$t->name}', of type  '{$t->type}'            **\n".
-                     "** Since this column name can't be converted to a php variable **\n".
+                     "** Since this column name cannot be converted to a php variable **\n".
                      "** name, and the whole idea of mapping would result in a mess  **\n".
                      "** This column has been ignored...                             **\n".
                      "*****************************************************************\n";
diff --git a/extlib/DB/dbase.php b/extlib/DB/dbase.php
index 67afc897d..15d259c4d 100644
--- a/extlib/DB/dbase.php
+++ b/extlib/DB/dbase.php
@@ -287,7 +287,7 @@ class DB_dbase extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -352,7 +352,7 @@ class DB_dbase extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -373,7 +373,7 @@ class DB_dbase extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/fbsql.php b/extlib/DB/fbsql.php
index 4de4078f7..48ff705cf 100644
--- a/extlib/DB/fbsql.php
+++ b/extlib/DB/fbsql.php
@@ -262,7 +262,7 @@ class DB_fbsql extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -309,7 +309,7 @@ class DB_fbsql extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -376,7 +376,7 @@ class DB_fbsql extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -401,7 +401,7 @@ class DB_fbsql extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/ibase.php b/extlib/DB/ibase.php
index ee19c5589..1e444d634 100644
--- a/extlib/DB/ibase.php
+++ b/extlib/DB/ibase.php
@@ -353,7 +353,7 @@ class DB_ibase extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -402,7 +402,7 @@ class DB_ibase extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -449,7 +449,7 @@ class DB_ibase extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/ifx.php b/extlib/DB/ifx.php
index baa6f2867..dcb3dbd3e 100644
--- a/extlib/DB/ifx.php
+++ b/extlib/DB/ifx.php
@@ -147,7 +147,7 @@ class DB_ifx extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it can't actually be designated
+     * {@internal  While this is private, it cannot actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -328,7 +328,7 @@ class DB_ifx extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -387,7 +387,7 @@ class DB_ifx extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -411,7 +411,7 @@ class DB_ifx extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -555,7 +555,7 @@ class DB_ifx extends DB_common
      *
      * If analyzing a query result and the result has duplicate field names,
      * an error will be raised saying
-     * <samp>can't distinguish duplicate field names</samp>.
+     * <samp>cannot distinguish duplicate field names</samp>.
      *
      * @param object|string  $result  DB_result object from a query or a
      *                                 string containing the name of a table.
@@ -604,7 +604,7 @@ class DB_ifx extends DB_common
         $count = @ifx_num_fields($id);
 
         if (count($flds) != $count) {
-            return $this->raiseError("can't distinguish duplicate field names");
+            return $this->raiseError("cannot distinguish duplicate field names");
         }
 
         if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
diff --git a/extlib/DB/msql.php b/extlib/DB/msql.php
index 34854f472..ee64f932f 100644
--- a/extlib/DB/msql.php
+++ b/extlib/DB/msql.php
@@ -288,7 +288,7 @@ class DB_msql extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * PHP's mSQL extension did weird things with NULL values prior to PHP
@@ -339,7 +339,7 @@ class DB_msql extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -360,7 +360,7 @@ class DB_msql extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -385,7 +385,7 @@ class DB_msql extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/mssql.php b/extlib/DB/mssql.php
index 511a2b686..1aad75671 100644
--- a/extlib/DB/mssql.php
+++ b/extlib/DB/mssql.php
@@ -156,7 +156,7 @@ class DB_mssql extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it can't actually be designated
+     * {@internal  While this is private, it cannot actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -324,7 +324,7 @@ class DB_mssql extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -371,7 +371,7 @@ class DB_mssql extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -392,7 +392,7 @@ class DB_mssql extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -417,7 +417,7 @@ class DB_mssql extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/mysql.php b/extlib/DB/mysql.php
index c67254520..bfe34dbe8 100644
--- a/extlib/DB/mysql.php
+++ b/extlib/DB/mysql.php
@@ -139,7 +139,7 @@ class DB_mysql extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it can't actually be designated
+     * {@internal  While this is private, it cannot actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -359,7 +359,7 @@ class DB_mysql extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -411,7 +411,7 @@ class DB_mysql extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -432,7 +432,7 @@ class DB_mysql extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -457,7 +457,7 @@ class DB_mysql extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -722,7 +722,7 @@ class DB_mysql extends DB_common
             return $result;
         }
         if ($result == 0) {
-            // Failed to get the lock, can't do the conversion, bail
+            // Failed to get the lock, cannot do the conversion, bail
             // with a DB_ERROR_NOT_LOCKED error
             return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
         }
@@ -757,7 +757,7 @@ class DB_mysql extends DB_common
      * Quotes a string so it can be safely used as a table or column name
      * (WARNING: using names that require this is a REALLY BAD IDEA)
      *
-     * WARNING:  Older versions of MySQL can't handle the backtick
+     * WARNING:  Older versions of MySQL cannot handle the backtick
      * character (<kbd>`</kbd>) in table or column names.
      *
      * @param string $str  identifier name to be quoted
diff --git a/extlib/DB/mysqli.php b/extlib/DB/mysqli.php
index c6941b170..b6196dfcc 100644
--- a/extlib/DB/mysqli.php
+++ b/extlib/DB/mysqli.php
@@ -142,7 +142,7 @@ class DB_mysqli extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it can't actually be designated
+     * {@internal  While this is private, it cannot actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -434,7 +434,7 @@ class DB_mysqli extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -486,7 +486,7 @@ class DB_mysqli extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -507,7 +507,7 @@ class DB_mysqli extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -532,7 +532,7 @@ class DB_mysqli extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -796,7 +796,7 @@ class DB_mysqli extends DB_common
             return $result;
         }
         if ($result == 0) {
-            // Failed to get the lock, can't do the conversion, bail
+            // Failed to get the lock, cannot do the conversion, bail
             // with a DB_ERROR_NOT_LOCKED error
             return $this->mysqliRaiseError(DB_ERROR_NOT_LOCKED);
         }
@@ -832,7 +832,7 @@ class DB_mysqli extends DB_common
      * Quotes a string so it can be safely used as a table or column name
      * (WARNING: using names that require this is a REALLY BAD IDEA)
      *
-     * WARNING:  Older versions of MySQL can't handle the backtick
+     * WARNING:  Older versions of MySQL cannot handle the backtick
      * character (<kbd>`</kbd>) in table or column names.
      *
      * @param string $str  identifier name to be quoted
diff --git a/extlib/DB/oci8.php b/extlib/DB/oci8.php
index d30794871..6ad36643a 100644
--- a/extlib/DB/oci8.php
+++ b/extlib/DB/oci8.php
@@ -251,7 +251,7 @@ class DB_oci8 extends DB_common
                                                    $char);
             $error = OCIError();
             if (!empty($error) && $error['code'] == 12541) {
-                // Couldn't find TNS listener.  Try direct connection.
+                // Could not find TNS listener.  Try direct connection.
                 $this->connection = @$connect_function($dsn['username'],
                                                        $dsn['password'],
                                                        null,
@@ -368,7 +368,7 @@ class DB_oci8 extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -415,7 +415,7 @@ class DB_oci8 extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -468,7 +468,7 @@ class DB_oci8 extends DB_common
      * is turned on.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -511,7 +511,7 @@ class DB_oci8 extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/odbc.php b/extlib/DB/odbc.php
index eba43659a..b0dc83ab5 100644
--- a/extlib/DB/odbc.php
+++ b/extlib/DB/odbc.php
@@ -301,7 +301,7 @@ class DB_odbc extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -356,7 +356,7 @@ class DB_odbc extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -377,7 +377,7 @@ class DB_odbc extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -427,7 +427,7 @@ class DB_odbc extends DB_common
      * a DB_Error object for DB_ERROR_UNSUPPORTED is returned.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/pgsql.php b/extlib/DB/pgsql.php
index 6030bb4c1..498ef8ade 100644
--- a/extlib/DB/pgsql.php
+++ b/extlib/DB/pgsql.php
@@ -115,7 +115,7 @@ class DB_pgsql extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it can't actually be designated
+     * {@internal  While this is private, it cannot actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -397,7 +397,7 @@ class DB_pgsql extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -445,7 +445,7 @@ class DB_pgsql extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -535,7 +535,7 @@ class DB_pgsql extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -560,7 +560,7 @@ class DB_pgsql extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/sqlite.php b/extlib/DB/sqlite.php
index 5c4b396e5..96d5c934a 100644
--- a/extlib/DB/sqlite.php
+++ b/extlib/DB/sqlite.php
@@ -334,7 +334,7 @@ class DB_sqlite extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -396,7 +396,7 @@ class DB_sqlite extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -422,7 +422,7 @@ class DB_sqlite extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -447,7 +447,7 @@ class DB_sqlite extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/sybase.php b/extlib/DB/sybase.php
index 3befbf6ea..97ab41a22 100644
--- a/extlib/DB/sybase.php
+++ b/extlib/DB/sybase.php
@@ -118,7 +118,7 @@ class DB_sybase extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it can't actually be designated
+     * {@internal  While this is private, it cannot actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -302,7 +302,7 @@ class DB_sybase extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * DB_result::fetchInto() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -359,7 +359,7 @@ class DB_sybase extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
+     * DB_result::free() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -380,7 +380,7 @@ class DB_sybase extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
+     * DB_result::numCols() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -405,7 +405,7 @@ class DB_sybase extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
+     * DB_result::numRows() instead.  It cannot be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -835,7 +835,7 @@ class DB_sybase extends DB_common
             $tableName = $table;
 
             /* We're running sp_helpindex directly because it doesn't exist in
-             * older versions of ASE -- unfortunately, we can't just use
+             * older versions of ASE -- unfortunately, we cannot just use
              * DB::isError() because the user may be using callback error
              * handling. */
             $res = @sybase_query("sp_helpindex $table", $this->connection);
diff --git a/extlib/HTTP/Request2/Adapter/Socket.php b/extlib/HTTP/Request2/Adapter/Socket.php
index ff44d4959..13cd6136f 100644
--- a/extlib/HTTP/Request2/Adapter/Socket.php
+++ b/extlib/HTTP/Request2/Adapter/Socket.php
@@ -1,971 +1,971 @@
-<?php

-/**

- * Socket-based adapter for HTTP_Request2

- *

- * PHP version 5

- *

- * LICENSE:

- *

- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- *

- *    * Redistributions of source code must retain the above copyright

- *      notice, this list of conditions and the following disclaimer.

- *    * Redistributions in binary form must reproduce the above copyright

- *      notice, this list of conditions and the following disclaimer in the

- *      documentation and/or other materials provided with the distribution.

- *    * The names of the authors may not be used to endorse or promote products

- *      derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- *

- * @category   HTTP

- * @package    HTTP_Request2

- * @author     Alexey Borzov <avb@php.net>

- * @license    http://opensource.org/licenses/bsd-license.php New BSD License

- * @version    CVS: $Id: Socket.php 279760 2009-05-03 10:46:42Z avb $

- * @link       http://pear.php.net/package/HTTP_Request2

- */

-

-/**

- * Base class for HTTP_Request2 adapters

- */

-require_once 'HTTP/Request2/Adapter.php';

-

-/**

- * Socket-based adapter for HTTP_Request2

- *

- * This adapter uses only PHP sockets and will work on almost any PHP

- * environment. Code is based on original HTTP_Request PEAR package.

- *

- * @category    HTTP

- * @package     HTTP_Request2

- * @author      Alexey Borzov <avb@php.net>

- * @version     Release: 0.4.1

- */

-class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter

-{

-   /**

-    * Regular expression for 'token' rule from RFC 2616

-    */ 

-    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';

-

-   /**

-    * Regular expression for 'quoted-string' rule from RFC 2616

-    */

-    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';

-

-   /**

-    * Connected sockets, needed for Keep-Alive support

-    * @var  array

-    * @see  connect()

-    */

-    protected static $sockets = array();

-

-   /**

-    * Data for digest authentication scheme

-    *

-    * The keys for the array are URL prefixes. 

-    *

-    * The values are associative arrays with data (realm, nonce, nonce-count, 

-    * opaque...) needed for digest authentication. Stored here to prevent making 

-    * duplicate requests to digest-protected resources after we have already 

-    * received the challenge.

-    *

-    * @var  array

-    */

-    protected static $challenges = array();

-

-   /**

-    * Connected socket

-    * @var  resource

-    * @see  connect()

-    */

-    protected $socket;

-

-   /**

-    * Challenge used for server digest authentication

-    * @var  array

-    */

-    protected $serverChallenge;

-

-   /**

-    * Challenge used for proxy digest authentication

-    * @var  array

-    */

-    protected $proxyChallenge;

-

-   /**

-    * Global timeout, exception will be raised if request continues past this time

-    * @var  integer

-    */

-    protected $timeout = null;

-

-   /**

-    * Remaining length of the current chunk, when reading chunked response

-    * @var  integer

-    * @see  readChunked()

-    */ 

-    protected $chunkLength = 0;

-

-   /**

-    * Sends request to the remote server and returns its response

-    *

-    * @param    HTTP_Request2

-    * @return   HTTP_Request2_Response

-    * @throws   HTTP_Request2_Exception

-    */

-    public function sendRequest(HTTP_Request2 $request)

-    {

-        $this->request = $request;

-        $keepAlive     = $this->connect();

-        $headers       = $this->prepareHeaders();

-

-        // Use global request timeout if given, see feature requests #5735, #8964 

-        if ($timeout = $request->getConfig('timeout')) {

-            $this->timeout = time() + $timeout;

-        } else {

-            $this->timeout = null;

-        }

-

-        try {

-            if (false === @fwrite($this->socket, $headers, strlen($headers))) {

-                throw new HTTP_Request2_Exception('Error writing request');

-            }

-            // provide request headers to the observer, see request #7633

-            $this->request->setLastEvent('sentHeaders', $headers);

-            $this->writeBody();

-

-            if ($this->timeout && time() > $this->timeout) {

-                throw new HTTP_Request2_Exception(

-                    'Request timed out after ' . 

-                    $request->getConfig('timeout') . ' second(s)'

-                );

-            }

-

-            $response = $this->readResponse();

-

-            if (!$this->canKeepAlive($keepAlive, $response)) {

-                $this->disconnect();

-            }

-

-            if ($this->shouldUseProxyDigestAuth($response)) {

-                return $this->sendRequest($request);

-            }

-            if ($this->shouldUseServerDigestAuth($response)) {

-                return $this->sendRequest($request);

-            }

-            if ($authInfo = $response->getHeader('authentication-info')) {

-                $this->updateChallenge($this->serverChallenge, $authInfo);

-            }

-            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {

-                $this->updateChallenge($this->proxyChallenge, $proxyInfo);

-            }

-

-        } catch (Exception $e) {

-            $this->disconnect();

-            throw $e;

-        }

-

-        return $response;

-    }

-

-   /**

-    * Connects to the remote server

-    *

-    * @return   bool    whether the connection can be persistent

-    * @throws   HTTP_Request2_Exception

-    */

-    protected function connect()

-    {

-        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');

-        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

-        $headers = $this->request->getHeaders();

-        $reqHost = $this->request->getUrl()->getHost();

-        if (!($reqPort = $this->request->getUrl()->getPort())) {

-            $reqPort = $secure? 443: 80;

-        }

-

-        if ($host = $this->request->getConfig('proxy_host')) {

-            if (!($port = $this->request->getConfig('proxy_port'))) {

-                throw new HTTP_Request2_Exception('Proxy port not provided');

-            }

-            $proxy = true;

-        } else {

-            $host  = $reqHost;

-            $port  = $reqPort;

-            $proxy = false;

-        }

-

-        if ($tunnel && !$proxy) {

-            throw new HTTP_Request2_Exception(

-                "Trying to perform CONNECT request without proxy"

-            );

-        }

-        if ($secure && !in_array('ssl', stream_get_transports())) {

-            throw new HTTP_Request2_Exception(

-                'Need OpenSSL support for https:// requests'

-            );

-        }

-

-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive

-        // connection token to a proxy server...

-        if ($proxy && !$secure && 

-            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']

-        ) {

-            $this->request->setHeader('connection');

-        }

-

-        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') && 

-                      empty($headers['connection'])) ||

-                     (!empty($headers['connection']) &&

-                      'Keep-Alive' == $headers['connection']);

-        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;

-

-        $options = array();

-        if ($secure || $tunnel) {

-            foreach ($this->request->getConfig() as $name => $value) {

-                if ('ssl_' == substr($name, 0, 4) && null !== $value) {

-                    if ('ssl_verify_host' == $name) {

-                        if ($value) {

-                            $options['CN_match'] = $reqHost;

-                        }

-                    } else {

-                        $options[substr($name, 4)] = $value;

-                    }

-                }

-            }

-            ksort($options);

-        }

-

-        // Changing SSL context options after connection is established does *not*

-        // work, we need a new connection if options change

-        $remote    = $host . ':' . $port;

-        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .

-                     (empty($options)? '': ':' . serialize($options));

-        unset($this->socket);

-

-        // We use persistent connections and have a connected socket?

-        // Ensure that the socket is still connected, see bug #16149

-        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&

-            !feof(self::$sockets[$socketKey])

-        ) {

-            $this->socket =& self::$sockets[$socketKey];

-

-        } elseif ($secure && $proxy && !$tunnel) {

-            $this->establishTunnel();

-            $this->request->setLastEvent(

-                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"

-            );

-            self::$sockets[$socketKey] =& $this->socket;

-

-        } else {

-            // Set SSL context options if doing HTTPS request or creating a tunnel

-            $context = stream_context_create();

-            foreach ($options as $name => $value) {

-                if (!stream_context_set_option($context, 'ssl', $name, $value)) {

-                    throw new HTTP_Request2_Exception(

-                        "Error setting SSL context option '{$name}'"

-                    );

-                }

-            }

-            $this->socket = @stream_socket_client(

-                $remote, $errno, $errstr,

-                $this->request->getConfig('connect_timeout'),

-                STREAM_CLIENT_CONNECT, $context

-            );

-            if (!$this->socket) {

-                throw new HTTP_Request2_Exception(

-                    "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"

-                );

-            }

-            $this->request->setLastEvent('connect', $remote);

-            self::$sockets[$socketKey] =& $this->socket;

-        }

-        return $keepAlive;

-    }

-

-   /**

-    * Establishes a tunnel to a secure remote server via HTTP CONNECT request

-    *

-    * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP

-    * sees that we are connected to a proxy server (duh!) rather than the server

-    * that presents its certificate.

-    *

-    * @link     http://tools.ietf.org/html/rfc2817#section-5.2

-    * @throws   HTTP_Request2_Exception

-    */

-    protected function establishTunnel()

-    {

-        $donor   = new self;

-        $connect = new HTTP_Request2(

-            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,

-            array_merge($this->request->getConfig(),

-                        array('adapter' => $donor))

-        );

-        $response = $connect->send();

-        // Need any successful (2XX) response

-        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {

-            throw new HTTP_Request2_Exception(

-                'Failed to connect via HTTPS proxy. Proxy response: ' .

-                $response->getStatus() . ' ' . $response->getReasonPhrase()

-            );

-        }

-        $this->socket = $donor->socket;

-

-        $modes = array(

-            STREAM_CRYPTO_METHOD_TLS_CLIENT, 

-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,

-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,

-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT 

-        );

-

-        foreach ($modes as $mode) {

-            if (stream_socket_enable_crypto($this->socket, true, $mode)) {

-                return;

-            }

-        }

-        throw new HTTP_Request2_Exception(

-            'Failed to enable secure connection when connecting through proxy'

-        );

-    }

-

-   /**

-    * Checks whether current connection may be reused or should be closed

-    *

-    * @param    boolean                 whether connection could be persistent 

-    *                                   in the first place

-    * @param    HTTP_Request2_Response  response object to check

-    * @return   boolean

-    */

-    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)

-    {

-        // Do not close socket on successful CONNECT request

-        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&

-            200 <= $response->getStatus() && 300 > $response->getStatus()

-        ) {

-            return true;

-        }

-

-        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||

-                       null !== $response->getHeader('content-length');

-        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||

-                       (null === $response->getHeader('connection') &&

-                        '1.1' == $response->getVersion());

-        return $requestKeepAlive && $lengthKnown && $persistent;

-    }

-

-   /**

-    * Disconnects from the remote server

-    */

-    protected function disconnect()

-    {

-        if (is_resource($this->socket)) {

-            fclose($this->socket);

-            $this->socket = null;

-            $this->request->setLastEvent('disconnect');

-        }

-    }

-

-   /**

-    * Checks whether another request should be performed with server digest auth

-    *

-    * Several conditions should be satisfied for it to return true:

-    *   - response status should be 401

-    *   - auth credentials should be set in the request object

-    *   - response should contain WWW-Authenticate header with digest challenge

-    *   - there is either no challenge stored for this URL or new challenge

-    *     contains stale=true parameter (in other case we probably just failed 

-    *     due to invalid username / password)

-    *

-    * The method stores challenge values in $challenges static property

-    *

-    * @param    HTTP_Request2_Response  response to check

-    * @return   boolean whether another request should be performed

-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

-    */

-    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)

-    {

-        // no sense repeating a request if we don't have credentials

-        if (401 != $response->getStatus() || !$this->request->getAuth()) {

-            return false;

-        }

-        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {

-            return false;

-        }

-

-        $url    = $this->request->getUrl();

-        $scheme = $url->getScheme();

-        $host   = $scheme . '://' . $url->getHost();

-        if ($port = $url->getPort()) {

-            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||

-                (0 == strcasecmp($scheme, 'https') && 443 != $port)

-            ) {

-                $host .= ':' . $port;

-            }

-        }

-

-        if (!empty($challenge['domain'])) {

-            $prefixes = array();

-            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {

-                // don't bother with different servers

-                if ('/' == substr($prefix, 0, 1)) {

-                    $prefixes[] = $host . $prefix;

-                }

-            }

-        }

-        if (empty($prefixes)) {

-            $prefixes = array($host . '/');

-        }

-

-        $ret = true;

-        foreach ($prefixes as $prefix) {

-            if (!empty(self::$challenges[$prefix]) &&

-                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))

-            ) {

-                // probably credentials are invalid

-                $ret = false;

-            }

-            self::$challenges[$prefix] =& $challenge;

-        }

-        return $ret;

-    }

-

-   /**

-    * Checks whether another request should be performed with proxy digest auth

-    *

-    * Several conditions should be satisfied for it to return true:

-    *   - response status should be 407

-    *   - proxy auth credentials should be set in the request object

-    *   - response should contain Proxy-Authenticate header with digest challenge

-    *   - there is either no challenge stored for this proxy or new challenge

-    *     contains stale=true parameter (in other case we probably just failed 

-    *     due to invalid username / password)

-    *

-    * The method stores challenge values in $challenges static property

-    *

-    * @param    HTTP_Request2_Response  response to check

-    * @return   boolean whether another request should be performed

-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

-    */

-    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)

-    {

-        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {

-            return false;

-        }

-        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {

-            return false;

-        }

-

-        $key = 'proxy://' . $this->request->getConfig('proxy_host') .

-               ':' . $this->request->getConfig('proxy_port');

-

-        if (!empty(self::$challenges[$key]) &&

-            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))

-        ) {

-            $ret = false;

-        } else {

-            $ret = true;

-        }

-        self::$challenges[$key] = $challenge;

-        return $ret;

-    }

-

-   /**

-    * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value

-    *

-    * There is a problem with implementation of RFC 2617: several of the parameters

-    * here are defined as quoted-string and thus may contain backslash escaped

-    * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as

-    * just value of quoted-string X without surrounding quotes, it doesn't speak

-    * about removing backslash escaping.

-    *

-    * Now realm parameter is user-defined and human-readable, strange things

-    * happen when it contains quotes:

-    *   - Apache allows quotes in realm, but apparently uses realm value without

-    *     backslashes for digest computation

-    *   - Squid allows (manually escaped) quotes there, but it is impossible to

-    *     authorize with either escaped or unescaped quotes used in digest,

-    *     probably it can't parse the response (?)

-    *   - Both IE and Firefox display realm value with backslashes in 

-    *     the password popup and apparently use the same value for digest

-    *

-    * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in

-    * quoted-string handling, unfortunately that means failure to authorize 

-    * sometimes

-    *

-    * @param    string  value of WWW-Authenticate or Proxy-Authenticate header

-    * @return   mixed   associative array with challenge parameters, false if

-    *                   no challenge is present in header value

-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

-    */

-    protected function parseDigestChallenge($headerValue)

-    {

-        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .

-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';

-        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";

-        if (!preg_match($challenge, $headerValue, $matches)) {

-            return false;

-        }

-

-        preg_match_all('!' . $authParam . '!', $matches[0], $params);

-        $paramsAry   = array();

-        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',

-                             'algorithm', 'qop');

-        for ($i = 0; $i < count($params[0]); $i++) {

-            // section 3.2.1: Any unrecognized directive MUST be ignored.

-            if (in_array($params[1][$i], $knownParams)) {

-                if ('"' == substr($params[2][$i], 0, 1)) {

-                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);

-                } else {

-                    $paramsAry[$params[1][$i]] = $params[2][$i];

-                }

-            }

-        }

-        // we only support qop=auth

-        if (!empty($paramsAry['qop']) && 

-            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))

-        ) {

-            throw new HTTP_Request2_Exception(

-                "Only 'auth' qop is currently supported in digest authentication, " .

-                "server requested '{$paramsAry['qop']}'"

-            );

-        }

-        // we only support algorithm=MD5

-        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {

-            throw new HTTP_Request2_Exception(

-                "Only 'MD5' algorithm is currently supported in digest authentication, " .

-                "server requested '{$paramsAry['algorithm']}'"

-            );

-        }

-

-        return $paramsAry; 

-    }

-

-   /**

-    * Parses [Proxy-]Authentication-Info header value and updates challenge

-    *

-    * @param    array   challenge to update

-    * @param    string  value of [Proxy-]Authentication-Info header

-    * @todo     validate server rspauth response

-    */ 

-    protected function updateChallenge(&$challenge, $headerValue)

-    {

-        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .

-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';

-        $paramsAry   = array();

-

-        preg_match_all($authParam, $headerValue, $params);

-        for ($i = 0; $i < count($params[0]); $i++) {

-            if ('"' == substr($params[2][$i], 0, 1)) {

-                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);

-            } else {

-                $paramsAry[$params[1][$i]] = $params[2][$i];

-            }

-        }

-        // for now, just update the nonce value

-        if (!empty($paramsAry['nextnonce'])) {

-            $challenge['nonce'] = $paramsAry['nextnonce'];

-            $challenge['nc']    = 1;

-        }

-    }

-

-   /**

-    * Creates a value for [Proxy-]Authorization header when using digest authentication

-    *

-    * @param    string  user name

-    * @param    string  password

-    * @param    string  request URL

-    * @param    array   digest challenge parameters

-    * @return   string  value of [Proxy-]Authorization request header

-    * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2

-    */ 

-    protected function createDigestResponse($user, $password, $url, &$challenge)

-    {

-        if (false !== ($q = strpos($url, '?')) && 

-            $this->request->getConfig('digest_compat_ie')

-        ) {

-            $url = substr($url, 0, $q);

-        }

-

-        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);

-        $a2 = md5($this->request->getMethod() . ':' . $url);

-

-        if (empty($challenge['qop'])) {

-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);

-        } else {

-            $challenge['cnonce'] = 'Req2.' . rand();

-            if (empty($challenge['nc'])) {

-                $challenge['nc'] = 1;

-            }

-            $nc     = sprintf('%08x', $challenge['nc']++);

-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .

-                          $challenge['cnonce'] . ':auth:' . $a2);

-        }

-        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .

-               'realm="' . $challenge['realm'] . '", ' .

-               'nonce="' . $challenge['nonce'] . '", ' .

-               'uri="' . $url . '", ' .

-               'response="' . $digest . '"' .

-               (!empty($challenge['opaque'])? 

-                ', opaque="' . $challenge['opaque'] . '"':

-                '') .

-               (!empty($challenge['qop'])?

-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':

-                '');

-    }

-

-   /**

-    * Adds 'Authorization' header (if needed) to request headers array

-    *

-    * @param    array   request headers

-    * @param    string  request host (needed for digest authentication)

-    * @param    string  request URL (needed for digest authentication)

-    * @throws   HTTP_Request2_Exception

-    */

-    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)

-    {

-        if (!($auth = $this->request->getAuth())) {

-            return;

-        }

-        switch ($auth['scheme']) {

-            case HTTP_Request2::AUTH_BASIC:

-                $headers['authorization'] = 

-                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);

-                break;

-

-            case HTTP_Request2::AUTH_DIGEST:

-                unset($this->serverChallenge);

-                $fullUrl = ('/' == $requestUrl[0])?

-                           $this->request->getUrl()->getScheme() . '://' .

-                            $requestHost . $requestUrl:

-                           $requestUrl;

-                foreach (array_keys(self::$challenges) as $key) {

-                    if ($key == substr($fullUrl, 0, strlen($key))) {

-                        $headers['authorization'] = $this->createDigestResponse(

-                            $auth['user'], $auth['password'], 

-                            $requestUrl, self::$challenges[$key]

-                        );

-                        $this->serverChallenge =& self::$challenges[$key];

-                        break;

-                    }

-                }

-                break;

-

-            default:

-                throw new HTTP_Request2_Exception(

-                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"

-                );

-        }

-    }

-

-   /**

-    * Adds 'Proxy-Authorization' header (if needed) to request headers array

-    *

-    * @param    array   request headers

-    * @param    string  request URL (needed for digest authentication)

-    * @throws   HTTP_Request2_Exception

-    */

-    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)

-    {

-        if (!$this->request->getConfig('proxy_host') ||

-            !($user = $this->request->getConfig('proxy_user')) ||

-            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&

-             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())

-        ) {

-            return;

-        }

-

-        $password = $this->request->getConfig('proxy_password');

-        switch ($this->request->getConfig('proxy_auth_scheme')) {

-            case HTTP_Request2::AUTH_BASIC:

-                $headers['proxy-authorization'] =

-                    'Basic ' . base64_encode($user . ':' . $password);

-                break;

-

-            case HTTP_Request2::AUTH_DIGEST:

-                unset($this->proxyChallenge);

-                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .

-                            ':' . $this->request->getConfig('proxy_port');

-                if (!empty(self::$challenges[$proxyUrl])) {

-                    $headers['proxy-authorization'] = $this->createDigestResponse(

-                        $user, $password,

-                        $requestUrl, self::$challenges[$proxyUrl]

-                    );

-                    $this->proxyChallenge =& self::$challenges[$proxyUrl];

-                }

-                break;

-

-            default:

-                throw new HTTP_Request2_Exception(

-                    "Unknown HTTP authentication scheme '" .

-                    $this->request->getConfig('proxy_auth_scheme') . "'"

-                );

-        }

-    }

-

-

-   /**

-    * Creates the string with the Request-Line and request headers

-    *

-    * @return   string

-    * @throws   HTTP_Request2_Exception

-    */

-    protected function prepareHeaders()

-    {

-        $headers = $this->request->getHeaders();

-        $url     = $this->request->getUrl();

-        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

-        $host    = $url->getHost();

-

-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;

-        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {

-            $host .= ':' . (empty($port)? $defaultPort: $port);

-        }

-        // Do not overwrite explicitly set 'Host' header, see bug #16146

-        if (!isset($headers['host'])) {

-            $headers['host'] = $host;

-        }

-

-        if ($connect) {

-            $requestUrl = $host;

-

-        } else {

-            if (!$this->request->getConfig('proxy_host') ||

-                0 == strcasecmp($url->getScheme(), 'https')

-            ) {

-                $requestUrl = '';

-            } else {

-                $requestUrl = $url->getScheme() . '://' . $host;

-            }

-            $path        = $url->getPath();

-            $query       = $url->getQuery();

-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);

-        }

-

-        if ('1.1' == $this->request->getConfig('protocol_version') &&

-            extension_loaded('zlib') && !isset($headers['accept-encoding'])

-        ) {

-            $headers['accept-encoding'] = 'gzip, deflate';

-        }

-

-        $this->addAuthorizationHeader($headers, $host, $requestUrl);

-        $this->addProxyAuthorizationHeader($headers, $requestUrl);

-        $this->calculateRequestLength($headers);

-

-        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .

-                      $this->request->getConfig('protocol_version') . "\r\n";

-        foreach ($headers as $name => $value) {

-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

-            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";

-        }

-        return $headersStr . "\r\n";

-    }

-

-   /**

-    * Sends the request body

-    *

-    * @throws   HTTP_Request2_Exception

-    */

-    protected function writeBody()

-    {

-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||

-            0 == $this->contentLength

-        ) {

-            return;

-        }

-

-        $position   = 0;

-        $bufferSize = $this->request->getConfig('buffer_size');

-        while ($position < $this->contentLength) {

-            if (is_string($this->requestBody)) {

-                $str = substr($this->requestBody, $position, $bufferSize);

-            } elseif (is_resource($this->requestBody)) {

-                $str = fread($this->requestBody, $bufferSize);

-            } else {

-                $str = $this->requestBody->read($bufferSize);

-            }

-            if (false === @fwrite($this->socket, $str, strlen($str))) {

-                throw new HTTP_Request2_Exception('Error writing request');

-            }

-            // Provide the length of written string to the observer, request #7630

-            $this->request->setLastEvent('sentBodyPart', strlen($str));

-            $position += strlen($str); 

-        }

-    }

-

-   /**

-    * Reads the remote server's response

-    *

-    * @return   HTTP_Request2_Response

-    * @throws   HTTP_Request2_Exception

-    */

-    protected function readResponse()

-    {

-        $bufferSize = $this->request->getConfig('buffer_size');

-

-        do {

-            $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);

-            do {

-                $headerLine = $this->readLine($bufferSize);

-                $response->parseHeaderLine($headerLine);

-            } while ('' != $headerLine);

-        } while (in_array($response->getStatus(), array(100, 101)));

-

-        $this->request->setLastEvent('receivedHeaders', $response);

-

-        // No body possible in such responses

-        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||

-            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&

-             200 <= $response->getStatus() && 300 > $response->getStatus()) ||

-            in_array($response->getStatus(), array(204, 304))

-        ) {

-            return $response;

-        }

-

-        $chunked = 'chunked' == $response->getHeader('transfer-encoding');

-        $length  = $response->getHeader('content-length');

-        $hasBody = false;

-        if ($chunked || null === $length || 0 < intval($length)) {

-            // RFC 2616, section 4.4:

-            // 3. ... If a message is received with both a

-            // Transfer-Encoding header field and a Content-Length header field,

-            // the latter MUST be ignored.

-            $toRead = ($chunked || null === $length)? null: $length;

-            $this->chunkLength = 0;

-

-            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {

-                if ($chunked) {

-                    $data = $this->readChunked($bufferSize);

-                } elseif (is_null($toRead)) {

-                    $data = $this->fread($bufferSize);

-                } else {

-                    $data    = $this->fread(min($toRead, $bufferSize));

-                    $toRead -= strlen($data);

-                }

-                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {

-                    break;

-                }

-

-                $hasBody = true;

-                if ($this->request->getConfig('store_body')) {

-                    $response->appendBody($data);

-                }

-                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {

-                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);

-                } else {

-                    $this->request->setLastEvent('receivedBodyPart', $data);

-                }

-            }

-        }

-

-        if ($hasBody) {

-            $this->request->setLastEvent('receivedBody', $response);

-        }

-        return $response;

-    }

-

-   /**

-    * Reads until either the end of the socket or a newline, whichever comes first 

-    *

-    * Strips the trailing newline from the returned data, handles global 

-    * request timeout. Method idea borrowed from Net_Socket PEAR package. 

-    *

-    * @param    int     buffer size to use for reading

-    * @return   Available data up to the newline (not including newline)

-    * @throws   HTTP_Request2_Exception     In case of timeout

-    */

-    protected function readLine($bufferSize)

-    {

-        $line = '';

-        while (!feof($this->socket)) {

-            if ($this->timeout) {

-                stream_set_timeout($this->socket, max($this->timeout - time(), 1));

-            }

-            $line .= @fgets($this->socket, $bufferSize);

-            $info  = stream_get_meta_data($this->socket);

-            if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {

-                throw new HTTP_Request2_Exception(

-                    'Request timed out after ' . 

-                    $this->request->getConfig('timeout') . ' second(s)'

-                );

-            }

-            if (substr($line, -1) == "\n") {

-                return rtrim($line, "\r\n");

-            }

-        }

-        return $line;

-    }

-

-   /**

-    * Wrapper around fread(), handles global request timeout

-    *

-    * @param    int     Reads up to this number of bytes

-    * @return   Data read from socket

-    * @throws   HTTP_Request2_Exception     In case of timeout

-    */

-    protected function fread($length)

-    {

-        if ($this->timeout) {

-            stream_set_timeout($this->socket, max($this->timeout - time(), 1));

-        }

-        $data = fread($this->socket, $length);

-        $info = stream_get_meta_data($this->socket);

-        if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {

-            throw new HTTP_Request2_Exception(

-                'Request timed out after ' . 

-                $this->request->getConfig('timeout') . ' second(s)'

-            );

-        }

-        return $data;

-    }

-

-   /**

-    * Reads a part of response body encoded with chunked Transfer-Encoding

-    *

-    * @param    int     buffer size to use for reading

-    * @return   string

-    * @throws   HTTP_Request2_Exception

-    */

-    protected function readChunked($bufferSize)

-    {

-        // at start of the next chunk?

-        if (0 == $this->chunkLength) {

-            $line = $this->readLine($bufferSize);

-            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {

-                throw new HTTP_Request2_Exception(

-                    "Cannot decode chunked response, invalid chunk length '{$line}'"

-                );

-            } else {

-                $this->chunkLength = hexdec($matches[1]);

-                // Chunk with zero length indicates the end

-                if (0 == $this->chunkLength) {

-                    $this->readLine($bufferSize);

-                    return '';

-                }

-            }

-        }

-        $data = $this->fread(min($this->chunkLength, $bufferSize));

-        $this->chunkLength -= strlen($data);

-        if (0 == $this->chunkLength) {

-            $this->readLine($bufferSize); // Trailing CRLF

-        }

-        return $data;

-    }

-}

-

+<?php
+/**
+ * Socket-based adapter for HTTP_Request2
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id: Socket.php 279760 2009-05-03 10:46:42Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Base class for HTTP_Request2 adapters
+ */
+require_once 'HTTP/Request2/Adapter.php';
+
+/**
+ * Socket-based adapter for HTTP_Request2
+ *
+ * This adapter uses only PHP sockets and will work on almost any PHP
+ * environment. Code is based on original HTTP_Request PEAR package.
+ *
+ * @category    HTTP
+ * @package     HTTP_Request2
+ * @author      Alexey Borzov <avb@php.net>
+ * @version     Release: 0.4.1
+ */
+class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
+{
+   /**
+    * Regular expression for 'token' rule from RFC 2616
+    */ 
+    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
+
+   /**
+    * Regular expression for 'quoted-string' rule from RFC 2616
+    */
+    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
+
+   /**
+    * Connected sockets, needed for Keep-Alive support
+    * @var  array
+    * @see  connect()
+    */
+    protected static $sockets = array();
+
+   /**
+    * Data for digest authentication scheme
+    *
+    * The keys for the array are URL prefixes. 
+    *
+    * The values are associative arrays with data (realm, nonce, nonce-count, 
+    * opaque...) needed for digest authentication. Stored here to prevent making 
+    * duplicate requests to digest-protected resources after we have already 
+    * received the challenge.
+    *
+    * @var  array
+    */
+    protected static $challenges = array();
+
+   /**
+    * Connected socket
+    * @var  resource
+    * @see  connect()
+    */
+    protected $socket;
+
+   /**
+    * Challenge used for server digest authentication
+    * @var  array
+    */
+    protected $serverChallenge;
+
+   /**
+    * Challenge used for proxy digest authentication
+    * @var  array
+    */
+    protected $proxyChallenge;
+
+   /**
+    * Global timeout, exception will be raised if request continues past this time
+    * @var  integer
+    */
+    protected $timeout = null;
+
+   /**
+    * Remaining length of the current chunk, when reading chunked response
+    * @var  integer
+    * @see  readChunked()
+    */ 
+    protected $chunkLength = 0;
+
+   /**
+    * Sends request to the remote server and returns its response
+    *
+    * @param    HTTP_Request2
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    public function sendRequest(HTTP_Request2 $request)
+    {
+        $this->request = $request;
+        $keepAlive     = $this->connect();
+        $headers       = $this->prepareHeaders();
+
+        // Use global request timeout if given, see feature requests #5735, #8964 
+        if ($timeout = $request->getConfig('timeout')) {
+            $this->timeout = time() + $timeout;
+        } else {
+            $this->timeout = null;
+        }
+
+        try {
+            if (false === @fwrite($this->socket, $headers, strlen($headers))) {
+                throw new HTTP_Request2_Exception('Error writing request');
+            }
+            // provide request headers to the observer, see request #7633
+            $this->request->setLastEvent('sentHeaders', $headers);
+            $this->writeBody();
+
+            if ($this->timeout && time() > $this->timeout) {
+                throw new HTTP_Request2_Exception(
+                    'Request timed out after ' . 
+                    $request->getConfig('timeout') . ' second(s)'
+                );
+            }
+
+            $response = $this->readResponse();
+
+            if (!$this->canKeepAlive($keepAlive, $response)) {
+                $this->disconnect();
+            }
+
+            if ($this->shouldUseProxyDigestAuth($response)) {
+                return $this->sendRequest($request);
+            }
+            if ($this->shouldUseServerDigestAuth($response)) {
+                return $this->sendRequest($request);
+            }
+            if ($authInfo = $response->getHeader('authentication-info')) {
+                $this->updateChallenge($this->serverChallenge, $authInfo);
+            }
+            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
+                $this->updateChallenge($this->proxyChallenge, $proxyInfo);
+            }
+
+        } catch (Exception $e) {
+            $this->disconnect();
+            throw $e;
+        }
+
+        return $response;
+    }
+
+   /**
+    * Connects to the remote server
+    *
+    * @return   bool    whether the connection can be persistent
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function connect()
+    {
+        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
+        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+        $headers = $this->request->getHeaders();
+        $reqHost = $this->request->getUrl()->getHost();
+        if (!($reqPort = $this->request->getUrl()->getPort())) {
+            $reqPort = $secure? 443: 80;
+        }
+
+        if ($host = $this->request->getConfig('proxy_host')) {
+            if (!($port = $this->request->getConfig('proxy_port'))) {
+                throw new HTTP_Request2_Exception('Proxy port not provided');
+            }
+            $proxy = true;
+        } else {
+            $host  = $reqHost;
+            $port  = $reqPort;
+            $proxy = false;
+        }
+
+        if ($tunnel && !$proxy) {
+            throw new HTTP_Request2_Exception(
+                "Trying to perform CONNECT request without proxy"
+            );
+        }
+        if ($secure && !in_array('ssl', stream_get_transports())) {
+            throw new HTTP_Request2_Exception(
+                'Need OpenSSL support for https:// requests'
+            );
+        }
+
+        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
+        // connection token to a proxy server...
+        if ($proxy && !$secure && 
+            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
+        ) {
+            $this->request->setHeader('connection');
+        }
+
+        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') && 
+                      empty($headers['connection'])) ||
+                     (!empty($headers['connection']) &&
+                      'Keep-Alive' == $headers['connection']);
+        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
+
+        $options = array();
+        if ($secure || $tunnel) {
+            foreach ($this->request->getConfig() as $name => $value) {
+                if ('ssl_' == substr($name, 0, 4) && null !== $value) {
+                    if ('ssl_verify_host' == $name) {
+                        if ($value) {
+                            $options['CN_match'] = $reqHost;
+                        }
+                    } else {
+                        $options[substr($name, 4)] = $value;
+                    }
+                }
+            }
+            ksort($options);
+        }
+
+        // Changing SSL context options after connection is established does *not*
+        // work, we need a new connection if options change
+        $remote    = $host . ':' . $port;
+        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
+                     (empty($options)? '': ':' . serialize($options));
+        unset($this->socket);
+
+        // We use persistent connections and have a connected socket?
+        // Ensure that the socket is still connected, see bug #16149
+        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
+            !feof(self::$sockets[$socketKey])
+        ) {
+            $this->socket =& self::$sockets[$socketKey];
+
+        } elseif ($secure && $proxy && !$tunnel) {
+            $this->establishTunnel();
+            $this->request->setLastEvent(
+                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
+            );
+            self::$sockets[$socketKey] =& $this->socket;
+
+        } else {
+            // Set SSL context options if doing HTTPS request or creating a tunnel
+            $context = stream_context_create();
+            foreach ($options as $name => $value) {
+                if (!stream_context_set_option($context, 'ssl', $name, $value)) {
+                    throw new HTTP_Request2_Exception(
+                        "Error setting SSL context option '{$name}'"
+                    );
+                }
+            }
+            $this->socket = @stream_socket_client(
+                $remote, $errno, $errstr,
+                $this->request->getConfig('connect_timeout'),
+                STREAM_CLIENT_CONNECT, $context
+            );
+            if (!$this->socket) {
+                throw new HTTP_Request2_Exception(
+                    "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
+                );
+            }
+            $this->request->setLastEvent('connect', $remote);
+            self::$sockets[$socketKey] =& $this->socket;
+        }
+        return $keepAlive;
+    }
+
+   /**
+    * Establishes a tunnel to a secure remote server via HTTP CONNECT request
+    *
+    * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP
+    * sees that we are connected to a proxy server (duh!) rather than the server
+    * that presents its certificate.
+    *
+    * @link     http://tools.ietf.org/html/rfc2817#section-5.2
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function establishTunnel()
+    {
+        $donor   = new self;
+        $connect = new HTTP_Request2(
+            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
+            array_merge($this->request->getConfig(),
+                        array('adapter' => $donor))
+        );
+        $response = $connect->send();
+        // Need any successful (2XX) response
+        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
+            throw new HTTP_Request2_Exception(
+                'Failed to connect via HTTPS proxy. Proxy response: ' .
+                $response->getStatus() . ' ' . $response->getReasonPhrase()
+            );
+        }
+        $this->socket = $donor->socket;
+
+        $modes = array(
+            STREAM_CRYPTO_METHOD_TLS_CLIENT, 
+            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
+            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
+            STREAM_CRYPTO_METHOD_SSLv2_CLIENT 
+        );
+
+        foreach ($modes as $mode) {
+            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
+                return;
+            }
+        }
+        throw new HTTP_Request2_Exception(
+            'Failed to enable secure connection when connecting through proxy'
+        );
+    }
+
+   /**
+    * Checks whether current connection may be reused or should be closed
+    *
+    * @param    boolean                 whether connection could be persistent 
+    *                                   in the first place
+    * @param    HTTP_Request2_Response  response object to check
+    * @return   boolean
+    */
+    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
+    {
+        // Do not close socket on successful CONNECT request
+        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
+            200 <= $response->getStatus() && 300 > $response->getStatus()
+        ) {
+            return true;
+        }
+
+        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
+                       null !== $response->getHeader('content-length');
+        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
+                       (null === $response->getHeader('connection') &&
+                        '1.1' == $response->getVersion());
+        return $requestKeepAlive && $lengthKnown && $persistent;
+    }
+
+   /**
+    * Disconnects from the remote server
+    */
+    protected function disconnect()
+    {
+        if (is_resource($this->socket)) {
+            fclose($this->socket);
+            $this->socket = null;
+            $this->request->setLastEvent('disconnect');
+        }
+    }
+
+   /**
+    * Checks whether another request should be performed with server digest auth
+    *
+    * Several conditions should be satisfied for it to return true:
+    *   - response status should be 401
+    *   - auth credentials should be set in the request object
+    *   - response should contain WWW-Authenticate header with digest challenge
+    *   - there is either no challenge stored for this URL or new challenge
+    *     contains stale=true parameter (in other case we probably just failed 
+    *     due to invalid username / password)
+    *
+    * The method stores challenge values in $challenges static property
+    *
+    * @param    HTTP_Request2_Response  response to check
+    * @return   boolean whether another request should be performed
+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
+    */
+    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
+    {
+        // no sense repeating a request if we don't have credentials
+        if (401 != $response->getStatus() || !$this->request->getAuth()) {
+            return false;
+        }
+        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
+            return false;
+        }
+
+        $url    = $this->request->getUrl();
+        $scheme = $url->getScheme();
+        $host   = $scheme . '://' . $url->getHost();
+        if ($port = $url->getPort()) {
+            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
+                (0 == strcasecmp($scheme, 'https') && 443 != $port)
+            ) {
+                $host .= ':' . $port;
+            }
+        }
+
+        if (!empty($challenge['domain'])) {
+            $prefixes = array();
+            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
+                // don't bother with different servers
+                if ('/' == substr($prefix, 0, 1)) {
+                    $prefixes[] = $host . $prefix;
+                }
+            }
+        }
+        if (empty($prefixes)) {
+            $prefixes = array($host . '/');
+        }
+
+        $ret = true;
+        foreach ($prefixes as $prefix) {
+            if (!empty(self::$challenges[$prefix]) &&
+                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+            ) {
+                // probably credentials are invalid
+                $ret = false;
+            }
+            self::$challenges[$prefix] =& $challenge;
+        }
+        return $ret;
+    }
+
+   /**
+    * Checks whether another request should be performed with proxy digest auth
+    *
+    * Several conditions should be satisfied for it to return true:
+    *   - response status should be 407
+    *   - proxy auth credentials should be set in the request object
+    *   - response should contain Proxy-Authenticate header with digest challenge
+    *   - there is either no challenge stored for this proxy or new challenge
+    *     contains stale=true parameter (in other case we probably just failed 
+    *     due to invalid username / password)
+    *
+    * The method stores challenge values in $challenges static property
+    *
+    * @param    HTTP_Request2_Response  response to check
+    * @return   boolean whether another request should be performed
+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
+    */
+    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
+    {
+        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
+            return false;
+        }
+        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
+            return false;
+        }
+
+        $key = 'proxy://' . $this->request->getConfig('proxy_host') .
+               ':' . $this->request->getConfig('proxy_port');
+
+        if (!empty(self::$challenges[$key]) &&
+            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+        ) {
+            $ret = false;
+        } else {
+            $ret = true;
+        }
+        self::$challenges[$key] = $challenge;
+        return $ret;
+    }
+
+   /**
+    * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
+    *
+    * There is a problem with implementation of RFC 2617: several of the parameters
+    * here are defined as quoted-string and thus may contain backslash escaped
+    * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as
+    * just value of quoted-string X without surrounding quotes, it doesn't speak
+    * about removing backslash escaping.
+    *
+    * Now realm parameter is user-defined and human-readable, strange things
+    * happen when it contains quotes:
+    *   - Apache allows quotes in realm, but apparently uses realm value without
+    *     backslashes for digest computation
+    *   - Squid allows (manually escaped) quotes there, but it is impossible to
+    *     authorize with either escaped or unescaped quotes used in digest,
+    *     probably it cannot parse the response (?)
+    *   - Both IE and Firefox display realm value with backslashes in 
+    *     the password popup and apparently use the same value for digest
+    *
+    * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in
+    * quoted-string handling, unfortunately that means failure to authorize 
+    * sometimes
+    *
+    * @param    string  value of WWW-Authenticate or Proxy-Authenticate header
+    * @return   mixed   associative array with challenge parameters, false if
+    *                   no challenge is present in header value
+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
+    */
+    protected function parseDigestChallenge($headerValue)
+    {
+        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
+        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
+        if (!preg_match($challenge, $headerValue, $matches)) {
+            return false;
+        }
+
+        preg_match_all('!' . $authParam . '!', $matches[0], $params);
+        $paramsAry   = array();
+        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
+                             'algorithm', 'qop');
+        for ($i = 0; $i < count($params[0]); $i++) {
+            // section 3.2.1: Any unrecognized directive MUST be ignored.
+            if (in_array($params[1][$i], $knownParams)) {
+                if ('"' == substr($params[2][$i], 0, 1)) {
+                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+                } else {
+                    $paramsAry[$params[1][$i]] = $params[2][$i];
+                }
+            }
+        }
+        // we only support qop=auth
+        if (!empty($paramsAry['qop']) && 
+            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
+        ) {
+            throw new HTTP_Request2_Exception(
+                "Only 'auth' qop is currently supported in digest authentication, " .
+                "server requested '{$paramsAry['qop']}'"
+            );
+        }
+        // we only support algorithm=MD5
+        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
+            throw new HTTP_Request2_Exception(
+                "Only 'MD5' algorithm is currently supported in digest authentication, " .
+                "server requested '{$paramsAry['algorithm']}'"
+            );
+        }
+
+        return $paramsAry; 
+    }
+
+   /**
+    * Parses [Proxy-]Authentication-Info header value and updates challenge
+    *
+    * @param    array   challenge to update
+    * @param    string  value of [Proxy-]Authentication-Info header
+    * @todo     validate server rspauth response
+    */ 
+    protected function updateChallenge(&$challenge, $headerValue)
+    {
+        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
+        $paramsAry   = array();
+
+        preg_match_all($authParam, $headerValue, $params);
+        for ($i = 0; $i < count($params[0]); $i++) {
+            if ('"' == substr($params[2][$i], 0, 1)) {
+                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+            } else {
+                $paramsAry[$params[1][$i]] = $params[2][$i];
+            }
+        }
+        // for now, just update the nonce value
+        if (!empty($paramsAry['nextnonce'])) {
+            $challenge['nonce'] = $paramsAry['nextnonce'];
+            $challenge['nc']    = 1;
+        }
+    }
+
+   /**
+    * Creates a value for [Proxy-]Authorization header when using digest authentication
+    *
+    * @param    string  user name
+    * @param    string  password
+    * @param    string  request URL
+    * @param    array   digest challenge parameters
+    * @return   string  value of [Proxy-]Authorization request header
+    * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2
+    */ 
+    protected function createDigestResponse($user, $password, $url, &$challenge)
+    {
+        if (false !== ($q = strpos($url, '?')) && 
+            $this->request->getConfig('digest_compat_ie')
+        ) {
+            $url = substr($url, 0, $q);
+        }
+
+        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
+        $a2 = md5($this->request->getMethod() . ':' . $url);
+
+        if (empty($challenge['qop'])) {
+            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
+        } else {
+            $challenge['cnonce'] = 'Req2.' . rand();
+            if (empty($challenge['nc'])) {
+                $challenge['nc'] = 1;
+            }
+            $nc     = sprintf('%08x', $challenge['nc']++);
+            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
+                          $challenge['cnonce'] . ':auth:' . $a2);
+        }
+        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
+               'realm="' . $challenge['realm'] . '", ' .
+               'nonce="' . $challenge['nonce'] . '", ' .
+               'uri="' . $url . '", ' .
+               'response="' . $digest . '"' .
+               (!empty($challenge['opaque'])? 
+                ', opaque="' . $challenge['opaque'] . '"':
+                '') .
+               (!empty($challenge['qop'])?
+                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
+                '');
+    }
+
+   /**
+    * Adds 'Authorization' header (if needed) to request headers array
+    *
+    * @param    array   request headers
+    * @param    string  request host (needed for digest authentication)
+    * @param    string  request URL (needed for digest authentication)
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
+    {
+        if (!($auth = $this->request->getAuth())) {
+            return;
+        }
+        switch ($auth['scheme']) {
+            case HTTP_Request2::AUTH_BASIC:
+                $headers['authorization'] = 
+                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
+                break;
+
+            case HTTP_Request2::AUTH_DIGEST:
+                unset($this->serverChallenge);
+                $fullUrl = ('/' == $requestUrl[0])?
+                           $this->request->getUrl()->getScheme() . '://' .
+                            $requestHost . $requestUrl:
+                           $requestUrl;
+                foreach (array_keys(self::$challenges) as $key) {
+                    if ($key == substr($fullUrl, 0, strlen($key))) {
+                        $headers['authorization'] = $this->createDigestResponse(
+                            $auth['user'], $auth['password'], 
+                            $requestUrl, self::$challenges[$key]
+                        );
+                        $this->serverChallenge =& self::$challenges[$key];
+                        break;
+                    }
+                }
+                break;
+
+            default:
+                throw new HTTP_Request2_Exception(
+                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"
+                );
+        }
+    }
+
+   /**
+    * Adds 'Proxy-Authorization' header (if needed) to request headers array
+    *
+    * @param    array   request headers
+    * @param    string  request URL (needed for digest authentication)
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
+    {
+        if (!$this->request->getConfig('proxy_host') ||
+            !($user = $this->request->getConfig('proxy_user')) ||
+            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
+             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
+        ) {
+            return;
+        }
+
+        $password = $this->request->getConfig('proxy_password');
+        switch ($this->request->getConfig('proxy_auth_scheme')) {
+            case HTTP_Request2::AUTH_BASIC:
+                $headers['proxy-authorization'] =
+                    'Basic ' . base64_encode($user . ':' . $password);
+                break;
+
+            case HTTP_Request2::AUTH_DIGEST:
+                unset($this->proxyChallenge);
+                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
+                            ':' . $this->request->getConfig('proxy_port');
+                if (!empty(self::$challenges[$proxyUrl])) {
+                    $headers['proxy-authorization'] = $this->createDigestResponse(
+                        $user, $password,
+                        $requestUrl, self::$challenges[$proxyUrl]
+                    );
+                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
+                }
+                break;
+
+            default:
+                throw new HTTP_Request2_Exception(
+                    "Unknown HTTP authentication scheme '" .
+                    $this->request->getConfig('proxy_auth_scheme') . "'"
+                );
+        }
+    }
+
+
+   /**
+    * Creates the string with the Request-Line and request headers
+    *
+    * @return   string
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function prepareHeaders()
+    {
+        $headers = $this->request->getHeaders();
+        $url     = $this->request->getUrl();
+        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+        $host    = $url->getHost();
+
+        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
+        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
+            $host .= ':' . (empty($port)? $defaultPort: $port);
+        }
+        // Do not overwrite explicitly set 'Host' header, see bug #16146
+        if (!isset($headers['host'])) {
+            $headers['host'] = $host;
+        }
+
+        if ($connect) {
+            $requestUrl = $host;
+
+        } else {
+            if (!$this->request->getConfig('proxy_host') ||
+                0 == strcasecmp($url->getScheme(), 'https')
+            ) {
+                $requestUrl = '';
+            } else {
+                $requestUrl = $url->getScheme() . '://' . $host;
+            }
+            $path        = $url->getPath();
+            $query       = $url->getQuery();
+            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
+        }
+
+        if ('1.1' == $this->request->getConfig('protocol_version') &&
+            extension_loaded('zlib') && !isset($headers['accept-encoding'])
+        ) {
+            $headers['accept-encoding'] = 'gzip, deflate';
+        }
+
+        $this->addAuthorizationHeader($headers, $host, $requestUrl);
+        $this->addProxyAuthorizationHeader($headers, $requestUrl);
+        $this->calculateRequestLength($headers);
+
+        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
+                      $this->request->getConfig('protocol_version') . "\r\n";
+        foreach ($headers as $name => $value) {
+            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";
+        }
+        return $headersStr . "\r\n";
+    }
+
+   /**
+    * Sends the request body
+    *
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function writeBody()
+    {
+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+            0 == $this->contentLength
+        ) {
+            return;
+        }
+
+        $position   = 0;
+        $bufferSize = $this->request->getConfig('buffer_size');
+        while ($position < $this->contentLength) {
+            if (is_string($this->requestBody)) {
+                $str = substr($this->requestBody, $position, $bufferSize);
+            } elseif (is_resource($this->requestBody)) {
+                $str = fread($this->requestBody, $bufferSize);
+            } else {
+                $str = $this->requestBody->read($bufferSize);
+            }
+            if (false === @fwrite($this->socket, $str, strlen($str))) {
+                throw new HTTP_Request2_Exception('Error writing request');
+            }
+            // Provide the length of written string to the observer, request #7630
+            $this->request->setLastEvent('sentBodyPart', strlen($str));
+            $position += strlen($str); 
+        }
+    }
+
+   /**
+    * Reads the remote server's response
+    *
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function readResponse()
+    {
+        $bufferSize = $this->request->getConfig('buffer_size');
+
+        do {
+            $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
+            do {
+                $headerLine = $this->readLine($bufferSize);
+                $response->parseHeaderLine($headerLine);
+            } while ('' != $headerLine);
+        } while (in_array($response->getStatus(), array(100, 101)));
+
+        $this->request->setLastEvent('receivedHeaders', $response);
+
+        // No body possible in such responses
+        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
+            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
+             200 <= $response->getStatus() && 300 > $response->getStatus()) ||
+            in_array($response->getStatus(), array(204, 304))
+        ) {
+            return $response;
+        }
+
+        $chunked = 'chunked' == $response->getHeader('transfer-encoding');
+        $length  = $response->getHeader('content-length');
+        $hasBody = false;
+        if ($chunked || null === $length || 0 < intval($length)) {
+            // RFC 2616, section 4.4:
+            // 3. ... If a message is received with both a
+            // Transfer-Encoding header field and a Content-Length header field,
+            // the latter MUST be ignored.
+            $toRead = ($chunked || null === $length)? null: $length;
+            $this->chunkLength = 0;
+
+            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
+                if ($chunked) {
+                    $data = $this->readChunked($bufferSize);
+                } elseif (is_null($toRead)) {
+                    $data = $this->fread($bufferSize);
+                } else {
+                    $data    = $this->fread(min($toRead, $bufferSize));
+                    $toRead -= strlen($data);
+                }
+                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
+                    break;
+                }
+
+                $hasBody = true;
+                if ($this->request->getConfig('store_body')) {
+                    $response->appendBody($data);
+                }
+                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
+                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);
+                } else {
+                    $this->request->setLastEvent('receivedBodyPart', $data);
+                }
+            }
+        }
+
+        if ($hasBody) {
+            $this->request->setLastEvent('receivedBody', $response);
+        }
+        return $response;
+    }
+
+   /**
+    * Reads until either the end of the socket or a newline, whichever comes first 
+    *
+    * Strips the trailing newline from the returned data, handles global 
+    * request timeout. Method idea borrowed from Net_Socket PEAR package. 
+    *
+    * @param    int     buffer size to use for reading
+    * @return   Available data up to the newline (not including newline)
+    * @throws   HTTP_Request2_Exception     In case of timeout
+    */
+    protected function readLine($bufferSize)
+    {
+        $line = '';
+        while (!feof($this->socket)) {
+            if ($this->timeout) {
+                stream_set_timeout($this->socket, max($this->timeout - time(), 1));
+            }
+            $line .= @fgets($this->socket, $bufferSize);
+            $info  = stream_get_meta_data($this->socket);
+            if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {
+                throw new HTTP_Request2_Exception(
+                    'Request timed out after ' . 
+                    $this->request->getConfig('timeout') . ' second(s)'
+                );
+            }
+            if (substr($line, -1) == "\n") {
+                return rtrim($line, "\r\n");
+            }
+        }
+        return $line;
+    }
+
+   /**
+    * Wrapper around fread(), handles global request timeout
+    *
+    * @param    int     Reads up to this number of bytes
+    * @return   Data read from socket
+    * @throws   HTTP_Request2_Exception     In case of timeout
+    */
+    protected function fread($length)
+    {
+        if ($this->timeout) {
+            stream_set_timeout($this->socket, max($this->timeout - time(), 1));
+        }
+        $data = fread($this->socket, $length);
+        $info = stream_get_meta_data($this->socket);
+        if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {
+            throw new HTTP_Request2_Exception(
+                'Request timed out after ' . 
+                $this->request->getConfig('timeout') . ' second(s)'
+            );
+        }
+        return $data;
+    }
+
+   /**
+    * Reads a part of response body encoded with chunked Transfer-Encoding
+    *
+    * @param    int     buffer size to use for reading
+    * @return   string
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function readChunked($bufferSize)
+    {
+        // at start of the next chunk?
+        if (0 == $this->chunkLength) {
+            $line = $this->readLine($bufferSize);
+            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
+                throw new HTTP_Request2_Exception(
+                    "Cannot decode chunked response, invalid chunk length '{$line}'"
+                );
+            } else {
+                $this->chunkLength = hexdec($matches[1]);
+                // Chunk with zero length indicates the end
+                if (0 == $this->chunkLength) {
+                    $this->readLine($bufferSize);
+                    return '';
+                }
+            }
+        }
+        $data = $this->fread(min($this->chunkLength, $bufferSize));
+        $this->chunkLength -= strlen($data);
+        if (0 == $this->chunkLength) {
+            $this->readLine($bufferSize); // Trailing CRLF
+        }
+        return $data;
+    }
+}
+
 ?>
\ No newline at end of file
diff --git a/extlib/MIME/Type.php b/extlib/MIME/Type.php
index c335f8d92..8653362d3 100644
--- a/extlib/MIME/Type.php
+++ b/extlib/MIME/Type.php
@@ -478,7 +478,7 @@ class MIME_Type
 
         // Don't return an empty string
         if (!$type || !strlen($type)) {
-            return PEAR::raiseError("Sorry, couldn't determine file type.");
+            return PEAR::raiseError("Sorry. Could not determine file type.");
         }
 
         // Strip parameters if present & requested
@@ -510,7 +510,7 @@ class MIME_Type
         $fileCmd = PEAR::getStaticProperty('MIME_Type', 'fileCmd');
         if (!$cmd->which($fileCmd)) {
             unset($cmd);
-            return PEAR::raiseError("Can't find file command \"{$fileCmd}\"");
+            return PEAR::raiseError("Cannot find file command \"{$fileCmd}\"");
         }
 
         $cmd->pushCommand($fileCmd, "-bi " . escapeshellarg($file));
diff --git a/extlib/MIME/Type/Extension.php b/extlib/MIME/Type/Extension.php
index 1987e2a10..2ffdee9a9 100644
--- a/extlib/MIME/Type/Extension.php
+++ b/extlib/MIME/Type/Extension.php
@@ -265,7 +265,7 @@ class MIME_Type_Extension
         }
 
         if (!isset($this->extensionToType[$extension])) {
-            return PEAR::raiseError("Sorry, couldn't determine file type.");
+            return PEAR::raiseError("Sorry. Could not determine file type.");
         }
 
         return $this->extensionToType[$extension];
@@ -288,7 +288,7 @@ class MIME_Type_Extension
 
         $extension = array_search($type, $this->extensionToType);
         if ($extension === false) {
-            return PEAR::raiseError("Sorry, couldn't determine extension.");
+            return PEAR::raiseError("Sorry. Could not determine extension.");
         }
         return $extension;
     }
diff --git a/extlib/Mail/mail.php b/extlib/Mail/mail.php
index b13d69565..112ff940c 100644
--- a/extlib/Mail/mail.php
+++ b/extlib/Mail/mail.php
@@ -51,7 +51,7 @@ class Mail_mail extends Mail {
         }
 
         /* Because the mail() function may pass headers as command
-         * line arguments, we can't guarantee the use of the standard
+         * line arguments, we cannot guarantee the use of the standard
          * "\r\n" separator.  Instead, we use the system's native line
          * separator. */
         if (defined('PHP_EOL')) {
diff --git a/extlib/Mail/sendmail.php b/extlib/Mail/sendmail.php
index cd248e61d..aea52081a 100644
--- a/extlib/Mail/sendmail.php
+++ b/extlib/Mail/sendmail.php
@@ -67,7 +67,7 @@ class Mail_sendmail extends Mail {
 
         /*
          * Because we need to pass message headers to the sendmail program on
-         * the commandline, we can't guarantee the use of the standard "\r\n"
+         * the commandline, we cannot guarantee the use of the standard "\r\n"
          * separator.  Instead, we use the system's native line separator.
          */
         if (defined('PHP_EOL')) {
diff --git a/extlib/Net/LDAP2/Entry.php b/extlib/Net/LDAP2/Entry.php
index 66de96678..5531bfa13 100644
--- a/extlib/Net/LDAP2/Entry.php
+++ b/extlib/Net/LDAP2/Entry.php
@@ -665,7 +665,7 @@ class Net_LDAP2_Entry extends PEAR
     * To force replace mode instead of add, you can set $force to true.
     *
     * @param array $attr  Attributes to replace
-    * @param bool  $force Force replacing mode in case we can't read the attr value but are allowed to replace it
+    * @param bool  $force Force replacing mode in case we cannot read the attr value but are allowed to replace it
     *
     * @access public
     * @return true|Net_LDAP2_Error
diff --git a/extlib/Net/LDAP2/Filter.php b/extlib/Net/LDAP2/Filter.php
index 0723edab2..bd13d1ee4 100644
--- a/extlib/Net/LDAP2/Filter.php
+++ b/extlib/Net/LDAP2/Filter.php
@@ -439,7 +439,7 @@ class Net_LDAP2_Filter extends PEAR
     *
     * This method is only for compatibility to the perl interface.
     * However, the original method was called "print" but due to PHP language restrictions,
-    * we can't have a print() method.
+    * we cannot have a print() method.
     *
     * @param resource $FH (optional) A filehandle resource
     *
diff --git a/extlib/System/Command.php b/extlib/System/Command.php
index f5c3ec6b9..d2001a975 100644
--- a/extlib/System/Command.php
+++ b/extlib/System/Command.php
@@ -376,7 +376,7 @@ class System_Command {
             return $this->_initError;
         }
 
-        // if the command is empty or if the last element was a control operator, we can't continue
+        // if the command is empty or if the last element was a control operator, we cannot continue
         if (is_null($this->previousElement) || $this->commandStatus == -1 || in_array($this->previousElement, $this->controlOperators)) {
             return PEAR::raiseError(null, SYSTEM_COMMAND_INVALID_COMMAND, null, E_USER_WARNING, $this->systemCommand, 'System_Command_Error', true);
         }
diff --git a/extlib/markdown.php b/extlib/markdown.php
index 8179b568b..1bb1b6ce4 100644
--- a/extlib/markdown.php
+++ b/extlib/markdown.php
@@ -1348,7 +1348,7 @@ class Markdown_Parser {
 //				{
 //					list(, $div_open, , $div_content, $div_close) = $matches;
 //
-//					# We can't call Markdown(), because that resets the hash;
+//					# We cannot call Markdown(), because that resets the hash;
 //					# that initialization code should be pulled into its own sub, though.
 //					$div_content = $this->hashHTMLBlocks($div_content);
 //