Author: toad
Date: 2009-03-20 20:17:26 +0000 (Fri, 20 Mar 2009)
New Revision: 26119
Added:
branches/db4o/freenet/test/freenet/clients/http/filter/CSSParserTest.java
branches/db4o/freenet/test/freenet/clients/http/filter/PNGFilterTest.java
branches/db4o/freenet/test/freenet/clients/http/filter/png/
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_crc.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_length.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_private_critical.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_type.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/gama_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/gama_after_plte.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/iccp_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_16bit_palette.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_1bit_alpha.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_bit_depth.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_color_type.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_compression_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_filter_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_image_size.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_interlace_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_gama.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_iend.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_ihdr.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_offs.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_sbit.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_sbit_2.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_ster.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_ihdr.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_plte.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_gama.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_ihdr.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_offs.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_pcal.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_plte.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_scal.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_ster.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/nonconsecutive_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/offs_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/offs_unit_specifier.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/pcal_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_empty.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_in_grayscale.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_length_mod_three.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_too_many_entries.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_too_many_entries_2.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_compression_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_filter_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_filter_type.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_interlace_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/sbit_after_plte.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_floating_point.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_negative.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_unit_specifier.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_zero.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_duplicate_name.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_length_mod_10.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_length_mod_6.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_sample_depth.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/srgb_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ster_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ster_mode.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/trns_bad_color_type.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_idat_0.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_idat_1.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_zlib.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_zlib_2.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/unknown_filter_type.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngbar.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngnow.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngtest.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/README
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g01.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g02.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g04.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g08.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g16.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn2c08.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn2c16.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p01.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p02.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p04.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p08.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn4a08.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn4a16.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn6a08.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn6a16.png
Removed:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_crc.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_length.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_private_critical.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_type.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/gama_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/gama_after_plte.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/iccp_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_16bit_palette.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_1bit_alpha.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_bit_depth.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_color_type.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_compression_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_filter_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_image_size.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_interlace_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_gama.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_iend.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_ihdr.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_offs.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_sbit.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_sbit_2.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_ster.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_ihdr.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_plte.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_gama.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_ihdr.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_offs.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_pcal.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_plte.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_scal.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_ster.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/nonconsecutive_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/offs_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/offs_unit_specifier.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/pcal_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_empty.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_in_grayscale.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_length_mod_three.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_too_many_entries.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_too_many_entries_2.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_compression_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_filter_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_filter_type.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_interlace_method.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/sbit_after_plte.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_floating_point.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_negative.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_unit_specifier.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_zero.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_duplicate_name.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_length_mod_10.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_length_mod_6.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_sample_depth.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/srgb_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ster_after_idat.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ster_mode.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/trns_bad_color_type.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_idat_0.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_idat_1.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_zlib.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_zlib_2.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/unknown_filter_type.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngbar.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngnow.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngtest.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/README
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g01.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g02.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g04.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g08.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g16.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn2c08.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn2c16.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p01.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p02.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p04.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p08.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn4a08.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn4a16.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn6a08.png
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn6a16.png
Modified:
branches/db4o/freenet/
branches/db4o/freenet/build.xml
branches/db4o/freenet/src/freenet/client/
branches/db4o/freenet/src/freenet/client/FetchException.java
branches/db4o/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
branches/db4o/freenet/src/freenet/client/events/SplitfileProgressEvent.java
branches/db4o/freenet/src/freenet/clients/http/HTTPRequestImpl.java
branches/db4o/freenet/src/freenet/clients/http/PageMaker.java
branches/db4o/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
branches/db4o/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex
branches/db4o/freenet/src/freenet/clients/http/filter/PNGFilter.java
branches/db4o/freenet/src/freenet/io/NetworkInterface.java
branches/db4o/freenet/src/freenet/l10n/freenet.l10n.de.properties
branches/db4o/freenet/src/freenet/l10n/freenet.l10n.it.properties
branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
branches/db4o/freenet/src/freenet/node/NodePinger.java
branches/db4o/freenet/src/freenet/node/PeerManager.java
branches/db4o/freenet/src/freenet/node/Version.java
branches/db4o/freenet/src/freenet/node/fcp/AllDataMessage.java
branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java
branches/db4o/freenet/src/freenet/node/fcp/SimpleProgressMessage.java
branches/db4o/freenet/src/freenet/pluginmanager/PluginRespirator.java
branches/db4o/freenet/src/freenet/pluginmanager/PluginTalker.java
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
branches/db4o/freenet/src/freenet/support/BloomFilter.java
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
Log:
Merge up to 26118 (1206) from trunk
Property changes on: branches/db4o/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/db4o:25594
/trunk/freenet:19964-25872,25900
+ /branches/db4o:25594
/trunk/freenet:19964-26118
Modified: branches/db4o/freenet/build.xml
===================================================================
--- branches/db4o/freenet/build.xml 2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/build.xml 2009-03-20 20:17:26 UTC (rev 26119)
@@ -146,6 +146,9 @@
<include name="**/*.java"/>
<exclude name="*.java"/>
</javac>
+ <copy todir="${build-test}/freenet/clients/http/filter/png">
+ <fileset dir="${test}/freenet/clients/http/filter/png"/>
+ </copy>
</target>
<target name="unit" depends="unit-build" if="junit.present"
unless="skip_tests">
Property changes on: branches/db4o/freenet/src/freenet/client
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/db4o/src/freenet/client:25594
+ /branches/db4o/src/freenet/client:25594
/trunk/freenet/src/freenet/client:25873-26118
Modified: branches/db4o/freenet/src/freenet/client/FetchException.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/FetchException.java
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/client/FetchException.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -294,10 +294,13 @@
// FIXME many of these are not used any more
/** Too many levels of recursion into archives */
+ @Deprecated // not used
public static final int TOO_DEEP_ARCHIVE_RECURSION = 1;
/** Don't know what to do with splitfile */
+ @Deprecated // not used
public static final int UNKNOWN_SPLITFILE_METADATA = 2;
/** Too many redirects */
+ @Deprecated // not used
public static final int TOO_MANY_REDIRECTS = 16;
/** Don't know what to do with metadata */
public static final int UNKNOWN_METADATA = 3;
@@ -308,10 +311,12 @@
/** Failed to decode a block */
public static final int BLOCK_DECODE_ERROR = 6;
/** Too many split metadata levels */
+ @Deprecated // not used
public static final int TOO_MANY_METADATA_LEVELS = 7;
/** Too many archive restarts */
public static final int TOO_MANY_ARCHIVE_RESTARTS = 8;
/** Too deep recursion */
+ // FIXME some TOO_MUCH_RECURSION may be TOO_DEEP_ARCHIVE_RECURSION
public static final int TOO_MUCH_RECURSION = 9;
/** Tried to access an archive file but not in an archive */
public static final int NOT_IN_ARCHIVE = 10;
@@ -359,6 +364,7 @@
return isFatal(mode);
}
+ @SuppressWarnings("deprecation")
public static boolean isFatal(int mode) {
switch(mode) {
// Problems with the data as inserted, or the URI given. No
point retrying.
Modified:
branches/db4o/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
2009-03-20 18:58:28 UTC (rev 26118)
+++
branches/db4o/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -110,9 +110,9 @@
generator = null;
}
if(persistent) {
- container.store(waitingFor);
- container.store(waitingForBlockSet);
- container.store(waitingForFetchable);
+ container.ext().store(waitingFor, 2);
+ container.ext().store(waitingForBlockSet, 2);
+ container.ext().store(waitingForFetchable, 2);
}
if(persistent) state.removeFrom(container, context);
if(complete)
@@ -216,19 +216,19 @@
for(int i=0;i<waitingFor.size();i++) {
if(waitingFor.get(i) == oldState) {
waitingFor.set(i, newState);
- container.store(waitingFor);
+ container.ext().store(waitingFor, 2);
}
}
for(int i=0;i<waitingFor.size();i++) {
if(waitingForBlockSet.get(i) == oldState) {
waitingForBlockSet.set(i, newState);
- container.store(waitingFor);
+ container.ext().store(waitingFor, 2);
}
}
for(int i=0;i<waitingFor.size();i++) {
if(waitingForFetchable.get(i) == oldState) {
waitingForFetchable.set(i, newState);
- container.store(waitingFor);
+ container.ext().store(waitingFor, 2);
}
}
}
@@ -249,7 +249,7 @@
synchronized(this) {
this.waitingForBlockSet.remove(state);
if(persistent)
- container.store(waitingForBlockSet);
+ container.ext().store(waitingForBlockSet, 2);
if(!started) return;
if(!waitingForBlockSet.isEmpty()) return;
}
@@ -276,7 +276,7 @@
synchronized(this) {
this.waitingForFetchable.remove(state);
if(persistent)
- container.store(waitingForFetchable);
+ container.ext().store(waitingForFetchable, 2);
if(!started) return;
if(!waitingForFetchable.isEmpty()) return;
}
Modified:
branches/db4o/freenet/src/freenet/client/events/SplitfileProgressEvent.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/events/SplitfileProgressEvent.java
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/client/events/SplitfileProgressEvent.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -12,42 +12,42 @@
public static int code = 0x07;
public final int totalBlocks;
- public final int fetchedBlocks;
+ public final int succeedBlocks;
public final int failedBlocks;
public final int fatallyFailedBlocks;
public int minSuccessfulBlocks;
public final boolean finalizedTotal;
- public SplitfileProgressEvent(int totalBlocks, int fetchedBlocks, int
failedBlocks,
+ public SplitfileProgressEvent(int totalBlocks, int succeedBlocks, int
failedBlocks,
int fatallyFailedBlocks, int minSuccessfulBlocks,
boolean finalizedTotal) {
this.totalBlocks = totalBlocks;
- this.fetchedBlocks = fetchedBlocks;
+ this.succeedBlocks = succeedBlocks;
this.failedBlocks = failedBlocks;
this.fatallyFailedBlocks = fatallyFailedBlocks;
this.minSuccessfulBlocks = minSuccessfulBlocks;
this.finalizedTotal = finalizedTotal;
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Created SplitfileProgressEvent:
total="+totalBlocks+" fetched="+fetchedBlocks+" failed="+failedBlocks+"
fatally="+fatallyFailedBlocks+" min success="+minSuccessfulBlocks+"
finalized="+finalizedTotal);
+ Logger.minor(this, "Created SplitfileProgressEvent:
total="+totalBlocks+" succeed="+succeedBlocks+" failed="+failedBlocks+"
fatally="+fatallyFailedBlocks+" min success="+minSuccessfulBlocks+"
finalized="+finalizedTotal);
}
public String getDescription() {
StringBuilder sb = new StringBuilder();
sb.append("Completed ");
- if((minSuccessfulBlocks == 0) && (fetchedBlocks == 0))
+ if((minSuccessfulBlocks == 0) && (succeedBlocks == 0))
minSuccessfulBlocks = 1;
if(minSuccessfulBlocks == 0) {
if(Logger.globalGetThreshold() > Logger.MINOR)
- Logger.error(this, "minSuccessfulBlocks=0,
fetchedBlocks="+fetchedBlocks+", totalBlocks="+totalBlocks+
+ Logger.error(this, "minSuccessfulBlocks=0,
succeedBlocks="+succeedBlocks+", totalBlocks="+totalBlocks+
",
failedBlocks="+failedBlocks+", fatallyFailedBlocks="+fatallyFailedBlocks+",
finalizedTotal="+finalizedTotal);
else
- Logger.error(this, "minSuccessfulBlocks=0,
fetchedBlocks="+fetchedBlocks+", totalBlocks="+totalBlocks+
+ Logger.error(this, "minSuccessfulBlocks=0,
succeedBlocks="+succeedBlocks+", totalBlocks="+totalBlocks+
",
failedBlocks="+failedBlocks+", fatallyFailedBlocks="+fatallyFailedBlocks+",
finalizedTotal="+finalizedTotal, new Exception("debug"));
} else {
- sb.append((100*(fetchedBlocks)/minSuccessfulBlocks));
+ sb.append((100*(succeedBlocks)/minSuccessfulBlocks));
sb.append('%');
}
sb.append(' ');
- sb.append(fetchedBlocks);
+ sb.append(succeedBlocks);
sb.append('/');
sb.append(minSuccessfulBlocks);
sb.append(" (failed ");
Modified: branches/db4o/freenet/src/freenet/clients/http/HTTPRequestImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/clients/http/HTTPRequestImpl.java
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/clients/http/HTTPRequestImpl.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -588,7 +588,7 @@
Logger.error(this, "Caught IOE:" + ioe.getMessage());
} finally {
Closer.close(dis);
- Closer.close(is);
+ Closer.close(is); /* FIXME: Why are we doing this?
dis.close() should close the InputStream. */
}
return new byte[0];
Modified: branches/db4o/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- branches/db4o/freenet/src/freenet/clients/http/PageMaker.java
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/clients/http/PageMaker.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -119,6 +119,8 @@
navigationLinkCallbacks.put(name, cb);
}
+ /* FIXME: Implement a proper way for chosing what the menu looks like
upon handleHTTPGet/Post */
+ @Deprecated
public void removeNavigationLink(String name) {
navigationLinkTexts.remove(name);
navigationLinkTextsNonFull.remove(name);
Modified:
branches/db4o/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
===================================================================
---
branches/db4o/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
2009-03-20 18:58:28 UTC (rev 26118)
+++
branches/db4o/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.1 on 2/13/09 11:03 PM */
+/* The following code was generated by JFlex 1.4.1 on 20/03/09 18:35 */
/* 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
@@ -18,7 +18,7 @@
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/";>JFlex</a> 1.4.1
- * on 2/13/09 11:03 PM from the specification file
+ * on 20/03/09 18:35 from the specification file
* <tt>src/freenet/clients/http/filter/CSSTokenizerFilter.jflex</tt>
*/
class CSSTokenizerFilter {
@@ -1577,6 +1577,14 @@
if(debug) log("Matched important: "+s);
}
case 55: break;
+ case 9:
+ { String s = yytext();
+ if(s.toLowerCase().startsWith("url"))
throwError(l10n("invalidURLContents"));
+ if(!s.toLowerCase().startsWith("rgb") &&
!s.toLowerCase().startsWith("attr")) throwError(l10n("invalidURLContents"));
+ w.write(s);
+ if(debug) log("Matched function start: "+s);
+ }
+ case 56: break;
case 16:
{ if(!deleteErrors) {
throwError(l10n("unknownAtIdentifierLabel")+" "+yytext());
@@ -1586,26 +1594,26 @@
// Ignore
}
}
- case 56: break;
+ case 57: break;
case 11:
{ String s = yytext();
w.write(s);
if(debug) log("Matched measurement: "+s);
}
- case 57: break;
+ case 58: break;
case 18:
{ String s = yytext();
w.write(s);
if(debug) log("Matched |=: "+s);
}
- case 58: break;
+ case 59: break;
case 32:
{ String s = yytext();
detectedCharset = s;
if(debug) log("Matched and ignoring charset: "+s);
// Ignore
}
- case 59: break;
+ case 60: break;
case 10:
{ if(postBadImportFlag) {
// Ignore
@@ -1618,13 +1626,6 @@
if(debug) log("Matched and passing on mediums list: "+s);
}
}
- case 60: break;
- case 9:
- { String s = yytext();
- if(s.startsWith("url")) throwError(l10n("invalidURLContents"));
- w.write(s);
- if(debug) log("Matched function start: "+s);
- }
case 61: break;
case 4:
{ String s = yytext();
Modified:
branches/db4o/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex
===================================================================
---
branches/db4o/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex
2009-03-20 18:58:28 UTC (rev 26118)
+++
branches/db4o/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex
2009-03-20 20:17:26 UTC (rev 26119)
@@ -437,7 +437,8 @@
}
{IDENT}"(" {
String s = yytext();
- if(s.startsWith("url")) throwError(l10n("invalidURLContents"));
+ if(s.toLowerCase().startsWith("url"))
throwError(l10n("invalidURLContents"));
+ if(!s.toLowerCase().startsWith("rgb") &&
!s.toLowerCase().startsWith("attr")) throwError(l10n("invalidURLContents"));
w.write(s);
if(debug) log("Matched function start: "+s);
}
Modified: branches/db4o/freenet/src/freenet/clients/http/filter/PNGFilter.java
===================================================================
--- branches/db4o/freenet/src/freenet/clients/http/filter/PNGFilter.java
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/clients/http/filter/PNGFilter.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -8,6 +8,7 @@
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
+import java.io.EOFException;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -32,7 +33,7 @@
/**
* Content filter for PNG's. Only allows valid chunks (valid CRC, known chunk
type).
- *
+ *
* It can strip the timestamp and "text(.)*" chunks if asked to
*
* FIXME: validate chunk contents where possible.
@@ -42,31 +43,22 @@
private final boolean deleteText;
private final boolean deleteTimestamp;
private final boolean checkCRCs;
- static final byte[] pngHeader =
- {(byte) 137, (byte) 80, (byte) 78, (byte) 71, (byte) 13, (byte)
10, (byte) 26, (byte) 10};
+ static final byte[] pngHeader = { (byte) 137, (byte) 80, (byte) 78,
(byte) 71, (byte) 13, (byte) 10, (byte) 26,
+ (byte) 10 };
static final String[] HARMLESS_CHUNK_TYPES = {
- // http://www.w3.org/TR/PNG/
- "tRNS",
- "cHRM",
- "gAMA",
- "iCCP", // FIXME Embedded ICC profile: could this conceivably
cause a web lookup?
- "sBIT", // FIXME rather obscure ??
- "sRGB",
- "bKGD",
- "hIST",
- "pHYs",
- "sPLT",
- // APNG chunks (Firefox 3 will support APNG)
- // http://wiki.mozilla.org/APNG_Specification
- "acTL",
- "fcTL",
- "fdAT"
- // MNG isn't supported by Firefox and IE because of lack of
market demand. Big surprise
- // given nobody supports it! It is supported by Konqueror
though. Complex standard,
- // not worth it for the time being.
-
- // This might be a useful source of info too (e.g. on private
chunks):
- //
http://fresh.t-systems-sfr.com/unix/privat/pngcheck-2.3.0.tar.gz:a/pngcheck-2.3.0/pngcheck.c
+ // http://www.w3.org/TR/PNG/
+ "tRNS", "cHRM", "gAMA", "iCCP", // FIXME Embedded ICC profile:
could this conceivably cause a web lookup?
+ "sBIT", // FIXME rather obscure ??
+ "sRGB", "bKGD", "hIST", "pHYs", "sPLT",
+ // APNG chunks (Firefox 3 will support APNG)
+ // http://wiki.mozilla.org/APNG_Specification
+ "acTL", "fcTL", "fdAT"
+ // MNG isn't supported by Firefox and IE because of lack of market
demand. Big surprise
+ // given nobody supports it! It is supported by Konqueror though.
Complex standard,
+ // not worth it for the time being.
+
+ // This might be a useful source of info too (e.g. on private chunks):
+ //
http://fresh.t-systems-sfr.com/unix/privat/pngcheck-2.3.0.tar.gz:a/pngcheck-2.3.0/pngcheck.c
};
PNGFilter(boolean deleteText, boolean deleteTimestamp, boolean
checkCRCs) {
@@ -78,9 +70,9 @@
public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
HashMap<String, String> otherParams,
FilterCallback cb) throws DataFilterException, IOException {
Bucket output = readFilter(data, bf, charset, otherParams, cb,
deleteText, deleteTimestamp, checkCRCs, null);
- if(output != null)
+ if (output != null)
return output;
- if(Logger.shouldLog(Logger.MINOR, this))
+ if (Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "Need to modify PNG...");
Bucket filtered = bf.makeBucket(-1);
OutputStream os = new
BufferedOutputStream(filtered.getOutputStream());
@@ -110,21 +102,21 @@
// Check the header
byte[] headerCheck = new byte[pngHeader.length];
dis.readFully(headerCheck);
- if(!Arrays.equals(headerCheck, pngHeader)) {
+ if (!Arrays.equals(headerCheck, pngHeader)) {
// Throw an exception
String message = l10n("invalidHeader");
String title = l10n("invalidHeaderTitle");
- throw new DataFilterException(title, title,
- "<p>" + message + "</p>", new
HTMLNode("p").addChild("#", message));
+ throw new DataFilterException(title, title,
"<p>" + message + "</p>", new HTMLNode("p").addChild("#",
+ message));
}
ByteArrayOutputStream baos = null;
DataOutputStream dos = null;
- if(output != null) {
+ if (output != null) {
baos = new ByteArrayOutputStream();
dos = new DataOutputStream(baos);
output.write(pngHeader);
- if(logMINOR)
+ if (logMINOR)
Logger.minor(this, "Writing the PNG
header to the output bucket");
}
@@ -135,149 +127,166 @@
boolean hasSeenIEND = false;
boolean hasSeenIDAT = false;
String lastChunkType = "";
-
- while(!finished) {
+
+ while (!finished) {
boolean skip = false;
- if(baos != null)
+ if (baos != null)
baos.reset();
String chunkTypeString = null;
// Length of the chunk
byte[] lengthBytes = new byte[4];
dis.readFully(lengthBytes);
-
- int length = ((lengthBytes[0] & 0xff) << 24) +
((lengthBytes[1] & 0xff) << 16) + ((lengthBytes[2] & 0xff) << 8) +
(lengthBytes[3] & 0xff);
- if(logMINOR)
+
+ int length = ((lengthBytes[0] & 0xff) << 24) +
((lengthBytes[1] & 0xff) << 16)
+ + ((lengthBytes[2] & 0xff) << 8) +
(lengthBytes[3] & 0xff);
+ if (logMINOR)
Logger.minor(this, "length " + length);
- if(dos != null)
+ if (dos != null)
dos.write(lengthBytes);
// Type of the chunk : Should match [a-zA-Z]{4}
dis.readFully(lengthBytes);
StringBuilder sb = new StringBuilder();
byte[] chunkTypeBytes = new byte[4];
- for(int i = 0; i < 4; i++) {
+ for (int i = 0; i < 4; i++) {
char val = (char) lengthBytes[i];
- if((val >= 65 && val <= 99) || (val >=
97 && val <= 122)) {
+ if ((val >= 65 && val <= 99) || (val >=
97 && val <= 122)) {
chunkTypeBytes[i] =
lengthBytes[i];
sb.append(val);
- } else {
+ } else {
String chunkName =
HexUtil.bytesToHex(lengthBytes, 0, 4);
- throwError("Unknown Chunk" ,
"The name of the chunk is invalid! (" + chunkName+")");
+ throwError("Unknown Chunk",
"The name of the chunk is invalid! (" + chunkName + ")");
}
}
chunkTypeString = sb.toString();
- if(logMINOR)
+ if (logMINOR)
Logger.minor(this, "name " +
chunkTypeString);
// Content of the chunk
byte[] chunkData = new byte[length];
dis.readFully(chunkData, 0, length);
- if(logMINOR)
- if(logDEBUG)
+ if (logMINOR)
+ if (logDEBUG)
Logger.minor(this, "data " +
(chunkData.length == 0 ? "null" : HexUtil.bytesToHex(chunkData)));
else
Logger.minor(this, "data " +
chunkData.length);
- if(dos != null)
+ if (dos != null)
dos.write(chunkTypeBytes);
- if(dos != null)
+ if (dos != null)
dos.write(chunkData);
// CRC of the chunk
byte[] crcLengthBytes = new byte[4];
dis.readFully(crcLengthBytes);
- if(dos != null)
+ if (dos != null)
dos.write(crcLengthBytes);
- if(checkCRCs) {
- long readCRC = (((crcLengthBytes[0] &
0xff) << 24) + ((crcLengthBytes[1] & 0xff) << 16) + ((crcLengthBytes[2] & 0xff)
<< 8) + (crcLengthBytes[3] & 0xff)) & 0x00000000ffffffffL;
+ if (checkCRCs) {
+ long readCRC = (((crcLengthBytes[0] &
0xff) << 24) + ((crcLengthBytes[1] & 0xff) << 16)
+ + ((crcLengthBytes[2] & 0xff)
<< 8) + (crcLengthBytes[3] & 0xff)) & 0x00000000ffffffffL;
CRC32 crc = new CRC32();
crc.update(chunkTypeBytes);
crc.update(chunkData);
long computedCRC = crc.getValue();
-
- if(readCRC != computedCRC) {
+
+ if (readCRC != computedCRC) {
skip = true;
- if(logMINOR)
- Logger.minor(this, "CRC
of the chunk " + chunkTypeString + " doesn't match (" +
Long.toHexString(readCRC) + " but should be " + Long.toHexString(computedCRC) +
")!");
+ if (logMINOR)
+ Logger.minor(this, "CRC
of the chunk " + chunkTypeString + " doesn't match ("
+ +
Long.toHexString(readCRC) + " but should be " + Long.toHexString(computedCRC)
+ + ")!");
}
}
boolean validChunkType = false;
-
- if(!skip && "IHDR".equals(chunkTypeString)) {
- if(hasSeenIHDR)
+
+ if (!skip && "IHDR".equals(chunkTypeString)) {
+ if (hasSeenIHDR)
throwError("Duplicate IHDR",
"Two IHDR chunks detected!!");
hasSeenIHDR = true;
validChunkType = true;
}
- if(!hasSeenIHDR)
+ if (!hasSeenIHDR)
throwError("No IHDR chunk!", "No IHDR
chunk!");
- if(!skip && "IEND".equals(chunkTypeString)) {
- if(hasSeenIEND) // XXX impossible code
path: it should have throwed as "IEND not last chunk"
+ if (!skip && "IEND".equals(chunkTypeString)) {
+ if (hasSeenIEND) // XXX impossible code
path: it should have throwed as "IEND not last chunk"
throwError("Two IEND chunks
detected!!", "Two IEND chunks detected!!");
hasSeenIEND = true;
validChunkType = true;
}
-
- if(!skip &&
"PLTE".equalsIgnoreCase(chunkTypeString)) {
- if(hasSeenIDAT)
+
+ if (!skip &&
"PLTE".equalsIgnoreCase(chunkTypeString)) {
+ if (hasSeenIDAT)
throwError("PLTE must be before
IDAT", "PLTE must be before IDAT");
validChunkType = true;
}
-
- if(!skip &&
"IDAT".equalsIgnoreCase(chunkTypeString)) {
- if(hasSeenIDAT &&
!"IDAT".equalsIgnoreCase(lastChunkType))
- throwError("Multiple IDAT
chunks must be consecutive!", "Multiple IDAT chunks must be consecutive!");
+
+ if (!skip &&
"IDAT".equalsIgnoreCase(chunkTypeString)) {
+ if (hasSeenIDAT &&
!"IDAT".equalsIgnoreCase(lastChunkType))
+ throwError("Multiple IDAT
chunks must be consecutive!",
+ "Multiple IDAT chunks
must be consecutive!");
hasSeenIDAT = true;
validChunkType = true;
}
-
- if(!validChunkType) {
- for(int
i=0;i<HARMLESS_CHUNK_TYPES.length;i++) {
-
if(HARMLESS_CHUNK_TYPES[i].equals(chunkTypeString))
+
+ if (!validChunkType) {
+ for (int i = 0; i <
HARMLESS_CHUNK_TYPES.length; i++) {
+ if
(HARMLESS_CHUNK_TYPES[i].equals(chunkTypeString))
validChunkType = true;
}
}
-
- if(dis.available() < 1) {
- if(!(hasSeenIEND && hasSeenIHDR))
+
+ if (dis.available() < 1) {
+ if (!(hasSeenIEND && hasSeenIHDR))
throwError("Missing IEND or
IHDR!", "Missing IEND or IHDR!");
finished = true;
}
- if("text".equalsIgnoreCase(chunkTypeString) ||
"itxt".equalsIgnoreCase(chunkTypeString)
- ||
"ztxt".equalsIgnoreCase(chunkTypeString)) {
- if(deleteText) skip = true;
- else validChunkType = true;
- } else if(deleteTimestamp &&
"time".equalsIgnoreCase(chunkTypeString)) {
- if(deleteTimestamp) skip = true;
- else validChunkType = true;
+ if ("text".equalsIgnoreCase(chunkTypeString) ||
"itxt".equalsIgnoreCase(chunkTypeString)
+ ||
"ztxt".equalsIgnoreCase(chunkTypeString)) {
+ if (deleteText)
+ skip = true;
+ else
+ validChunkType = true;
+ } else if (deleteTimestamp &&
"time".equalsIgnoreCase(chunkTypeString)) {
+ if (deleteTimestamp)
+ skip = true;
+ else
+ validChunkType = true;
}
-
- if(!validChunkType) {
- if(logMINOR)
- Logger.minor(this, "Skipping
unknown chunk type "+chunkTypeString);
- if(output == null)
+
+ if (!validChunkType) {
+ if (logMINOR)
+ Logger.minor(this, "Skipping
unknown chunk type " + chunkTypeString);
+ if (output == null)
return null;
skip = true;
}
-
- if(skip && output == null)
+
+ if (skip && output == null)
return null;
- else if(!skip && output != null) {
- if(logMINOR)
- Logger.minor(this, "Writing " +
chunkTypeString + " (" + baos.size() + ") to the output bucket");
+ else if (!skip && output != null) {
+ if (logMINOR)
+ Logger
+ .minor(this, "Writing "
+ chunkTypeString + " (" + baos.size()
+ + ") to the
output bucket");
baos.writeTo(output);
baos.flush();
}
lastChunkType = chunkTypeString;
}
- if(hasSeenIEND && dis.available() > 0 && output == null)
+ if (hasSeenIEND && dis.available() > 0)
throwError("IEND not last chunk", "IEND not
last chunk");
-
+
dis.close();
+ } catch (ArrayIndexOutOfBoundsException e) {
+ throwError("ArrayIndexOutOfBoundsException while
filtering", "ArrayIndexOutOfBoundsException while filtering");
+ } catch (NegativeArraySizeException e) {
+ throwError("NegativeArraySizeException while
filtering", "NegativeArraySizeException while filtering");
+ } catch (EOFException e) {
+ throwError("EOF Exception while filtering", "EOF
Exception while filtering");
} finally {
Closer.close(dis);
Closer.close(bis);
@@ -304,13 +313,14 @@
final Bucket out = new FileBucket(fout, false, true, false,
false, false);
try {
Logger.setupStdoutLogging(Logger.MINOR, "");
- ContentFilter.FilterOutput output =
ContentFilter.filter(data, new ArrayBucketFactory(), "image/png", new
URI("http://127.0.0.1:8888/";), null);
+ ContentFilter.FilterOutput output =
ContentFilter.filter(data, new ArrayBucketFactory(), "image/png",
+ new URI("http://127.0.0.1:8888/";), null);
BucketTools.copy(output.data, out);
- } catch(IOException e) {
+ } catch (IOException e) {
System.out.println("Bucket error?: " + e.getMessage());
- } catch(URISyntaxException e) {
+ } catch (URISyntaxException e) {
System.out.println("Internal error: " + e.getMessage());
- } catch(InvalidThresholdException e) {
+ } catch (InvalidThresholdException e) {
} finally {
data.free();
}
@@ -319,14 +329,14 @@
private void throwError(String shortReason, String reason) throws
DataFilterException {
// Throw an exception
String message = "Invalid PNG";
- if(reason != null)
+ if (reason != null)
message += ' ' + reason;
- if(shortReason != null)
+ if (shortReason != null)
message += " - " + shortReason;
- DataFilterException e = new DataFilterException(shortReason,
shortReason,
- "<p>"+message+"</p>", new
HTMLNode("p").addChild("#", message));
- if(Logger.shouldLog(Logger.NORMAL, this))
- Logger.normal(this, "Throwing "+e, e);
+ DataFilterException e = new DataFilterException(shortReason,
shortReason, "<p>" + message + "</p>",
+ new HTMLNode("p").addChild("#", message));
+ if (Logger.shouldLog(Logger.NORMAL, this))
+ Logger.normal(this, "Throwing " + e, e);
throw e;
}
}
Modified: branches/db4o/freenet/src/freenet/io/NetworkInterface.java
===================================================================
--- branches/db4o/freenet/src/freenet/io/NetworkInterface.java 2009-03-20
18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/io/NetworkInterface.java 2009-03-20
20:17:26 UTC (rev 26119)
@@ -29,10 +29,12 @@
import java.util.List;
import java.util.StringTokenizer;
+import org.tanukisoftware.wrapper.WrapperManager;
+
import freenet.io.AddressIdentifier.AddressType;
import freenet.support.Executor;
+import freenet.support.LogThresholdCallback;
import freenet.support.Logger;
-import freenet.support.LogThresholdCallback;
/**
* Replacement for {@link ServerSocket} that can handle multiple bind addresses
@@ -76,6 +78,8 @@
/** The number of running acceptors. */
private int runningAcceptors = 0;
+ private volatile boolean shutdown = false;
+
private final Executor executor;
public static NetworkInterface create(int port, String bindTo, String
allowedHosts, Executor executor, boolean ignoreUnbindableIP6) throws
IOException {
@@ -200,7 +204,11 @@
*/
public Socket accept() {
synchronized (syncObject) {
- while (acceptedSockets.size() == 0) {
+ while (acceptedSockets.size() == 0 ) {
+ if (shutdown)
+ return null;
+ if
(WrapperManager.hasShutdownHookBeenTriggered())
+ return null;
if (acceptors.size() == 0) {
return null;
}
@@ -225,6 +233,7 @@
*/
public void close() throws IOException {
IOException exception = null;
+ shutdown = true;
for (Acceptor acceptor : acceptors) {
try {
acceptor.close();
@@ -232,6 +241,9 @@
exception = ioe1;
}
}
+ synchronized (syncObject) {
+ syncObject.notifyAll();
+ }
if (exception != null) {
throw exception;
}
Modified: branches/db4o/freenet/src/freenet/l10n/freenet.l10n.de.properties
===================================================================
--- branches/db4o/freenet/src/freenet/l10n/freenet.l10n.de.properties
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/l10n/freenet.l10n.de.properties
2009-03-20 20:17:26 UTC (rev 26119)
@@ -423,8 +423,10 @@
FileOffer.succeededReceiveTitle=Datei erfolgreich empfangen
FirstTimeWizardToadlet.bandwidthLimit=Bandbreiten-Limits
FirstTimeWizardToadlet.bandwidthLimitLong=Bitte w?hlen Sie Ihren
Internet-Verbindungs-Typ und -Geschwindigkeit (Download/Upload) aus der unten
befindlichen Dropdown-Liste. Wenn Sie einen DSL-1000- oder DSL-2000-Anschluss
besitzen, w?hlen sie bitte "512+/128kbps" aus. Bei einer besseren Anbindung
k?nnen sie die Standardeinstellung ?bernehmen oder bei sehr schneller Anbindung
entsprechend ausw?hlen.
+FirstTimeWizardToadlet.browserWarning=Wir empfehlen ihnen, m?glichst ${bold}in
keinem Fall${/bold} den gleichen Browser f?r das normale Internet und Freenet
zu benutzen. B?sartige Webseiten k?nnten ?ber Angriffe auf ihre
Browser-Vergangenheit zum Beispiel herausfinden, auf welchen Freenet-basierten
Webseiten ("Freesites") sie waren und damit ihre Anonymit?t aufheben. Bitte
benutzen sie einen seperaten Browser oder zumindest ein seperates Profil, um
das Freenet-Webinterface aufzurufen.
FirstTimeWizardToadlet.browserWarningPageTitle=Sie sollten einen seperaten
Browser f?r Freenet benutzen!
FirstTimeWizardToadlet.browserWarningShort=Sie sollten einen seperaten Browser
f?r Freenet benutzen!
+FirstTimeWizardToadlet.browserWarningSuggestion=Die meisten Browser, abgesehen
vom Microsoft Internet Explorer (welcher einige Probleme mit der Erkennung von
Dateiinhalten hat, die schwer zu umgehen sind), sollten ordentlich mit Freenet
zusammenarbeiten, zum Beispiel Firefox, Opera, Safari und Lynx sollten
funktionieren. Sie sollten einen dieser Browser installieren oder ein neues
Profil in ihrem Browser erstellen, dann die aktuell URL aus der Addresszeile
kopieren und im neuen Browser oder Profil einf?gen.
FirstTimeWizardToadlet.bwlimitHigherSpeed=h?here Geschwindigkeit
FirstTimeWizardToadlet.bwlimitLowerSpeed=niedrigere Geschwindigkeit
FirstTimeWizardToadlet.chooseNodeName=Knoten-Name ben?tigt!
@@ -829,6 +831,7 @@
OpennetUserAlert.warningTitle=Warnung: Unsicherer Modus aktiviert: Ihr Knoten
wird sich mit Fremden verbinden
PNGFilter.invalidHeader=Die Datei, die Sie versucht haben abzurufen, ist keine
PNG-Datei. Sie enth?lt keinen g?ltigen PNG-Header (Dateikopf). Es k?nnte sich
um ein anderes Dateiformat handeln und Ihr Browser k?nnte etwas gef?hrliches
damit tun, deshalb wurde sie blockiert.
PNGFilter.invalidHeaderTitle=Keine PNG-Datei - ung?ltiger Header
+PacketSender.somePeersDisconnectedBlockedTooLong=Wahrscheinlich ein Bug, bitte
weiterleiten: Verbindung zu ${count} Partnern wurde zwangsweise beendet. Die
Partner haben innerhalb von 10 Minuten so wenig Pakete beantwortet, dass wir
ihnen keine neuen Pakete mehr senden k?nnen.
PacketSender.somePeersDisconnectedBlockedTooLongDetail=${count} Ihrer Partner
haben ernsthafte Probleme (weisen keine Paketnummer innerhalb von 10 Minuten
zu). Dies ist wahrscheinlich ein Bug im Code. Bitte informieren sie ?ber
unseren Bugsammler auf ${link}https://bugs.freenetproject.org/${/link} oder
?ber die Support-Mailingliste support at freenetproject.org. Bitte schreiben
sie in der Nachricht auch, welche Version von Freenet sie laufen haben. Die
betroffenen Nachbarknoten (sie sollten sie m?glicherweise nicht mitteilen, wenn
es Freunde sind) sind:
PageMaker.modeAdvanced=Erweiterte Oberfl?che
PageMaker.modeAdvancedTooltip=Eine erweiterte Oberfl?che, die nur erfahrene
Freenet-Benutzer und Entwickler werden benutzen m?ssen
@@ -1129,6 +1132,7 @@
ShortOption.parseError=Kann den Wert nicht als String-Array
(Zeichenfolgen-Feld) erkennen: ${error}
SimpleHelpToadlet.connectivityTitle=Erreichbarkeit
SimpleHelpToadlet.definitionsTitle=Definitionen
+SimpleHelpToadlet.descriptionText=Diese Seite sollte ihnen einige
Basis-Informationen bereitstellen f?r den Beginn der Arbeit mit Freenet. Es
gibt zahlreiche andere Stellen, wo sie detailiertere Informationen finden
k?nnen, zum Beispiel die offizielle Webseite http://freenetproject.org, das
offizielle Wiki http://wiki.freenetproject.org oder verschiedene Webseiten in
Freenet ("Freesites") selbst.
SimpleHelpToadlet.descriptionTitle=Beschreibung
SimpleToadletServer.advancedMode=Erweiterten Modus aktivieren?
SimpleToadletServer.advancedModeLong=Aktiviert die standardm??ige Anzeige von
erweiterten Einstellungen und Informationen in der Web-Oberfl?che. Diese
Einstellung sollte in den meisten F?llen auf "nein" stehen.
Modified: branches/db4o/freenet/src/freenet/l10n/freenet.l10n.it.properties
===================================================================
--- branches/db4o/freenet/src/freenet/l10n/freenet.l10n.it.properties
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/l10n/freenet.l10n.it.properties
2009-03-20 20:17:26 UTC (rev 26119)
@@ -57,6 +57,7 @@
BookmarkItem.bookmarkUpdatedWithLink=Il Sito ${link}${name}${/link} ? stato
aggiornato all'edizione ${edition}.
BookmarkItem.deleteBookmarkUpdateNotification=Elimina notifica
BookmarkItem.unnamedBookmark=Segnalibro Senza Nome
+BookmarkManager.defaultBookmarks=Segnalibri Predefiniti
BookmarkManager.list=Segnalibri
BookmarkManager.listLong=Lista dei freesite preferiti
BookmarkManager.malformedBookmark=Segnalibro malformato
@@ -688,7 +689,7 @@
Node.deadlockTitle=Deadlocking probabilmente dovuto ad una combinazione di JVM
e kernel che da luogo a "bug".
Node.deadlockWarning=ATTENZIONE: E' stato rilevato l'uso di Sun JVM con NPTL.
Ci? pu? produrre il "congelamento" del nodo a causa della JVM che perde un
lock. Per ovviare a tale inconveniente ? necessatio disabilitare NPTL
impostando la variabile ambientale LD_ASSUME_KERNEL=2.4.1. Le versioni pi?
recenti di Freenet installer dovrebbero gi? esserne provviste; reinstallare, o
modificare il file run.sh
(https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/run.sh).
Su alcuni sistemi pu? essere necessario installare le pthreads libraries
perch? questo funzioni. Nota che il nodo cercherebbe di riavviarsi
automaticamente se un tale deadlock occorresse, ma questa funzione non ? ancora
pienamente affidabile, e richiede tempo.
Node.disableHangCheckers=Disabilita tutti gli hang checker
-Node.disableHangCheckersLong=Disabilita tutte le funzioni hang
checkers/watchdog. Impostare per fare il profiling di Fred.
+Node.disableHangCheckersLong=Disabilita tutte le funzioni hang
checkers/watchdog. Selezionare 'vero' per fare il profiling di Fred.
Node.disablePHTLS=Disabilita HTL probabilistico
Node.disablePHTLSLong=Disabilita HTL probabilistico (in caso di dubbio, non
modificare)
Node.dropPacketEvery=Frequenza di rilascio dei pacchetti per motivi di collaudo
@@ -738,7 +739,7 @@
Node.opennetEnabled=Abilita modalit? insicura (connessioni automatiche a nodi
non fid?ti)
Node.opennetEnabledLong=Abilita Modalit? Insicura? (Opennet) Abilitando questa
opzione il nodo scambier? automaticamente referenze con altri nodi. Ci? rende
la presenza di un nodo Freenet facilmente osservabile dall'esterno, facilitando
attacchi di diversi tipi. Avendone la possibilit?, l'opzione migiore ? quella
di connettersi soltanto ad utenti conosciuti ed addifabili (Amici) e
disabilitare questa opzione.
Node.outBWLimit=Limite ampiezza di banda in uscita (bytes per secondo)
-Node.outBWLimitLong=Limite "duro" dell' ampiezza di banda in uscita
(bytes/sec); di solito il nodo non eccede questo limite
+Node.outBWLimitLong=Limite dell' ampiezza di banda in uscita (bytes/sec);
nella maggior parte dei casi il nodo non dovrebbe eccedere questo limite
Node.paddDataPackets=Aggiungere contenuto di dimensioni variabili e casuali ai
pacchetti trasmessi dal nodo? (LEGGERE L'AVVERTENZA)
Node.paddDataPacketsLong=Aggiunge contenuto ai pacchetti trasmessi dal nodo in
quantit? variabile e determinata a caso. In termini di sicurezza per il singolo
nodo, disabilitare questa opzione non ? consigliabile. Inoltre, se una grossa
porzione della rete Freenet cominciasse fare lo stesso, gli attacchi di tipo
'passivo' diverrebbero molto pi? facili. Uomo avvisato...
Node.passOpennetPeersThroughDarknet=Trasmetti referenze opennet attraverso
darknet peer
Modified: branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -579,7 +579,8 @@
// Phase 3
processJFKMessage3(payload, 4, null, replyTo, false,
true, setupType, negType);
} else {
- Logger.error(this, "Invalid phase "+packetType+" for
anonymous-initiator (we are the responder) from "+replyTo);
+ // FIXME fix this if anything to fix
+ Logger.normal(this, "Invalid phase "+packetType+" for
anonymous-initiator (we are the responder) from "+replyTo);
}
}
@@ -626,7 +627,8 @@
// Phase 4
processJFKMessage4(payload, 4, pn, replyTo, false,
true, setupType, negType);
} else {
- Logger.error(this, "Invalid phase "+packetType+" for
anonymous-initiator (we are the initiator) from "+replyTo);
+ // FIXME fix if necessary, make error??
+ Logger.normal(this, "Invalid phase "+packetType+" for
anonymous-initiator (we are the initiator) from "+replyTo);
}
}
Modified: branches/db4o/freenet/src/freenet/node/NodePinger.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodePinger.java 2009-03-20
18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/node/NodePinger.java 2009-03-20
20:17:26 UTC (rev 26119)
@@ -38,9 +38,7 @@
}
public void run() {
- // Requeue *before* so that it's accurate in any case
- node.ps.queueTimedJob(this, 200);
-
+ try {
PeerNode[] peers = null;
synchronized(node.peers) {
if((node.peers.connectedPeers == null) ||
(node.peers.connectedPeers.length == 0)) return;
@@ -50,6 +48,10 @@
// Now we don't have to care about synchronization anymore
recalculateMean(peers);
+ } finally {
+ // Requeue after to avoid exacerbating overload
+ node.ps.queueTimedJob(this, 200);
+ }
}
/** Recalculate the mean ping time */
Modified: branches/db4o/freenet/src/freenet/node/PeerManager.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PeerManager.java 2009-03-20
18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/node/PeerManager.java 2009-03-20
20:17:26 UTC (rev 26119)
@@ -990,6 +990,28 @@
PeerNode best = closestNotBackedOff;
+ /**
+ * Various things are "advisory" i.e. they are taken into
account but do not cause a request not to be routed at all:
+ * - Backoff: A node is backed off for a period after it
rejects a request;
+ * this is randomised and increases exponentially if no
requests are accepted;
+ * a longer period is imposed for timeouts after a request has
been accepted
+ * and transfer failures.
+ * - Recent failures: After various kinds of failures we impose
a timeout,
+ * until when we will try to avoid sending the same key to that
node. This is
+ * part of per-node failure tables.
+ * Combining these:
+ * - If there are nodes which are both not backed off and not
timed out, we
+ * route to whichever of those nodes is closest to the target
location. If we
+ * are still here, all nodes are either backed off or timed out.
+ * - If there are nodes which are timed out but not backed off,
choose the node
+ * whose timeout expires soonest. Hence if a single key is
requested
+ * continually, we round-robin between nodes. If we still don't
have a winner,
+ * we know all nodes are backed off.
+ * - If there are nodes which are backed off but not timed out,
choose the node
+ * which is closest to the target but is not backed off. If we
still don't have
+ * a winner, all nodes are backed off AND timed out.
+ * - Choose the backed off node whose timeout expires soonest.
+ */
if(best == null) {
if(leastRecentlyTimedOut != null) {
// FIXME downgrade to DEBUG
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2009-03-20 18:58:28 UTC
(rev 26118)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2009-03-20 20:17:26 UTC
(rev 26119)
@@ -24,17 +24,17 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1205;
+ private static final int buildNumber = 1206;
/** Oldest build of Fred we will talk to */
- private static final int oldLastGoodBuild = 1197;
- private static final int newLastGoodBuild = 1198;
+ private static final int oldLastGoodBuild = 1198;
+ private static final int newLastGoodBuild = 1206;
static final long transitionTime;
static {
final Calendar _cal =
Calendar.getInstance(TimeZone.getTimeZone("GMT"));
// year, month - 1 (or constant), day, hour, minute, second
- _cal.set( 2009, Calendar.JANUARY, 17, 0, 0, 0 );
+ _cal.set( 2009, Calendar.MARCH, 27, 0, 0, 0 );
transitionTime = _cal.getTimeInMillis();
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/AllDataMessage.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/AllDataMessage.java
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/node/fcp/AllDataMessage.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -20,14 +20,16 @@
final boolean global;
final String identifier;
final long startupTime, completionTime;
+ final String mimeType;
- public AllDataMessage(Bucket bucket, String identifier, boolean global,
long startupTime, long completionTime) {
+ public AllDataMessage(Bucket bucket, String identifier, boolean global,
long startupTime, long completionTime, String mimeType) {
this.bucket = bucket;
this.dataLength = bucket.size();
this.identifier = identifier;
this.global = global;
this.startupTime = startupTime;
this.completionTime = completionTime;
+ this.mimeType = mimeType;
}
@Override
@@ -43,6 +45,7 @@
if(global) fs.putSingle("Global", "true");
fs.put("StartupTime", startupTime);
fs.put("CompletionTime", completionTime);
+ if(mimeType!=null) fs.putSingle("Metadata.ContentType",
mimeType);
return fs;
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2009-03-20
18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2009-03-20
20:17:26 UTC (rev 26119)
@@ -285,7 +285,7 @@
binaryBlob ? returnBucket :
null);
if(finished && succeeded)
- allDataPending = new AllDataMessage(returnBucket,
identifier, global, startupTime, completionTime);
+ allDataPending = new AllDataMessage(returnBucket,
identifier, global, startupTime, completionTime, this.foundDataMimeType);
}
/**
@@ -396,12 +396,17 @@
return; // We might be called twice; ignore it
if so.
}
started = true;
+ if(!binaryBlob)
+ this.foundDataMimeType = result.getMimeType();
+ else
+ this.foundDataMimeType = BinaryBlob.MIME_TYPE;
+
if(returnType == ClientGetMessage.RETURN_TYPE_DIRECT) {
// Send all the data at once
// FIXME there should be other options
// FIXME: CompletionTime is set on finish() :
we need to give it current time here
// but it means we won't always return the same
value to clients... Does it matter ?
- adm = new AllDataMessage(returnBucket,
identifier, global, startupTime, System.currentTimeMillis());
+ adm = new AllDataMessage(returnBucket,
identifier, global, startupTime, System.currentTimeMillis(),
this.foundDataMimeType);
if(persistenceType == PERSIST_CONNECTION)
adm.setFreeOnSent();
dontFree = true;
@@ -423,10 +428,6 @@
}
progressPending = null;
this.foundDataLength = returnBucket.size();
- if(!binaryBlob)
- this.foundDataMimeType = result.getMimeType();
- else
- this.foundDataMimeType = BinaryBlob.MIME_TYPE;
this.succeeded = true;
finished = true;
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java 2009-03-20
18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java 2009-03-20
20:17:26 UTC (rev 26119)
@@ -177,6 +177,8 @@
} catch (Throwable t) {
Logger.error(this, "Caught "+t, t);
}
+ if (WrapperManager.hasShutdownHookBeenTriggered())
+ return;
try{
Thread.sleep(2000);
}catch (InterruptedException e) {}
@@ -186,7 +188,7 @@
private void realRun() throws IOException {
if(!node.isHasStarted()) return;
// Accept a connection
- Socket s = networkInterface.accept();
+ Socket s = networkInterface.accept();
FCPConnectionHandler ch = new FCPConnectionHandler(s, this);
ch.start();
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/SimpleProgressMessage.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/SimpleProgressMessage.java
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/node/fcp/SimpleProgressMessage.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -28,7 +28,7 @@
fs.put("Required", event.minSuccessfulBlocks);
fs.put("Failed", event.failedBlocks);
fs.put("FatallyFailed", event.fatallyFailedBlocks);
- fs.put("Succeeded",event.fetchedBlocks);
+ fs.put("Succeeded",event.succeedBlocks);
fs.put("FinalizedTotal", event.finalizedTotal);
fs.putSingle("Identifier", ident);
if(global) fs.putSingle("Global", "true");
@@ -46,7 +46,7 @@
}
public double getFraction() {
- return (double) event.fetchedBlocks / (double)
event.totalBlocks;
+ return (double) event.succeedBlocks / (double)
event.totalBlocks;
}
public double getMinBlocks() {
@@ -58,7 +58,7 @@
}
public double getFetchedBlocks(){
- return event.fetchedBlocks;
+ return event.succeedBlocks;
}
public double getFailedBlocks(){
Modified: branches/db4o/freenet/src/freenet/pluginmanager/PluginRespirator.java
===================================================================
--- branches/db4o/freenet/src/freenet/pluginmanager/PluginRespirator.java
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/pluginmanager/PluginRespirator.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -62,4 +62,5 @@
public PluginTalker getPluginTalker(FredPluginTalker fpt, String
pluginname, String identifier) throws PluginNotFoundException {
return new PluginTalker(fpt, node, pluginname, identifier);
}
+
}
Modified: branches/db4o/freenet/src/freenet/pluginmanager/PluginTalker.java
===================================================================
--- branches/db4o/freenet/src/freenet/pluginmanager/PluginTalker.java
2009-03-20 18:58:28 UTC (rev 26118)
+++ branches/db4o/freenet/src/freenet/pluginmanager/PluginTalker.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -10,33 +10,36 @@
import freenet.support.api.Bucket;
/**
- * @author saces
+ * @author saces, xor
*
*/
public class PluginTalker {
- Node node;
- private PluginReplySender replysender;
+ protected Node node;
+ protected PluginReplySender replysender;
- private int access;
+ protected int access;
- FredPluginFCP plugin;
+ protected FredPluginFCP plugin;
+ protected String pluginName;
- PluginTalker(FredPluginTalker fpt, Node node2, String pluginname2,
String identifier2) throws PluginNotFoundException {
+ public PluginTalker(FredPluginTalker fpt, Node node2, String
pluginname2, String connectionIdentifier) throws PluginNotFoundException {
node = node2;
+ pluginName = pluginname2;
plugin = findPlugin(pluginname2);
access = FredPluginFCP.ACCESS_DIRECT;
- replysender = new PluginReplySenderDirect(node2, fpt,
pluginname2, identifier2);
+ replysender = new PluginReplySenderDirect(node2, fpt,
pluginname2, connectionIdentifier);
}
- public PluginTalker(Node node2, FCPConnectionHandler handler, String
pluginname2, String identifier2, boolean access2) throws
PluginNotFoundException {
+ public PluginTalker(Node node2, FCPConnectionHandler handler, String
pluginname2, String connectionIdentifier, boolean access2) throws
PluginNotFoundException {
node = node2;
+ pluginName = pluginname2;
plugin = findPlugin(pluginname2);
access = access2 ? FredPluginFCP.ACCESS_FCP_FULL :
FredPluginFCP.ACCESS_FCP_RESTRICTED;
- replysender = new PluginReplySenderFCP(handler, pluginname2,
identifier2);
+ replysender = new PluginReplySenderFCP(handler, pluginname2,
connectionIdentifier);
}
- private FredPluginFCP findPlugin(String pluginname2) throws
PluginNotFoundException {
+ protected FredPluginFCP findPlugin(String pluginname2) throws
PluginNotFoundException {
Logger.normal(this, "Searching fcp plugin: " + pluginname2);
FredPluginFCP plug =
node.pluginManager.getFCPPlugin(pluginname2);
@@ -66,4 +69,5 @@
}, "FCPPlugin talk runner for " + this);
}
+
}
Property changes on:
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-25872,25900
+ /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-26118
Property changes on: branches/db4o/freenet/src/freenet/support/BloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BloomFilter.java:22002-25872,25900
+ /trunk/freenet/src/freenet/support/BloomFilter.java:22002-26118
Property changes on:
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-25872,25900
+ /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-26118
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/CSSParserTest.java (from
rev 26116, trunk/freenet/test/freenet/clients/http/filter/CSSParserTest.java)
===================================================================
--- branches/db4o/freenet/test/freenet/clients/http/filter/CSSParserTest.java
(rev 0)
+++ branches/db4o/freenet/test/freenet/clients/http/filter/CSSParserTest.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -0,0 +1,82 @@
+package freenet.clients.http.filter;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import junit.framework.TestCase;
+
+public class CSSParserTest extends TestCase {
+
+ /** CSS1 Selectors */
+ private final static String[] CSS1_SELECTOR = new String[] {
+ "E { }", //
+ "E:link { }", //
+ "E:visited { }", //
+ "E::first-line { }", //
+ "E::first-letter { }", //
+ "E.warning { }", //
+ "E#myid { }", //
+ "E F { }", //
+ "E:active { }", //
+ "E:hover { }", //
+ "E:focus { }" };
+ /** CSS2 Selectors */
+ private final static String[] CSS2_SELECTOR = new String[] {
+ "* { }", //
+ // "E[foo] { }", //
+ // "E[foo=\"bar\"] { }", //
+ // "E[foo~=\"bar\"] { }", //
+ // "E[hfoo|=\"en\"] { }", //
+ "E:first-child { }", //
+ // "E:lang(fr) { }", //
+ "E::before { }", //
+ "E::after { }", //
+ "E > F { }", //
+ "E + F { }" };
+ /** CSS3 Selectors */
+ private final static String[] CSS3_SELECTOR = new String[] {
+ // "E[foo^=\"bar\"] { }", //
+ // "E[foo$=\"bar\"] { }", //
+ // "E[foo*=\"bar\"] { }", //
+ "E:root { }", //
+ // "E:nth-child(n) { }", //
+ // "E:nth-last-child(n) { }", //
+ // "E:nth-of-type(n) { }", //
+ // "E:nth-last-of-type(n) { }", //
+ "E:last-child { }", //
+ "E:first-of-type { }", //
+ "E:last-of-type { }", //
+ "E:only-child { }", //
+ "E:only-of-type { }", //
+ "E:empty { }", //
+ "E:target { }", //
+ "E:enabled { }", //
+ "E:disabled { }", //
+ "E:checked { }", //
+ // "E:not(s) { }", //
+ // "E ~ F { }"
+ };
+
+ public void testCSS1Selector() throws IOException {
+ for (String css : CSS1_SELECTOR)
+ assertEquals("CSS1_SELECTOR", css, filter(css));
+ }
+
+ public void testCSS2Selector() throws IOException {
+ for (String css : CSS2_SELECTOR)
+ assertEquals("CSS2_SELECTOR", css, filter(css));
+ }
+
+ public void testCSS3Selector() throws IOException {
+ for (String css : CSS3_SELECTOR)
+ assertEquals("CSS3_SELECTOR", css, filter(css));
+ }
+
+ private String filter(String css) throws IOException {
+ StringWriter w = new StringWriter();
+ CSSParser p = new CSSParser(new StringReader(css), w, false,
null);
+ p.parse();
+ return w.toString();
+ }
+}
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/PNGFilterTest.java (from
rev 25899, trunk/freenet/test/freenet/clients/http/filter/PNGFilterTest.java)
===================================================================
--- branches/db4o/freenet/test/freenet/clients/http/filter/PNGFilterTest.java
(rev 0)
+++ branches/db4o/freenet/test/freenet/clients/http/filter/PNGFilterTest.java
2009-03-20 20:17:26 UTC (rev 26119)
@@ -0,0 +1,131 @@
+package freenet.clients.http.filter;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+import freenet.support.api.Bucket;
+import freenet.support.io.ArrayBucket;
+import freenet.support.io.ArrayBucketFactory;
+import freenet.support.io.BucketTools;
+
+public class PNGFilterTest extends TestCase {
+ protected static Object[][] testImages = {
+ // { image file, valid }
+ // NOT PASS { "./png/broken/scal_floating_point.png", false },
//
+ // NOT PASS { "./png/broken/splt_length_mod_10.png", false },
//
+ // NOT PASS { "./png/broken/length_ster.png", false }, //
+ // NOT PASS { "./png/broken/scal_unit_specifier.png", false },
//
+ { "./png/broken/nonconsecutive_idat.png", false }, //
+ // NOT PASS { "./png/broken/plte_too_many_entries.png", false
}, //
+ // NOT PASS { "./png/broken/private_filter_method.png", false
}, //
+ // NOT PASS { "./png/broken/truncate_idat_1.png", false }, //
+ // NOT PASS { "./png/broken/length_iend.png", false }, //
+ // NOT PASS { "./png/broken/ihdr_bit_depth.png", false }, //
+ // NOT PASS { "./png/broken/multiple_scal.png", false }, //
+ // NOT PASS { "./png/broken/chunk_type.png", false }, //
+ // NOT PASS { "./png/broken/plte_too_many_entries_2.png",
false }, //
+ // NOT PASS { "./png/broken/length_offs.png", false }, //
+ // NOT PASS { "./png/broken/truncate_idat_0.png", false }, //
+ // NOT PASS { "./png/broken/length_gama.png", false }, //
+ { "./png/broken/truncate_zlib_2.png", false }, //
+ // NOT PASS { "./png/broken/private_filter_type.png", false },
//
+ // NOT PASS { "./png/broken/sbit_after_plte.png", false }, //
+ // NOT PASS { "./png/broken/missing_idat.png", false }, //
+ // NOT PASS { "./png/broken/ihdr_filter_method.png", false },
//
+ // NOT PASS { "./png/broken/ihdr_compression_method.png",
false }, //
+ // NOT PASS { "./png/broken/pcal_after_idat.png", false }, //
+ { "./png/broken/plte_after_idat.png", false }, //
+ // NOT PASS { "./png/broken/chunk_private_critical.png", false
}, //
+ // NOT PASS { "./png/broken/splt_duplicate_name.png", false },
//
+ { "./png/broken/chunk_length.png", false }, //
+ // NOT PASS { "./png/broken/scal_after_idat.png", false }, //
+ { "./png/broken/chunk_crc.png", false }, //
+ // NOT PASS { "./png/broken/ihdr_interlace_method.png", false
}, //
+ // NOT PASS { "./png/broken/ihdr_1bit_alpha.png", false }, //
+ // NOT PASS { "./png/broken/ihdr_color_type.png", false }, //
+ // NOT PASS { "./png/broken/multiple_plte.png", false }, //
+ // NOT PASS { "./png/broken/multiple_ster.png", false }, //
+ // NOT PASS { "./png/broken/length_sbit.png", false }, //
+ // NOT PASS { "./png/broken/splt_length_mod_6.png", false }, //
+ // NOT PASS { "./png/broken/length_sbit_2.png", false }, //
+ // NOT PASS { "./png/broken/trns_bad_color_type.png", false },
//
+ // NOT PASS { "./png/broken/multiple_gama.png", false }, //
+ // NOT PASS { "./png/broken/offs_after_idat.png", false }, //
+ // NOT PASS { "./png/broken/length_ihdr.png", false }, //
+ { "./png/broken/missing_ihdr.png", false }, //
+ // NOT PASS { "./png/broken/ihdr_image_size.png", false }, //
+ // NOT PASS { "./png/broken/gama_after_plte.png", false }, //
+ { "./png/broken/multiple_ihdr.png", false }, //
+ // NOT PASS { "./png/broken/unknown_filter_type.png", false },
//
+ // NOT PASS { "./png/broken/scal_zero.png", false }, //
+ { "./png/broken/truncate_zlib.png", false }, //
+ // NOT PASS { "./png/broken/scal_negative.png", false }, //
+ // NOT PASS { "./png/broken/ster_mode.png", false }, //
+ // NOT PASS { "./png/broken/private_interlace_method.png",
false }, //
+ // NOT PASS { "./png/broken/srgb_after_idat.png", false }, //
+ // NOT PASS { "./png/broken/ster_after_idat.png", false }, //
+ // NOT PASS { "./png/broken/ihdr_16bit_palette.png", false },
//
+ // NOT PASS { "./png/broken/iccp_after_idat.png", false }, //
+ // NOT PASS { "./png/broken/plte_empty.png", false }, //
+ // NOT PASS { "./png/broken/private_compression_method.png",
false }, //
+ // NOT PASS { "./png/broken/offs_unit_specifier.png", false },
//
+ // NOT PASS { "./png/broken/plte_length_mod_three.png", false
}, //
+ // NOT PASS { "./png/broken/multiple_offs.png", false }, //
+ // NOT PASS { "./png/broken/gama_after_idat.png", false }, //
+ // NOT PASS { "./png/broken/missing_plte.png", false }, //
+ // NOT PASS { "./png/broken/splt_sample_depth.png", false }, //
+ // NOT PASS { "./png/broken/multiple_pcal.png", false }, //
+ // NOT PASS { "./png/broken/plte_in_grayscale.png", false }, //
+ { "./png/misc/pngbar.png", true }, //
+ { "./png/misc/pngnow.png", true }, //
+ { "./png/misc/pngtest.png", true }, //
+ { "./png/suite/basn2c16.png", true }, //
+ { "./png/suite/basn3p01.png", true }, //
+ { "./png/suite/basn2c08.png", true }, //
+ { "./png/suite/basn3p04.png", true }, //
+ { "./png/suite/basn0g16.png", true }, //
+ { "./png/suite/basn0g08.png", true }, //
+ { "./png/suite/basn0g02.png", true }, //
+ { "./png/suite/basn4a08.png", true }, //
+ { "./png/suite/basn6a08.png", true }, //
+ { "./png/suite/basn6a16.png", true }, //
+ { "./png/suite/basn4a16.png", true }, //
+ { "./png/suite/basn0g01.png", true }, //
+ { "./png/suite/basn3p08.png", true }, //
+ { "./png/suite/basn3p02.png", true }, //
+ { "./png/suite/basn0g04.png", true }, //
+ };
+
+ public void testSuiteTest() throws IOException {
+ PNGFilter filter = new PNGFilter(false, false, true);
+
+ for (Object[] test : testImages) {
+ String filename = (String) test[0];
+ boolean valid = (Boolean) test[1];
+ Bucket ib;
+ try {
+ ib = resourceToBucket(filename);
+ } catch (IOException e) {
+ System.out.println(filename + " not found, test
skipped");
+ continue;
+ }
+
+ try {
+ Bucket ob = filter.readFilter(ib, new
ArrayBucketFactory(), "", null, null);
+
+ assertTrue(filename + " should " + (valid ? ""
: "not ") + "be valid", valid);
+ } catch (DataFilterException dfe) {
+ assertFalse(filename + " should " + (valid ? ""
: "not ") + "be valid", valid);
+ }
+ }
+ }
+
+ protected Bucket resourceToBucket(String filename) throws IOException {
+ InputStream is = getClass().getResourceAsStream(filename);
+ if (is == null) throw new java.io.FileNotFoundException();
+ ArrayBucket ab = new ArrayBucket();
+ BucketTools.copyFrom(ab, is, Long.MAX_VALUE);
+ return ab;
+ }
+}
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_crc.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_crc.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/chunk_crc.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_length.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_length.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/chunk_length.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_private_critical.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_private_critical.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/chunk_private_critical.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_type.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/chunk_type.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/chunk_type.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/gama_after_idat.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/gama_after_idat.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/gama_after_idat.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/gama_after_plte.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/gama_after_plte.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/gama_after_plte.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/iccp_after_idat.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/iccp_after_idat.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/iccp_after_idat.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_16bit_palette.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_16bit_palette.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/ihdr_16bit_palette.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_1bit_alpha.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_1bit_alpha.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/ihdr_1bit_alpha.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_bit_depth.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_bit_depth.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/ihdr_bit_depth.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_color_type.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_color_type.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/ihdr_color_type.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_compression_method.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_compression_method.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/ihdr_compression_method.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_filter_method.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_filter_method.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/ihdr_filter_method.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_image_size.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_image_size.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/ihdr_image_size.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_interlace_method.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ihdr_interlace_method.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/ihdr_interlace_method.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_gama.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_gama.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/length_gama.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_iend.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_iend.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/length_iend.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_ihdr.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_ihdr.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/length_ihdr.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_offs.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_offs.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/length_offs.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_sbit.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_sbit.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/length_sbit.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_sbit_2.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_sbit_2.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/length_sbit_2.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_ster.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/length_ster.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/length_ster.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_idat.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_idat.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/missing_idat.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_ihdr.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_ihdr.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/missing_ihdr.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_plte.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/missing_plte.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/missing_plte.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_gama.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_gama.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/multiple_gama.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_ihdr.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_ihdr.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/multiple_ihdr.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_offs.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_offs.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/multiple_offs.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_pcal.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_pcal.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/multiple_pcal.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_plte.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_plte.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/multiple_plte.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_scal.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_scal.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/multiple_scal.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_ster.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/multiple_ster.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/multiple_ster.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/nonconsecutive_idat.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/nonconsecutive_idat.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/nonconsecutive_idat.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/offs_after_idat.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/offs_after_idat.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/offs_after_idat.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/offs_unit_specifier.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/offs_unit_specifier.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/offs_unit_specifier.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/pcal_after_idat.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/pcal_after_idat.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/pcal_after_idat.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_after_idat.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_after_idat.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/plte_after_idat.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_empty.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_empty.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/plte_empty.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_in_grayscale.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_in_grayscale.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/plte_in_grayscale.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_length_mod_three.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_length_mod_three.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/plte_length_mod_three.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_too_many_entries.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_too_many_entries.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/plte_too_many_entries.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_too_many_entries_2.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/plte_too_many_entries_2.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/plte_too_many_entries_2.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_compression_method.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_compression_method.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/private_compression_method.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_filter_method.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_filter_method.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/private_filter_method.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_filter_type.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_filter_type.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/private_filter_type.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_interlace_method.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/private_interlace_method.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/private_interlace_method.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/sbit_after_plte.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/sbit_after_plte.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/sbit_after_plte.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_after_idat.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_after_idat.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/scal_after_idat.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_floating_point.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_floating_point.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/scal_floating_point.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_negative.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_negative.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/scal_negative.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_unit_specifier.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_unit_specifier.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/scal_unit_specifier.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_zero.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/scal_zero.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/scal_zero.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_duplicate_name.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_duplicate_name.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/splt_duplicate_name.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_length_mod_10.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_length_mod_10.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/splt_length_mod_10.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_length_mod_6.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_length_mod_6.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/splt_length_mod_6.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_sample_depth.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/splt_sample_depth.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/splt_sample_depth.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/srgb_after_idat.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/srgb_after_idat.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/srgb_after_idat.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ster_after_idat.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ster_after_idat.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/ster_after_idat.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ster_mode.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/ster_mode.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/ster_mode.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/trns_bad_color_type.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/trns_bad_color_type.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/trns_bad_color_type.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_idat_0.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_idat_0.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/truncate_idat_0.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_idat_1.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_idat_1.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/truncate_idat_1.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_zlib.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_zlib.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/truncate_zlib.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_zlib_2.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/truncate_zlib_2.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/truncate_zlib_2.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/unknown_filter_type.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/broken/unknown_filter_type.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/broken/unknown_filter_type.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngbar.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngbar.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/misc/pngbar.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngnow.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngnow.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/misc/pngnow.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngtest.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/misc/pngtest.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/misc/pngtest.png)
===================================================================
(Binary files differ)
Deleted: branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/README
===================================================================
--- trunk/freenet/test/freenet/clients/http/filter/png/suite/README
2009-03-05 23:01:33 UTC (rev 25899)
+++ branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/README
2009-03-20 20:17:26 UTC (rev 26119)
@@ -1,85 +0,0 @@
-
-pngsuite
---------
-(c) Willem van Schaik, 1999
-
-Permission to use, copy, and distribute these images for any purpose and
-without fee is hereby granted.
-
-These 15 images are part of the much larger PngSuite test-set of
-images, available for developers of PNG supporting software. The
-complete set, available at http:/www.schaik.com/pngsuite/, contains
-a variety of images to test interlacing, gamma settings, ancillary
-chunks, etc.
-
-The images in this directory represent the basic PNG color-types:
-grayscale (1-16 bit deep), full color (8 or 16 bit), paletted
-(1-8 bit) and grayscale or color images with alpha channel. You
-can use them to test the proper functioning of PNG software.
-
- filename depth type
- ------------ ------ --------------
- basn0g01.png 1-bit grayscale
- basn0g02.png 2-bit grayscale
- basn0g04.png 4-bit grayscale
- basn0g08.png 8-bit grayscale
- basn0g16.png 16-bit grayscale
- basn2c08.png 8-bit truecolor
- basn2c16.png 16-bit truecolor
- basn3p01.png 1-bit paletted
- basn3p02.png 2-bit paletted
- basn3p04.png 4-bit paletted
- basn3p08.png 8-bit paletted
- basn4a08.png 8-bit gray with alpha
- basn4a16.png 16-bit gray with alpha
- basn6a08.png 8-bit RGBA
- basn6a16.png 16-bit RGBA
-
-Here is the correct result of typing "pngtest -m *.png" in
-this directory:
-
-Testing basn0g01.png: PASS (524 zero samples)
- Filter 0 was used 32 times
-Testing basn0g02.png: PASS (448 zero samples)
- Filter 0 was used 32 times
-Testing basn0g04.png: PASS (520 zero samples)
- Filter 0 was used 32 times
-Testing basn0g08.png: PASS (3 zero samples)
- Filter 1 was used 9 times
- Filter 4 was used 23 times
-Testing basn0g16.png: PASS (1 zero samples)
- Filter 1 was used 1 times
- Filter 2 was used 31 times
-Testing basn2c08.png: PASS (6 zero samples)
- Filter 1 was used 5 times
- Filter 4 was used 27 times
-Testing basn2c16.png: PASS (592 zero samples)
- Filter 1 was used 1 times
- Filter 4 was used 31 times
-Testing basn3p01.png: PASS (512 zero samples)
- Filter 0 was used 32 times
-Testing basn3p02.png: PASS (448 zero samples)
- Filter 0 was used 32 times
-Testing basn3p04.png: PASS (544 zero samples)
- Filter 0 was used 32 times
-Testing basn3p08.png: PASS (4 zero samples)
- Filter 0 was used 32 times
-Testing basn4a08.png: PASS (32 zero samples)
- Filter 1 was used 1 times
- Filter 4 was used 31 times
-Testing basn4a16.png: PASS (64 zero samples)
- Filter 0 was used 1 times
- Filter 1 was used 2 times
- Filter 2 was used 1 times
- Filter 4 was used 28 times
-Testing basn6a08.png: PASS (160 zero samples)
- Filter 1 was used 1 times
- Filter 4 was used 31 times
-Testing basn6a16.png: PASS (1072 zero samples)
- Filter 1 was used 4 times
- Filter 4 was used 28 times
-libpng passes test
-
-Willem van Schaik
-<willem at schaik.com>
-October 1999
Copied: branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/README
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/README)
===================================================================
--- branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/README
(rev 0)
+++ branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/README
2009-03-20 20:17:26 UTC (rev 26119)
@@ -0,0 +1,85 @@
+
+pngsuite
+--------
+(c) Willem van Schaik, 1999
+
+Permission to use, copy, and distribute these images for any purpose and
+without fee is hereby granted.
+
+These 15 images are part of the much larger PngSuite test-set of
+images, available for developers of PNG supporting software. The
+complete set, available at http:/www.schaik.com/pngsuite/, contains
+a variety of images to test interlacing, gamma settings, ancillary
+chunks, etc.
+
+The images in this directory represent the basic PNG color-types:
+grayscale (1-16 bit deep), full color (8 or 16 bit), paletted
+(1-8 bit) and grayscale or color images with alpha channel. You
+can use them to test the proper functioning of PNG software.
+
+ filename depth type
+ ------------ ------ --------------
+ basn0g01.png 1-bit grayscale
+ basn0g02.png 2-bit grayscale
+ basn0g04.png 4-bit grayscale
+ basn0g08.png 8-bit grayscale
+ basn0g16.png 16-bit grayscale
+ basn2c08.png 8-bit truecolor
+ basn2c16.png 16-bit truecolor
+ basn3p01.png 1-bit paletted
+ basn3p02.png 2-bit paletted
+ basn3p04.png 4-bit paletted
+ basn3p08.png 8-bit paletted
+ basn4a08.png 8-bit gray with alpha
+ basn4a16.png 16-bit gray with alpha
+ basn6a08.png 8-bit RGBA
+ basn6a16.png 16-bit RGBA
+
+Here is the correct result of typing "pngtest -m *.png" in
+this directory:
+
+Testing basn0g01.png: PASS (524 zero samples)
+ Filter 0 was used 32 times
+Testing basn0g02.png: PASS (448 zero samples)
+ Filter 0 was used 32 times
+Testing basn0g04.png: PASS (520 zero samples)
+ Filter 0 was used 32 times
+Testing basn0g08.png: PASS (3 zero samples)
+ Filter 1 was used 9 times
+ Filter 4 was used 23 times
+Testing basn0g16.png: PASS (1 zero samples)
+ Filter 1 was used 1 times
+ Filter 2 was used 31 times
+Testing basn2c08.png: PASS (6 zero samples)
+ Filter 1 was used 5 times
+ Filter 4 was used 27 times
+Testing basn2c16.png: PASS (592 zero samples)
+ Filter 1 was used 1 times
+ Filter 4 was used 31 times
+Testing basn3p01.png: PASS (512 zero samples)
+ Filter 0 was used 32 times
+Testing basn3p02.png: PASS (448 zero samples)
+ Filter 0 was used 32 times
+Testing basn3p04.png: PASS (544 zero samples)
+ Filter 0 was used 32 times
+Testing basn3p08.png: PASS (4 zero samples)
+ Filter 0 was used 32 times
+Testing basn4a08.png: PASS (32 zero samples)
+ Filter 1 was used 1 times
+ Filter 4 was used 31 times
+Testing basn4a16.png: PASS (64 zero samples)
+ Filter 0 was used 1 times
+ Filter 1 was used 2 times
+ Filter 2 was used 1 times
+ Filter 4 was used 28 times
+Testing basn6a08.png: PASS (160 zero samples)
+ Filter 1 was used 1 times
+ Filter 4 was used 31 times
+Testing basn6a16.png: PASS (1072 zero samples)
+ Filter 1 was used 4 times
+ Filter 4 was used 28 times
+libpng passes test
+
+Willem van Schaik
+<willem at schaik.com>
+October 1999
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g01.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g01.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn0g01.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g02.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g02.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn0g02.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g04.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g04.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn0g04.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g08.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g08.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn0g08.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g16.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn0g16.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn0g16.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn2c08.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn2c08.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn2c08.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn2c16.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn2c16.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn2c16.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p01.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p01.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn3p01.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p02.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p02.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn3p02.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p04.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p04.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn3p04.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p08.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn3p08.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn3p08.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn4a08.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn4a08.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn4a08.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn4a16.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn4a16.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn4a16.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn6a08.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn6a08.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn6a08.png)
===================================================================
(Binary files differ)
Deleted:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn6a16.png
===================================================================
(Binary files differ)
Copied:
branches/db4o/freenet/test/freenet/clients/http/filter/png/suite/basn6a16.png
(from rev 25899,
trunk/freenet/test/freenet/clients/http/filter/png/suite/basn6a16.png)
===================================================================
(Binary files differ)
Property changes on:
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-25872,25900
+ /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-26118
