Sorry, looks like a couple of other things slipped in there as well as the license change - specifically stuff to do with the content filter. Review is welcome.
On Thu, Sep 28, 2006 at 06:23:00PM +0000, toad at freenetproject.org wrote: > Author: toad > Date: 2006-09-28 18:21:36 +0000 (Thu, 28 Sep 2006) > New Revision: 10553 > > Log: > Add GPL2+ headers to _most_ files. Don't have permissions for all files yet. > > Modified: trunk/freenet/src/freenet/clients/http/filter/CSSParser.java > =================================================================== > --- trunk/freenet/src/freenet/clients/http/filter/CSSParser.java > 2006-09-28 17:59:23 UTC (rev 10552) > +++ trunk/freenet/src/freenet/clients/http/filter/CSSParser.java > 2006-09-28 18:21:36 UTC (rev 10553) > @@ -1,3 +1,6 @@ > +/* This code is part of Freenet. It is distributed under the GNU General > + * Public License, version 2 (or at your option any later version). See > + * http://www.gnu.org/ for further details of the GPL. */ > package freenet.clients.http.filter; > > import java.io.Reader; > @@ -39,9 +42,7 @@ > } > > String processImportURL(String s) { > - return "\"" > - + HTMLFilter.sanitizeURI(HTMLFilter.stripQuotes(s), > "text/css", null, cb) > - + "\""; > + return HTMLFilter.sanitizeURI(HTMLFilter.stripQuotes(s), > "text/css", null, cb); > } > > String processURL(String s) { > > Modified: > trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex > =================================================================== > --- trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex > 2006-09-28 17:59:23 UTC (rev 10552) > +++ trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex > 2006-09-28 18:21:36 UTC (rev 10553) > @@ -1,6 +1,6 @@ > /* This code is part of Freenet. It is distributed under the GNU General > * Public License, version 2 (or at your option any later version). See > - * http://www.gnu.org/ for further details of the GPL. */ > + * http://www.gnu.org/ for further details of the GPL. */ > package freenet.clients.http.filter; > import java.io.*; > import java.util.*; > > Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java > =================================================================== > --- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java > 2006-09-28 17:59:23 UTC (rev 10552) > +++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java > 2006-09-28 18:21:36 UTC (rev 10553) > @@ -28,7 +28,6 @@ > import freenet.support.Logger; > import freenet.support.io.Bucket; > import freenet.support.io.BucketFactory; > -import freenet.support.io.NullBucket; > import freenet.support.io.NullWriter; > > public class HTMLFilter implements ContentDataFilter, CharsetExtractor { > @@ -201,27 +200,10 @@ > if (c == '"') { > mode = INTAG; > b.append(c); // > Part of the element > - } else if ((c == '>') > || (c == '<')) { > - if > (!deleteErrors) { > - > throwFilterException("Tags in markup"); > - > b.append(c); > - return > new NullBucket(); > - } else { > - if (c > == '>') { > - > w.write( > - > "<!-- Tags in string attribute -->"); > - > splitTag.clear(); > - > b = new StringBuffer(100); > - > mode = INTEXT; > - > balt = new StringBuffer(4000); > - > // End tag now > - } else { > - > killTag = true; > - > writeAfterTag.append( > - > "<!-- Tags in string attribute -->"); > - > // Wait for end of tag then zap it > - } > - } > + } else if (c == '>') { > + > b.append(">"); > + } else if (c == '<') { > + > b.append("<"); > } else { > b.append(c); > } > @@ -230,30 +212,10 @@ > if (c == '\'') { > mode = INTAG; > b.append(c); // > Part of the element > - } else if ((c == '>') > || (c == '<')) { > - if > (!deleteErrors) { > - > throwFilterException("Tags in markup"); > - > b.append(c); > - return > new NullBucket(); > - } else { > - if (c > == '>') { > - > w.write( > - > "<!-- Tags in string attribute -->"); > - > splitTag.clear(); > - > b = new StringBuffer(100); > - > balt = new StringBuffer(4000); > - > mode = INTEXT; > - > // End tag now > - } else { > - > killTag = true; > - > writeAfterTag.append( > - > "<!-- Tags in string attribute -->"); > - > // Wait for end of tag then zap it > - } > - > writeAfterTag.append( > - > "<!-- Tags in string attribute -->"); > - killTag > = true; > - } > + } else if (c == '<') { > + > b.append("<"); > + } else if (c == '>') { > + > b.append(">"); > } else { > b.append(c); > } > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: Digital signature URL: <https://emu.freenetproject.org/pipermail/devl/attachments/20060929/d0da7dbc/attachment.pgp>
