Changeset cc7a802


Ignore:
Timestamp:
Sep 24, 2011 9:49:19 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
bbd34be
Parents:
ce5acb4
Message:
  • HTTPClient: Fix error page not appearing, broken by

StreamForwarder? change

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java

    rce5acb4 rcc7a802  
    7777     *  @param sockList may be null. Caller must add i2ps to the list! It will be removed here on completion.
    7878     *                               Will synchronize on slock when removing.
    79      *  @param onTimeout may be null
     79     *  @param onTimeout May be null. If non-null and no data (except initial data) was sent or received,
     80                         it will be run before closing s.
    8081     */
    8182    public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData,
     
    385386                    // http://techtavern.wordpress.com/2008/07/16/whats-this-ioexception-write-end-dead/
    386387                    //out.flush();
    387                     out.close();
     388                    // DON'T close if we have a timeout job and we haven't received anything,
     389                    // or else the timeout job can't write the error message to the stream.
     390                    // close() above will close it after the timeout job is run.
     391                    if (!(onTimeout != null && (!_toI2P) && totalReceived <= 0))
     392                        out.close();
     393                    else if (_log.shouldLog(Log.INFO))
     394                        _log.info(direction + ": not closing so we can write the error message");
    388395                } catch (IOException ioe) {
    389396                    if (_log.shouldLog(Log.WARN))
  • history.txt

    rce5acb4 rcc7a802  
     12011-09-24 zzz
     2  * HTTPClient: Fix error page not appearing, broken by
     3                StreamForwarder change
     4  * HTTPServer: More mime types not to compress
     5
    162011-09-23 kytv
    27  * Update Italian, Spanish, and Swedish translations
  • router/java/src/net/i2p/router/RouterVersion.java

    rce5acb4 rcc7a802  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 20;
     21    public final static long BUILD = 21;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.