From: Steve L. <st...@us...> - 2006-06-08 15:36:28
|
Update of /cvsroot/smartfrog/projects/alpine/prototype/M32/src/java/org/smartfrog/projects/alpine/transport/http In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32518/alpine/prototype/M32/src/java/org/smartfrog/projects/alpine/transport/http Modified Files: HttpTransmitter.java Log Message: validate URIs Index: HttpTransmitter.java =================================================================== RCS file: /cvsroot/smartfrog/projects/alpine/prototype/M32/src/java/org/smartfrog/projects/alpine/transport/http/HttpTransmitter.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** HttpTransmitter.java 6 Jun 2006 16:11:53 -0000 1.9 --- HttpTransmitter.java 8 Jun 2006 15:34:49 -0000 1.10 *************** *** 35,38 **** --- 35,39 ---- import org.smartfrog.projects.alpine.faults.SoapException; import org.smartfrog.projects.alpine.http.HttpConstants; + import org.smartfrog.projects.alpine.http.HttpBinder; import org.smartfrog.projects.alpine.om.soap11.MessageDocument; import org.smartfrog.projects.alpine.om.soap11.SoapMessageParser; *************** *** 147,157 **** //get the content type and drop anything following a semicolon String contentType = getResponseContentType(method); ! final int semicolon = contentType.indexOf(';'); ! if (semicolon >= 0) { ! contentType = contentType.substring(0, semicolon); ! } ! boolean responseIsXml = HttpConstants.CONTENT_TYPE_TEXT_XML ! .equals(contentType) ! || HttpConstants.CONTENT_TYPE_SOAP_XML.equals(contentType); final boolean requestFailed = statusCode != HttpStatus.SC_OK; --- 148,153 ---- //get the content type and drop anything following a semicolon String contentType = getResponseContentType(method); ! contentType= HttpBinder.extractBaseContentType(contentType); ! boolean responseIsXml = HttpBinder.isValidSoapContentType(contentType); final boolean requestFailed = statusCode != HttpStatus.SC_OK; |