cvs: pear /HTTP_Request Request.php

avb Fri May 18 18:27:32 2007 UTC

Modified files:
/pear/HTTP_Request Request.php
Log:
Fixed bug #10605 (wrong Content-Length if using mbstring.func_overload)
Use mbstring functions where applicable in case of mbstring.func_overload, this allows using gzip


http://cvs.php.net/viewvc.cgi/pear/H...&diff_format=u
Index: pear/HTTP_Request/Request.php
diff -u pear/HTTP_Request/Request.php:1.53 pear/HTTP_Request/Request.php:1.54
--- pear/HTTP_Request/Request.php:1.53 Fri May 18 10:28:06 2007
+++ pear/HTTP_Request/Request.php Fri May 18 18:27:32 2007
@@ -40,7 +40,7 @@
* @author Alexey Borzov <avb@php.net>
* @copyright 2002-2007 Richard Heyes
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id: Request.php,v 1.53 2007/05/18 10:28:06 avb Exp $
+ * @version CVS: $Id: Request.php,v 1.54 2007/05/18 18:27:32 avb Exp $
* @link http://pear.php.net/package/HTTP_Request/
*/

@@ -76,6 +76,18 @@
define('HTTP_REQUEST_HTTP_VER_1_1', '1.1', true);
/**#@-*/

+if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
+ /**
+ * Whether string functions are overloaded by their mbstring equivalents
+ */
+ define('HTTP_REQUEST_MBSTRING', true);
+} else {
+ /**
+ * @ignore
+ */
+ define('HTTP_REQUEST_MBSTRING', false);
+}
+
/**
* Class for performing HTTP requests
*
@@ -317,10 +329,7 @@
}

// Use gzip encoding if possible
- // Avoid gzip encoding if using multibyte functions (see #1781)
- if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && extension_loaded('zlib') &&
- 0 == (2 & ini_get('mbstring.func_overload'))) {
-
+ if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && extension_loaded('zlib')) {
$this->addHeader('Accept-Encoding', 'gzip');
}
}
@@ -942,13 +951,17 @@
}
$postdata .= '--' . $boundary . "--\r\n";
}
- $request .= 'Content-Length: ' . strlen($postdata) . "\r\n\r\n";
+ $request .= 'Content-Length: ' .
+ (HTTP_REQUEST_MBSTRING? mb_strlen($postdata, 'iso-8859-1'): strlen($postdata)) .
+ "\r\n\r\n";
$request .= $postdata;

// Explicitly set request body
} elseif (!empty($this->_body)) {

- $request .= 'Content-Length: ' . strlen($this->_body) . "\r\n\r\n";
+ $request .= 'Content-Length: ' .
+ (HTTP_REQUEST_MBSTRING? mb_strlen($this->_body, 'iso-8859-1'): strlen($this->_body)) .
+ "\r\n\r\n";
$request .= $this->_body;
}

@@ -1185,7 +1198,7 @@
$data = $this->_sock->read(4096);
} else {
$data = $this->_sock->read(min(4096, $this->_toRead));
- $this->_toRead -= strlen($data);
+ $this->_toRead -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
}
if ('' == $data) {
break;
@@ -1317,7 +1330,7 @@
}
}
$data = $this->_sock->read($this->_chunkLength);
- $this->_chunkLength -= strlen($data);
+ $this->_chunkLength -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
if (0 == $this->_chunkLength) {
$this->_sock->readLine(); // Trailing CRLF
}
@@ -1354,6 +1367,10 @@
*/
function _decodeGzip($data)
{
+ if (HTTP_REQUEST_MBSTRING) {
+ $oldEncoding = mb_internal_encoding();
+ mb_internal_encoding('iso-8859-1');
+ }
$length = strlen($data);
// If it doesn't look like gzip-encoded data, don't bother
if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
@@ -1429,6 +1446,9 @@
} elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
return PEAR::raiseError('_decodeGzip(): data CRC check failed');
}
+ if (HTTP_REQUEST_MBSTRING) {
+ mb_internal_encoding($oldEncoding);
+ }
return $unpacked;
}
} // End class HTTP_Response