cvs: pear /HTTP HTTP.php

richard Thu Apr 25 07:04:20 2002 EDT Modified files: /pear/HTTP HTTP.php Log: * Fixes for HTTP::redirect Index: pear/HTTP/HTTP.php diff -u pear/HTTP/HTTP.php:1.14 pear/HTTP/HTTP.php:1.15 --- pear/HTTP/HTTP.php:1.14 Wed Apr 10 10:13:29 2002 +++ pear/HTTP/HTTP.php Thu Apr 25 07:04:20 2002 @@ -17,7 +17,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: HTTP.php,v 1.14 2002/04/10 14:13:29 cox Exp $ +// $Id: HTTP.php,v 1.15 2002/04/25 11:04:20 richard Exp $ // // HTTP utility functions. // @@ -184,16 +184,19 @@ { global $HTTP_SERVER_VARS; if (!preg_match('/^(https?|ftp):\/\//', $url)) { - $context = 'http' . (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 's' : '') . '://' . $HTTP_SERVER_VARS['SERVER_NAME']; + $server = 'http' . (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 's' : '') . '://' . $HTTP_SERVER_VARS['SERVER_NAME']; if ($HTTP_SERVER_VARS['SERVER_PORT'] != 80 && $HTTP_SERVER_VARS['SERVER_PORT'] != 443) { - $context .= ':' . $HTTP_SERVER_VARS['SERVER_PORT']; + $server .= ':' . $HTTP_SERVER_VARS['SERVER_PORT']; } + + $path = dirname($HTTP_SERVER_VARS['PHP_SELF']); if ($url{0} != '/') { - $context .= dirname($HTTP_SERVER_VARS['PHP_SELF']); - $url = $context . '/' . preg_replace('!^\./!', '', $url); + $path .= $url; + $server .= dirname($HTTP_SERVER_VARS['PHP_SELF']); + $url = $server . '/' . preg_replace('!^\./!', '', $url); } else { - $url = $context . $url; + $url = $server . $url; } } @@ -201,5 +204,4 @@ exit; } } - ?>