Print this page


Split Close
Expand all
Collapse all
          --- old/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
          +++ new/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
↓ open down ↓ 38 lines elided ↑ open up ↑
  39   39  import java.net.URL;
  40   40  import java.net.SocketPermission;
  41   41  import java.net.UnknownHostException;
  42   42  import java.net.InetSocketAddress;
  43   43  import java.net.URI;
  44   44  import java.net.Proxy;
  45   45  import java.net.ProxySelector;
  46   46  import java.util.StringTokenizer;
  47   47  import java.util.Iterator;
  48   48  import java.security.Permission;
       49 +import sun.net.NetworkClient;
  49   50  import sun.net.www.MessageHeader;
  50   51  import sun.net.www.MeteredStream;
  51   52  import sun.net.www.URLConnection;
  52   53  import sun.net.www.protocol.http.HttpURLConnection;
  53   54  import sun.net.ftp.FtpClient;
  54   55  import sun.net.ftp.FtpProtocolException;
  55   56  import sun.net.ProgressSource;
  56   57  import sun.net.ProgressMonitor;
  57   58  import sun.net.www.ParseUtil;
  58   59  import sun.security.action.GetPropertyAction;
↓ open down ↓ 36 lines elided ↑ open up ↑
  95   96      String host;
  96   97      String pathname;
  97   98      String filename;
  98   99      String fullpath;
  99  100      int port;
 100  101      static final int NONE = 0;
 101  102      static final int ASCII = 1;
 102  103      static final int BIN = 2;
 103  104      static final int DIR = 3;
 104  105      int type = NONE;
 105      -    /* Redefine timeouts from java.net.URLConnection as we nee -1 to mean
      106 +    /* Redefine timeouts from java.net.URLConnection as we need -1 to mean
 106  107       * not set. This is to ensure backward compatibility.
 107  108       */
 108      -    private int connectTimeout = -1;
 109      -    private int readTimeout = -1;
      109 +    private int connectTimeout = NetworkClient.DEFAULT_CONNECT_TIMEOUT;;
      110 +    private int readTimeout = NetworkClient.DEFAULT_READ_TIMEOUT;;
 110  111  
 111  112      /**
 112  113       * For FTP URLs we need to have a special InputStream because we
 113  114       * need to close 2 sockets after we're done with it :
 114  115       *  - The Data socket (for the file).
 115  116       *   - The command socket (FtpClient).
 116  117       * Since that's the only class that needs to see that, it is an inner class.
 117  118       */
 118  119      protected class FtpInputStream extends FilterInputStream {
 119  120          FtpClient ftp;
↓ open down ↓ 523 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX