cvs commit: xml-axis/java/src/org/apache/axis/transport/http HTTPSender.java

[dims]

dims        2002/06/18 09:05:01

  Modified:    java/src/org/apache/axis/transport/http HTTPSender.java
  Log:
  Added support for https.nonProxyHosts as per Dale McDonald's request in Bugzilla Bug 
7373 additional comments.
  
  Revision  Changes    Path
  1.68      +8 -1      xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java
  
  Index: HTTPSender.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- HTTPSender.java   17 Jun 2002 00:33:49 -0000      1.67
  +++ HTTPSender.java   18 Jun 2002 16:05:01 -0000      1.68
  @@ -191,6 +191,7 @@
           // Get https.proxyXXX settings
           String tunnelHost = AxisEngine.getGlobalProperty("https.proxyHost");
           String tunnelPortStr = AxisEngine.getGlobalProperty("https.proxyPort");
  +        String nonProxyHosts = AxisEngine.getGlobalProperty("https.nonProxyHosts");
   
           // Use http.proxyXXX settings if https.proxyXXX is not set
           if (tunnelHost == null) {
  @@ -199,6 +200,12 @@
           if (tunnelPortStr == null) {
               tunnelPortStr = AxisEngine.getGlobalProperty("http.proxyPort");
           }
  +        if (nonProxyHosts == null) {
  +            nonProxyHosts = AxisEngine.getGlobalProperty("http.nonProxyHosts");
  +        }
  +
  +        boolean hostInNonProxyList = isHostInNonProxyList(host, nonProxyHosts);
  +
           try {
   
               // Use java reflection to create a secure socket.
  @@ -234,7 +241,7 @@
                   factory = getDefaultMethod.invoke(null, new Object[]{});
               Object sslSocket = null;
   
  -            if ((tunnelHost == null) || tunnelHost.equals("")) {
  +            if ((tunnelHost == null) || tunnelHost.equals("") || 
hostInNonProxyList) {
                   // direct SSL connection
                   sslSocket = createSocketMethod.invoke(factory,
                           new Object[]{host,new Integer(port)});