=================================================================== RCS file: /home/cvs/CVSROOT/Attic/cvsweb.cgi,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- CVSROOT/Attic/cvsweb.cgi 2000/07/11 08:20:53 1.3 +++ CVSROOT/Attic/cvsweb.cgi 2000/07/27 06:45:15 1.4 @@ -39,7 +39,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: cvsweb.cgi,v 1.3 2000/07/11 08:20:53 maekawa Exp $ +# $Id: cvsweb.cgi,v 1.4 2000/07/27 06:45:15 maekawa Exp $ # ### @@ -203,7 +203,7 @@ foreach (keys %DEFAULTVALUE) $barequery = ""; foreach (@stickyvars) { # construct a query string with the sticky non default parameters set - if (defined($input{$_}) && $input{$_} ne "" && $input{$_} ne $DEFAULTVALUE{$_}) { + if (defined($input{$_}) && $input{$_} ne "" && defined($DEFAULTVALUE{$_}) && $input{$_} ne $DEFAULTVALUE{$_}) { if ($barequery) { $barequery = $barequery . "&"; } @@ -829,7 +829,7 @@ sub htmlify { $string =~ s/>/>/g; # get URL's as link .. - $string =~ s§(http|ftp)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*§$1$2$3§; + $string =~ s§(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*§$1$2$3§; # get e-mails as link $string =~ s§([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})§$1§; @@ -1170,7 +1170,7 @@ sub doCheckout { } } else { - $revopt = ""; + $revopt = "-rHEAD"; if ($use_moddate) { readLog($fullname); $moddate=$date{$symrev{HEAD}}; @@ -1185,7 +1185,7 @@ sub doCheckout { # Safely for a child process to read from. if (! open($fh, "-|")) { # child open(STDERR, ">&STDOUT"); # Redirect stderr to stdout - exec("cvs", "-d$cvsroot", "co", "-p", $revopt, $where); + exec("cvs", "-d", "$cvsroot", "co", "-p", "$revopt", "$where"); } #=================================================================== #Checking out squid/src/ftp.c @@ -1198,8 +1198,10 @@ sub doCheckout { while(<$fh>) { last if (/^\*\*\*\*/); $revision = $1 if (/^VERS: (.*)$/); - $filename = $1 if (/^Checking out (.*)$/); - $filename =~ s/^\.\/*//; + if (/^Checking out (.*)$/) { + $filename = $1; + $filename =~ s/^\.\/*//; + } $cvsheader .= $_; } if ($filename ne $where) { @@ -2297,7 +2299,7 @@ sub navigateHeader ($$$$$) { $swhere = urlencode($filename) if ($swhere eq ""); print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"; print "\n\n"; - print ''; + print ''; print "\n$path$filename - $title - $rev\n"; print "\n"; print ""; @@ -2652,7 +2654,7 @@ sub http_header { sub html_header($) { my ($title) = @_; - my $version = '$Revision: 1.3 $'; + my $version = '$Revision: 1.4 $'; http_header(); print <