cvs: php4 /pear/Cache Output.php

eschmid Fri Mar 16 00:50:39 2001 EDT Modified files: /php4/pear/Cache Output.php Log: Ulf, you have a conflict. Index: php4/pear/Cache/Output.php diff -u php4/pear/Cache/Output.php:1.13 php4/pear/Cache/Output.php:1.14 --- php4/pear/Cache/Output.php:1.13 Fri Mar 16 00:40:39 2001 +++ php4/pear/Cache/Output.php Fri Mar 16 00:50:39 2001 @@ -17,7 +17,7 @@ // | Vinai Kopp <kopp@netzarbeiter.de> | // +----------------------------------------------------------------------+ // -// $Id: Output.php,v 1.13 2001/03/16 08:40:39 uw Exp $ +// $Id: Output.php,v 1.14 2001/03/16 08:50:39 eschmid Exp $ require_once 'Cache.php'; @@ -50,14 +50,10 @@ * // "post" => $HTTP_POST_VAS" * // "cookie" => $HTTP_COOKIE_VARS * // ); -<<<<<<< Output.php * // But be warned, using all GET or POST Variables as a seed * // can be used for a DOS attack. Calling http://www.example.com/example.php?whatever * // where whatever is a random text might be used to flood your cache. * $cache_handle = $cache->generateID($REQUEST_URI); -======= -* $cache_handle = $cache->generateID($REQUEST_URI); ->>>>>>> 1.12 * * // now the magic happens: if cached call die() * // to end the time consumptiong script script execution and use the cached value!