larryi 2003/12/11 18:44:34 Modified: coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteRequest.java Log: Port Remy's update for the useBodyEncodingForURI attribute. Revision Changes Path 1.28 +32 -4 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java Index: CoyoteConnector.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- CoyoteConnector.java 19 Nov 2003 23:23:18 -0000 1.27 +++ CoyoteConnector.java 12 Dec 2003 02:44:34 -0000 1.28 @@ -357,6 +357,12 @@ private String URIEncoding = null; + /** + * URI encoding as body. + */ + private boolean useBodyEncodingForURI = false; + + // ------------------------------------------------------------- Properties @@ -972,6 +978,28 @@ public void setURIEncoding(String URIEncoding) { this.URIEncoding = URIEncoding; + + } + + + /** + * Return the true if the entity body encoding should be used for the URI. + */ + public boolean getUseBodyEncodingForURI() { + + return (this.useBodyEncodingForURI); + + } + + + /** + * Set if the entity body encoding should be used for the URI. + * + * @param useBodyEncodingForURI The new value for the flag. + */ + public void setUseBodyEncodingForURI(boolean useBodyEncodingForURI) { + + this.useBodyEncodingForURI = useBodyEncodingForURI; } 1.35 +14 -6 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java Index: CoyoteRequest.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- CoyoteRequest.java 11 Dec 2003 22:55:48 -0000 1.34 +++ CoyoteRequest.java 12 Dec 2003 02:44:34 -0000 1.35 @@ -443,7 +443,7 @@ /** * Associated Catalina connector. */ - protected Connector connector; + protected CoyoteConnector connector; /** * Return the Connector through which this Request was received. @@ -458,7 +458,7 @@ * @param connector The new connector */ public void setConnector(Connector connector) { - this.connector = connector; + this.connector = (CoyoteConnector) connector; } /** @@ -1927,11 +1927,19 @@ Parameters parameters = coyoteRequest.getParameters(); String enc = coyoteRequest.getCharacterEncoding(); + boolean useBodyEncodingForURI = connector.getUseBodyEncodingForURI(); if (enc != null) { parameters.setEncoding(enc); + if (useBodyEncodingForURI) { + parameters.setQueryStringEncoding(enc); + } } else { parameters.setEncoding (org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING); + if (useBodyEncodingForURI) { + parameters.setQueryStringEncoding + (org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING); + } } parameters.handleQueryParameters();
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]