cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject svn commit: r930827 - /cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java
Date Mon, 05 Apr 2010 08:16:13 GMT
Author: jasha
Date: Mon Apr  5 08:16:13 2010
New Revision: 930827

URL: http://svn.apache.org/viewvc?rev=930827&view=rev
Log:
COCOON-2278 Make SOAPHelper use https, not just http, patch by Nico Verwer

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java?rev=930827&r1=930826&r2=930827&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java
Mon Apr  5 08:16:13 2010
@@ -26,6 +26,7 @@ import org.apache.commons.httpclient.Hea
 import org.apache.commons.httpclient.HttpConnection;
 import org.apache.commons.httpclient.HttpState;
 import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.excalibur.source.SourceUtil;
 import org.xml.sax.InputSource;
 
@@ -72,13 +73,14 @@ public class SOAPHelper {
 
             String host = this.url.getHost();
             int port = this.url.getPort();
+            Protocol protocol = Protocol.getProtocol(this.url.getProtocol());
 
             if (System.getProperty("http.proxyHost") != null) {
                 String proxyHost = System.getProperty("http.proxyHost");
                 int proxyPort = Integer.parseInt(System.getProperty("http.proxyPort"));
-                conn = new HttpConnection(proxyHost, proxyPort, host, port);
+                conn = new HttpConnection(proxyHost, proxyPort, host, null, port, protocol);
             } else {
-                conn = new HttpConnection(host, port);
+                conn = new HttpConnection(host, port, protocol);
             }
 
             PostMethod method = new PostMethod(this.url.getFile());



Mime
View raw message