Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 06 Nov 2004 11:01:13 +0200
From:      Ville =?ISO-8859-1?Q?Skytt=E4?= <scop@FreeBSD.org>
To:        freebsd-cvsweb@freebsd.org
Subject:   RE: weird output from 3.0.3
Message-ID:  <1099731673.26192.40.camel@bobcat.mine.nu>
In-Reply-To: <1B5C7FA9D60DD511ABEF00508BFDEFDC01FA8E1D@EXCHANGE>
References:  <1B5C7FA9D60DD511ABEF00508BFDEFDC01FA8E1D@EXCHANGE>

next in thread | previous in thread | raw e-mail | index | archive | help
Ok, I've found the bug that caused the weirdness, fixed it and released
3.0.4.  The bug was introduced in 3.0.2.  Thanks to everyone involved in
tracking this down!

On Fri, 2004-11-05 at 19:06, Bo Zou wrote:
> I pinpointed the following changes caused the error:
> 
> --- cvsweb.cgi  Fri Nov  5 12:59:31 2004
> +++ /home/bzou/courses/cvsweb-3.0.3/cvsweb.cgi  Wed Nov  3 15:16:08
> 2004
> @@ -1582,7 +1582,7 @@
>  
>    if (defined($ts)) {
>      # Expand tabs
> -    1 while s/\t+/' ' x (length($&) * $ts - length($`) % $ts)/e;
> +    1 while s/(.*)(\t+)/' ' x (length($2) * $ts - length($1) %
> $ts)/e;
>    }
>  
>    if ($hr_breakable) {
> 
> Hope this helps.

It sure does, thanks!

> Bo
> 
> > -----Original Message-----
> > From: owner-freebsd-cvsweb@freebsd.org
> > [mailto:owner-freebsd-cvsweb@freebsd.org]On Behalf Of Jon Noack
> > Sent: Friday, November 05, 2004 11:35 AM
> > To: Ville Skyttä
> > Cc: freebsd-cvsweb@freebsd.org
> > Subject: Re: weird output from 3.0.3
> > 
> > 
> > Ville Skyttä wrote:
> > > On Fri, 2004-11-05 at 04:37, Michael Johnson wrote:
> > >> Colored diff do weird things in 3.0.3
> > >
> > > Could you be more specific about what's "weird", please?
> > >
> > >> Here is an example
> > >> The following is 3.0.3
> > >> 
> > http://chief.ahze.net:8080/cgi-bin/cvsweb-3.0.3.cgi/ports/mult
> imedia/vlc/Makefile.diff?r1=1.36;r2=1.37;f=h
> >
> > I don't see anything particularly weird about that one; AFAICT it
> works
> > as it's supposed to.  I see you're using String::Ediff.
> >
> >> The following is 3.0.1
> >>
> http://chief.ahze.net:8080/cgi-bin/cvsweb.cgi/ports/multimedia/vlc/Makefile.diff?r1=1.36;r2=1.37;f=h
> >
> > That link points to an "Internal Server Error" currently.
> 
> I managed to catch these yesterday just before the server started
> returning "Internal Server Error".  Note the missing "USE_GCC=",
> "WITH_ESOUND=", and "LIB_DEPENDS+=" on the 3.0.3 page:
> 
> http://www.noacks.org/freebsd/Makefile.diff.html
> http://www.noacks.org/freebsd/Makefile-3.0.3.diff.html
> 
> 
> I modified the 3.0.3 version slightly to remove superficial
> differences. 
> A diff between the differences that matter is here:
> 
> http://www.noacks.org/freebsd/cvsweb.diff
> 
> Jon
> 
> _______________________________________________
> freebsd-cvsweb@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb
> To unsubscribe, send any mail to
> "freebsd-cvsweb-unsubscribe@freebsd.org"
> 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1099731673.26192.40.camel>