chagenbu Sat Jan 20 12:50:00 2001 EDT
Modified files:
/php4/pear/HTTP Compress.php
Log:
whitespace
Index: php4/pear/HTTP/Compress.php
diff -u php4/pear/HTTP/Compress.php:1.1 php4/pear/HTTP/Compress.php:1.2
--- php4/pear/HTTP/Compress.php:1.1 Fri Jan 12 07:24:21 2001
+++ php4/pear/HTTP/Compress.php Sat Jan 20 12:49:59 2001
@@ -1,82 +1,82 @@
-<?php
-/**
- * HTTP_Compress:: provides a wrapper around php's output buffering
- * mechanisms and also does compression, generates headers - ETag,
- * Content-Length, etc. - which may be beneficial to bandwidth
- * usage and performance.
- *
- * @author Mark Nottingham <[EMAIL PROTECTED]>
- * @author Chuck Hagenbuch <[EMAIL PROTECTED]>
- * @version $Revision: 1.1 $
- */
-class HTTP_Compress {
-
- /**
- * Start the output buffer, and make sure that implicit flush is
- * off so that data is always buffered.
- */
- function start()
- {
- ob_start();
- ob_implicit_flush(0);
- }
-
- /**
- * Output the contents of the output buffer, compressed if
- * desired, along with any relevant headers.
- *
- * @param boolean $compress (optional) Use gzip compression, if the browser
supports it.
- * @param boolean $use_etag Generate an ETag, and don't send the body if the
browser has the same object cached.
- * @param boolean $send_body Send the body of the request? Might be false for
HEAD requests.
- */
- function output($compress = true, $use_etag = true, $send_body = true)
- {
- $min_gz_size = 1024;
- $page = ob_get_contents();
- $length = strlen($page);
- ob_end_clean();
-
- if ($compress && extension_loaded('zlib') && (strlen($page) > $min_gz_size)
&& isset($GLOBALS['HTTP_SERVER_VARS']['HTTP_ACCEPT_ENCODING'])) {
- $ae = explode(',', str_replace(' ', '',
$GLOBALS['HTTP_SERVER_VARS']['HTTP_ACCEPT_ENCODING']));
- $enc = false;
- if (in_array('gzip', $ae)) {
- $enc = 'gzip';
- } else if (in_array('x-gzip', $ae)) {
- $enc = 'x-gzip';
- }
-
- if ($enc) {
- $page = gzencode($page);
- $length = strlen($page);
- header('Content-Encoding: ' . $enc);
- header('Vary: Accept-Encoding');
- } else {
- $compress = false;
- }
- } else {
- $compress = false;
- }
-
- if ($use_etag) {
- $etag = '"' . md5($page) . '"';
- header('ETag: ' . $etag);
- if (isset($GLOBALS['HTTP_SERVER_VARS']['HTTP_IF_NONE_MATCH'])) {
- $inm = explode(',',
$GLOBALS['HTTP_SERVER_VARS']['HTTP_IF_NONE_MATCH']);
- foreach ($inm as $i) {
- if (trim($i) == $etag) {
- header('HTTP/1.0 304 Not Modified');
- $send_body = false;
- break;
- }
- }
- }
- }
-
- if ($send_body) {
- header('Content-Length: ' . $length);
- echo $page;
- }
- }
-
-}
-?>
+<?php
+/**
+ * HTTP_Compress:: provides a wrapper around php's output buffering
+ * mechanisms and also does compression, generates headers - ETag,
+ * Content-Length, etc. - which may be beneficial to bandwidth
+ * usage and performance.
+ *
+ * @author Mark Nottingham <[EMAIL PROTECTED]>
+ * @author Chuck Hagenbuch <[EMAIL PROTECTED]>
+ * @version $Revision: 1.2 $
+ */
+class HTTP_Compress {
+
+ /**
+ * Start the output buffer, and make sure that implicit flush is
+ * off so that data is always buffered.
+ */
+ function start()
+ {
+ ob_start();
+ ob_implicit_flush(0);
+ }
+
+ /**
+ * Output the contents of the output buffer, compressed if
+ * desired, along with any relevant headers.
+ *
+ * @param boolean $compress (optional) Use gzip compression, if the browser
+supports it.
+ * @param boolean $use_etag Generate an ETag, and don't send the body if the
+browser has the same object cached.
+ * @param boolean $send_body Send the body of the request? Might be false for
+HEAD requests.
+ */
+ function output($compress = true, $use_etag = true, $send_body = true)
+ {
+ $min_gz_size = 1024;
+ $page = ob_get_contents();
+ $length = strlen($page);
+ ob_end_clean();
+
+ if ($compress && extension_loaded('zlib') && (strlen($page) > $min_gz_size)
+&& isset($GLOBALS['HTTP_SERVER_VARS']['HTTP_ACCEPT_ENCODING'])) {
+ $ae = explode(',', str_replace(' ', '',
+$GLOBALS['HTTP_SERVER_VARS']['HTTP_ACCEPT_ENCODING']));
+ $enc = false;
+ if (in_array('gzip', $ae)) {
+ $enc = 'gzip';
+ } else if (in_array('x-gzip', $ae)) {
+ $enc = 'x-gzip';
+ }
+
+ if ($enc) {
+ $page = gzencode($page);
+ $length = strlen($page);
+ header('Content-Encoding: ' . $enc);
+ header('Vary: Accept-Encoding');
+ } else {
+ $compress = false;
+ }
+ } else {
+ $compress = false;
+ }
+
+ if ($use_etag) {
+ $etag = '"' . md5($page) . '"';
+ header('ETag: ' . $etag);
+ if (isset($GLOBALS['HTTP_SERVER_VARS']['HTTP_IF_NONE_MATCH'])) {
+ $inm = explode(',',
+$GLOBALS['HTTP_SERVER_VARS']['HTTP_IF_NONE_MATCH']);
+ foreach ($inm as $i) {
+ if (trim($i) == $etag) {
+ header('HTTP/1.0 304 Not Modified');
+ $send_body = false;
+ break;
+ }
+ }
+ }
+ }
+
+ if ($send_body) {
+ header('Content-Length: ' . $length);
+ echo $page;
+ }
+ }
+
+}
+?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
