Author: ssmaeklu
Date: 2007-06-10 19:29:51 +0200 (Sun, 10 Jun 2007)
New Revision: 5300

Modified:
   
trunk/httpclient-api/src/main/java/no/schibstedsok/searchportal/http/HTTPClient.java
Log:
Fixed bug causing host header to present in the request even if unset.


Modified: 
trunk/httpclient-api/src/main/java/no/schibstedsok/searchportal/http/HTTPClient.java
===================================================================
--- 
trunk/httpclient-api/src/main/java/no/schibstedsok/searchportal/http/HTTPClient.java
        2007-06-09 21:03:31 UTC (rev 5299)
+++ 
trunk/httpclient-api/src/main/java/no/schibstedsok/searchportal/http/HTTPClient.java
        2007-06-10 17:29:51 UTC (rev 5300)
@@ -407,8 +407,24 @@
         }
 
         protected URLConnection openConnection(final URL u) throws IOException 
{
-            final URL url = new URL(u.getProtocol(), physicalHost, 
u.getPort(), u.getFile());
 
+            URL url;
+
+            if ("jar".equals(u.getProtocol())) {
+                // Doesn't work with jar urls?
+                // url = new URL(u.getProtocol(), physicalHost, u.getPort(), 
u.getFile());
+
+                final URL containedURL = new URL(u.getFile());
+
+                url = new URL(
+                        "jar:" 
+                        + containedURL.toString().replace("://" + 
containedURL.getHost(), "://" + physicalHost));
+            } else {
+                url = new URL(u.getProtocol(), physicalHost, u.getPort(), 
u.getFile());
+
+            }
+
+
             final URLConnection connection = url.openConnection();
 
             connection.addRequestProperty("host", u.getHost());
@@ -428,7 +444,7 @@
         private final String hostHeader;
 
         public HostHeaderStreamHandler(final String hostHeader) {
-            this.hostHeader = hostHeader;
+            this.hostHeader = hostHeader != null ? hostHeader : "";
         }
 
         protected URLConnection openConnection(final URL u) throws IOException 
{

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to