From: Dave B. <bla...@us...> - 2013-02-23 12:20:26
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21923/src/org/sblim/cimclient/internal/http Modified Files: Tag: Experimental HttpClient.java Log Message: 2619 Host should contain port when not 5988/5989 Index: HttpClient.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/HttpClient.java,v retrieving revision 1.12.2.33 retrieving revision 1.12.2.34 diff -u -d -r1.12.2.33 -r1.12.2.34 --- HttpClient.java 23 Jan 2013 20:53:46 -0000 1.12.2.33 +++ HttpClient.java 23 Feb 2013 12:20:24 -0000 1.12.2.34 @@ -67,6 +67,7 @@ * 3524050 2012-06-06 blaschke-oss Improve WWW-Authenticate in HTTPClient.java * 3557283 2012-11-05 blaschke-oss Print full response when get EOF from CIMOM * 3601894 2013-01-23 blaschke-oss Enhance HTTP and CIM-XML tracing + * 2619 2013-02-22 blaschke-oss Host should contain port when not 5988/5989 */ package org.sblim.cimclient.internal.http; @@ -565,7 +566,17 @@ this.iMethod.write(out); - this.iRequestHeaders.addField("Host", this.iUrl.getHost()); + StringBuilder hostField = new StringBuilder(this.iUrl.getHost()); + if (this.iUrl.getPort() > 0 + && ((WBEMConstants.HTTPS.equalsIgnoreCase(this.iUrl.getScheme()) && this.iUrl + .getPort() != WBEMConstants.DEFAULT_WBEM_SECURE_PORT) || (WBEMConstants.HTTP + .equalsIgnoreCase(this.iUrl.getScheme()) && this.iUrl + .getPort() != WBEMConstants.DEFAULT_WBEM_PORT))) { + hostField.append(':'); + hostField.append(this.iUrl.getPort()); + } + this.iRequestHeaders.addField("Host", hostField.toString()); + if (this.iServerOutput != null) this.iRequestHeaders.addField( "Content-length", "" + this.iServerOutput.size()); else this.iRequestHeaders.addField("Content-length", "0"); |