cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java CoyoteResponse.java

2004-08-29 Thread yoavs 
yoavs   2004/08/29 08:33:45

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
CoyoteResponse.java
  Log:
  Don't use enum as a variable name, it's a JDK 1.5 keyword.
  
  Revision  ChangesPath
  1.38  +4 -4  
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.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- CoyoteRequest.java24 Feb 2004 08:54:29 -  1.37
  +++ CoyoteRequest.java29 Aug 2004 15:33:45 -  1.38
  @@ -899,9 +899,9 @@
   if (parameterMap.isLocked())
   return parameterMap;
   
  -Enumeration enum = getParameterNames();
  -while (enum.hasMoreElements()) {
  -String name = enum.nextElement().toString();
  +Enumeration paramNames = getParameterNames();
  +while (paramNames.hasMoreElements()) {
  +String name = paramNames.nextElement().toString();
   String[] values = getParameterValues(name);
   parameterMap.put(name, values);
   }
  
  
  
  1.39  +4 -4  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- CoyoteResponse.java   20 Jun 2004 20:58:31 -  1.38
  +++ CoyoteResponse.java   29 Aug 2004 15:33:45 -  1.39
  @@ -736,10 +736,10 @@
*/
   public String[] getHeaderValues(String name) {
   
  -Enumeration enum = coyoteResponse.getMimeHeaders().values(name);
  +Enumeration headerValues = coyoteResponse.getMimeHeaders().values(name);
   Vector result = new Vector();
  -while (enum.hasMoreElements()) {
  -result.addElement(enum.nextElement());
  +while (headerValues.hasMoreElements()) {
  +result.addElement(headerValues.nextElement());
   }
   String[] resultArray = new String[result.size()];
   result.copyInto(resultArray);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2003-12-11 Thread markt 
markt   2003/12/11 14:55:48

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Port of fix for bug 3098. Include the pathInfo when a relative path is used to get 
a request dispatcher.
  
  Revision  ChangesPath
  1.34  +17 -7 
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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- CoyoteRequest.java4 Dec 2003 13:55:53 -   1.33
  +++ CoyoteRequest.java11 Dec 2003 22:55:48 -  1.34
  @@ -1091,13 +1091,23 @@
   if (servletPath == null)
   servletPath = getServletPath();
   
  -int pos = servletPath.lastIndexOf('/');
  +// Add the path info, if there is any
  +String pathInfo = getPathInfo();
  +String requestPath = null;
  +
  +if (pathInfo == null) {
  +requestPath = servletPath;
  +} else {
  +requestPath = servletPath + pathInfo;
  +}
  +
  +int pos = requestPath.lastIndexOf('/');
   String relative = null;
   if (pos >= 0) {
   relative = RequestUtil.normalize
  -(servletPath.substring(0, pos + 1) + path);
  +(requestPath.substring(0, pos + 1) + path);
   } else {
  -relative = RequestUtil.normalize(servletPath + path);
  +relative = RequestUtil.normalize(requestPath + path);
   }
   
   return (context.getServletContext().getRequestDispatcher(relative));
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2003-12-04 Thread remm 
remm2003/12/04 05:55:54

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Port patch.
  - Don't attempt to parse the parameters if the request body wasn't fully read.
  - Should fix bug 25193.
  
  Revision  ChangesPath
  1.33  +8 -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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- CoyoteRequest.java20 Nov 2003 21:13:40 -  1.32
  +++ CoyoteRequest.java4 Dec 2003 13:55:53 -   1.33
  @@ -1956,8 +1956,10 @@
   } else {
   formData = new byte[len];
   }
  -readPostBody(formData, len);
  -parameters.processParameters(formData, 0, len);
  +int actualLen = readPostBody(formData, len);
  +if (actualLen == len) {
  +parameters.processParameters(formData, 0, len);
  +}
   } catch (Throwable t) {
   ; // Ignore
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2003-11-20 Thread larryi 
larryi  2003/11/20 13:13:41

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  Reverting previous port, since it was reverted in Tomcat 5.
  
  Revision  ChangesPath
  1.32  +4 -8  
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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- CoyoteRequest.java20 Nov 2003 16:11:37 -  1.31
  +++ CoyoteRequest.java20 Nov 2003 21:13:40 -  1.32
  @@ -1186,10 +1186,6 @@
   public void setCharacterEncoding(String enc)
   throws UnsupportedEncodingException {
   
  -if (requestParametersParsed || usingReader || usingInputStream) {
  -return;
  -}
  -
   // Ensure that the specified encoding is valid
   byte buffer[] = new byte[1];
   buffer[0] = (byte) 'a';
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2003-11-20 Thread larryi 
larryi  2003/11/20 08:11:37

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  Port Jan Luehe's patch to prevent setCharacterEncoding from changing
  the encoding once it's too late.
  
  Revision  ChangesPath
  1.31  +8 -4  
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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- CoyoteRequest.java18 Sep 2003 16:13:51 -  1.30
  +++ CoyoteRequest.java20 Nov 2003 16:11:37 -  1.31
  @@ -1186,6 +1186,10 @@
   public void setCharacterEncoding(String enc)
   throws UnsupportedEncodingException {
   
  +if (requestParametersParsed || usingReader || usingInputStream) {
  +return;
  +}
  +
   // Ensure that the specified encoding is valid
   byte buffer[] = new byte[1];
   buffer[0] = (byte) 'a';
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2003-04-05 Thread remm 
remm2003/04/05 00:19:40

  Modified:coyote/src/java/org/apache/coyote/tomcat4 Tag: coyote_10
CoyoteRequest.java
  Log:
  - Port patch to Tomcat 4.1.x (fix params restore with FORM auth).
  - Submitted by Jeff Tulley.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.28.2.1  +5 -5  
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.28
  retrieving revision 1.28.2.1
  diff -u -r1.28 -r1.28.2.1
  --- CoyoteRequest.java24 Nov 2002 11:56:15 -  1.28
  +++ CoyoteRequest.java5 Apr 2003 08:19:39 -   1.28.2.1
  @@ -1262,7 +1262,7 @@
* @param values Corresponding values for this request parameter
*/
   public void addParameter(String name, String values[]) {
  -// Not used
  +coyoteRequest.getParameters().addParameterValues(name, values);
   }
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-07-11 Thread remm 

remm2002/07/11 01:33:23

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Port code from the old HTTP connector: parse out ";charset=...".
  - Should fix bug 10674.
  
  Revision  ChangesPath
  1.25  +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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- CoyoteRequest.java3 Jul 2002 17:43:24 -   1.24
  +++ CoyoteRequest.java11 Jul 2002 08:33:22 -  1.25
  @@ -1925,7 +1925,16 @@
   if (!getMethod().equalsIgnoreCase("POST"))
   return;
   
  -if (!("application/x-www-form-urlencoded".equals(getContentType(
  +String contentType = getContentType();
  +if (contentType == null)
  +contentType = "";
  +int semicolon = contentType.indexOf(';');
  +if (semicolon >= 0) {
  +contentType = contentType.substring(0, semicolon).trim();
  +} else {
  +contentType = contentType.trim();
  +}
  +if (!("application/x-www-form-urlencoded".equals(contentType)))
   return;
   
   int len = getContentLength();
  @@ -1943,7 +1952,6 @@
   readPostBody(formData, len);
   parameters.processParameters(formData, 0, len);
   } catch (Throwable t) {
  -t.printStackTrace(); // TEMP
   ; // Ignore
   }
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-07-03 Thread remm 

remm2002/07/03 10:43:24

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Fix bug 10123.
  
  Revision  ChangesPath
  1.24  +5 -5  
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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- CoyoteRequest.java28 May 2002 14:24:31 -  1.23
  +++ CoyoteRequest.java3 Jul 2002 17:43:24 -   1.24
  @@ -1047,7 +1047,7 @@
*/
   public String getRemoteHost() {
   if (remoteHost == null) {
  -if (connector.getEnableLookups()) {
  +if (!connector.getEnableLookups()) {
   remoteHost = getRemoteAddr();
   } else if (socket != null) {
   InetAddress inet = socket.getInetAddress();
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java CoyoteResponse.java

2002-05-14 Thread remm 

remm02/05/14 21:24:45

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
CoyoteResponse.java
  Log:
  - Clear the facades at the end of the processing of the request.
  
  Revision  ChangesPath
  1.21  +13 -5 
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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CoyoteRequest.java18 Apr 2002 18:12:46 -  1.20
  +++ CoyoteRequest.java15 May 2002 04:24:45 -  1.21
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.20 2002/04/18 18:12:46 remm Exp $
  - * $Revision: 1.20 $
  - * $Date: 2002/04/18 18:12:46 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.21 2002/05/15 04:24:45 remm Exp $
  + * $Revision: 1.21 $
  + * $Date: 2002/05/15 04:24:45 $
*
* 
*
  @@ -124,7 +124,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.20 $ $Date: 2002/04/18 18:12:46 $
  + * @version $Revision: 1.21 $ $Date: 2002/05/15 04:24:45 $
*/
   
   public class CoyoteRequest
  @@ -412,6 +412,11 @@
   parameterMap.setLocked(false);
   parameterMap.clear();
   
  +if (facade != null) {
  +facade.clear();
  +facade = null;
  +}
  +
   }
   
   
  @@ -507,13 +512,16 @@
   /**
* The facade associated with this request.
*/
  -protected HttpRequestFacade facade = new HttpRequestFacade(this);
  +protected HttpRequestFacade facade = null;
   
   /**
* Return the ServletRequest for which this object
* is the facade.  This method must be implemented by a subclass.
*/
   public ServletRequest getRequest() {
  +if (facade == null) {
  +facade = new HttpRequestFacade(this);
  +}
   return (facade);
   }
   
  
  
  
  1.15  +15 -5 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- CoyoteResponse.java   9 Apr 2002 17:26:07 -   1.14
  +++ CoyoteResponse.java   15 May 2002 04:24:45 -  1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
 1.14 2002/04/09 17:26:07 costin Exp $
  - * $Revision: 1.14 $
  - * $Date: 2002/04/09 17:26:07 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
 1.15 2002/05/15 04:24:45 remm Exp $
  + * $Revision: 1.15 $
  + * $Date: 2002/05/15 04:24:45 $
*
* 
*
  @@ -116,7 +116,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.14 $ $Date: 2002/04/09 17:26:07 $
  + * @version $Revision: 1.15 $ $Date: 2002/05/15 04:24:45 $
*/
   
   public class CoyoteResponse
  @@ -306,6 +306,7 @@
* preparation for reuse of this object.
*/
   public void recycle() {
  +
   outputBuffer.recycle();
   usingOutputStream = false;
   usingWriter = false;
  @@ -313,6 +314,12 @@
   included = false;
   error = false;
   cookies.clear();
  +
  +if (facade != null) {
  +facade.clear();
  +facade = null;
  +}
  +
   }
   
   
  @@ -399,13 +406,16 @@
   /**
* The facade associated with this response.
*/
  -protected HttpResponseFacade facade = new HttpResponseFacade(this);
  +protected HttpResponseFacade facade = null;
   
   /**
* Return the ServletResponse for which this object
* is the facade.
*/
   public ServletResponse getResponse() {
  +if (facade == null) {
  +facade = new HttpResponseFacade(this);
  +}
   return (facade);
   }
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-04-09 Thread remm 

remm02/04/09 03:22:17

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - RequestHost and requestAddr must be recycled.
  
  Revision  ChangesPath
  1.19  +6 -4  
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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- CoyoteRequest.java9 Apr 2002 09:23:12 -   1.18
  +++ CoyoteRequest.java9 Apr 2002 10:22:17 -   1.19
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.18 2002/04/09 09:23:12 remm Exp $
  - * $Revision: 1.18 $
  - * $Date: 2002/04/09 09:23:12 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.19 2002/04/09 10:22:17 remm Exp $
  + * $Revision: 1.19 $
  + * $Date: 2002/04/09 10:22:17 $
*
* 
*
  @@ -124,7 +124,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.18 $ $Date: 2002/04/09 09:23:12 $
  + * @version $Revision: 1.19 $ $Date: 2002/04/09 10:22:17 $
*/
   
   public class CoyoteRequest
  @@ -397,6 +397,8 @@
   locales.clear();
   localesParsed = false;
   secure = false;
  +remoteAddr = null;
  +remoteHost = null;
   
   attributes.clear();
   notes.clear();
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-04-09 Thread remm 

remm02/04/09 02:23:13

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Use the action to have the protocol handler compute the remote host.
  
  Revision  ChangesPath
  1.18  +12 -11
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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- CoyoteRequest.java7 Apr 2002 21:11:17 -   1.17
  +++ CoyoteRequest.java9 Apr 2002 09:23:12 -   1.18
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.17 2002/04/07 21:11:17 remm Exp $
  - * $Revision: 1.17 $
  - * $Date: 2002/04/07 21:11:17 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.18 2002/04/09 09:23:12 remm Exp $
  + * $Revision: 1.18 $
  + * $Date: 2002/04/09 09:23:12 $
*
* 
*
  @@ -98,6 +98,7 @@
   
   import org.apache.tomcat.util.http.Parameters;
   
  +import org.apache.coyote.ActionCode;
   import org.apache.coyote.Request;
   
   import org.apache.catalina.Connector;
  @@ -123,7 +124,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.17 $ $Date: 2002/04/07 21:11:17 $
  + * @version $Revision: 1.18 $ $Date: 2002/04/09 09:23:12 $
*/
   
   public class CoyoteRequest
  @@ -1032,14 +1033,14 @@
*/
   public String getRemoteHost() {
   if (remoteHost == null) {
  -if (socket != null) {
  -if (connector.getEnableLookups()) {
  -InetAddress inet = socket.getInetAddress();
  -remoteHost = inet.getHostName();
  -} else {
  -remoteHost = getRemoteAddr();
  -}
  +if (connector.getEnableLookups()) {
  +remoteHost = getRemoteAddr();
  +} else if (socket != null) {
  +InetAddress inet = socket.getInetAddress();
  +remoteHost = inet.getHostName();
   } else {
  +coyoteRequest.action
  +(ActionCode.ACTION_REQ_HOST_ATTRIBUTE, coyoteRequest);
   remoteHost = coyoteRequest.remoteHost().toString();
   }
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-04-05 Thread remm 

remm02/04/05 19:06:32

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Fix an off-by-one bug in the construction of the request dispatcher path.
  
  Revision  ChangesPath
  1.16  +5 -5  
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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CoyoteRequest.java3 Apr 2002 15:57:11 -   1.15
  +++ CoyoteRequest.java6 Apr 2002 03:06:32 -   1.16
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.15 2002/04/03 15:57:11 remm Exp $
  - * $Revision: 1.15 $
  - * $Date: 2002/04/03 15:57:11 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.16 2002/04/06 03:06:32 remm Exp $
  + * $Revision: 1.16 $
  + * $Date: 2002/04/06 03:06:32 $
*
* 
*
  @@ -123,7 +123,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.15 $ $Date: 2002/04/03 15:57:11 $
  + * @version $Revision: 1.16 $ $Date: 2002/04/06 03:06:32 $
*/
   
   public class CoyoteRequest
  @@ -1063,7 +1063,7 @@
   
   int pos = servletPath.lastIndexOf('/');
   String relative = null;
  -if (pos > 0) {
  +if (pos >= 0) {
   relative = RequestUtil.normalize
   (servletPath.substring(0, pos + 1) + path);
   } else {
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-03-27 Thread remm 

remm02/03/27 19:41:53

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Apply patch submitted by Ryan Lubke <[EMAIL PROTECTED]>:
When dealing with preferred locales from a client (Accept-Language),
  the CoyoteRequest class (org.apache.coyote.tomcat4) doesn't correctly
  handle locales with variants (i.e. en-IE-EURO).
  RFC 2616 states that the following for language-range of
  Accept-Language:
language-range = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" )
  
  Revision  ChangesPath
  1.14  +15 -5 
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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CoyoteRequest.java24 Mar 2002 18:48:48 -  1.13
  +++ CoyoteRequest.java28 Mar 2002 03:41:53 -  1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.13 2002/03/24 18:48:48 remm Exp $
  - * $Revision: 1.13 $
  - * $Date: 2002/03/24 18:48:48 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.14 2002/03/28 03:41:53 remm Exp $
  + * $Revision: 1.14 $
  + * $Date: 2002/03/28 03:41:53 $
*
* 
*
  @@ -122,7 +122,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.13 $ $Date: 2002/03/24 18:48:48 $
  + * @version $Revision: 1.14 $ $Date: 2002/03/28 03:41:53 $
*/
   
   public class CoyoteRequest
  @@ -1999,17 +1999,27 @@
   // Extract the language and country for this entry
   String language = null;
   String country = null;
  +String variant = null;
   int dash = entry.indexOf('-');
   if (dash < 0) {
   language = entry;
   country = "";
  +variant = "";
   } else {
   language = entry.substring(0, dash);
   country = entry.substring(dash + 1);
  +int vDash = country.indexOf('-');
  +if (vDash > 0) {
  +String cTemp = country.substring(0, vDash);
  +variant = country.substring(vDash + 1);
  +country = cTemp;
  +} else {
  +variant = "";
  +}
   }
   
   // Add a new Locale to the list of Locales for this quality level
  -Locale locale = new Locale(language, country);
  +Locale locale = new Locale(language, country, variant);
   Double key = new Double(-quality);  // Reverse the order
   ArrayList values = (ArrayList) locales.get(key);
   if (values == null) {
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-03-24 Thread remm 

remm02/03/24 10:48:48

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Don't parse post body unless content-type is URL FORM encoded.
  - Fix bug 7413.
  
  Revision  ChangesPath
  1.13  +7 -4  
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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CoyoteRequest.java22 Mar 2002 03:54:33 -  1.12
  +++ CoyoteRequest.java24 Mar 2002 18:48:48 -  1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.12 2002/03/22 03:54:33 remm Exp $
  - * $Revision: 1.12 $
  - * $Date: 2002/03/22 03:54:33 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.13 2002/03/24 18:48:48 remm Exp $
  + * $Revision: 1.13 $
  + * $Date: 2002/03/24 18:48:48 $
*
* 
*
  @@ -122,7 +122,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.12 $ $Date: 2002/03/22 03:54:33 $
  + * @version $Revision: 1.13 $ $Date: 2002/03/24 18:48:48 $
*/
   
   public class CoyoteRequest
  @@ -1875,6 +1875,9 @@
   return;
   
   if (!getMethod().equalsIgnoreCase("POST"))
  +return;
  +
  +if (!("application/x-www-form-urlencoded".equals(getContentType(
   return;
   
   int len = getContentLength();
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-03-21 Thread remm 

remm02/03/21 19:54:33

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Fix bug 8646: dispatcher.forward() is confused when using
special servlet mapping URLs.
  - Will be ported to the various other branches once I test that change more.
  
  Revision  ChangesPath
  1.12  +14 -5 
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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CoyoteRequest.java19 Mar 2002 20:34:41 -  1.11
  +++ CoyoteRequest.java22 Mar 2002 03:54:33 -  1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.11 2002/03/19 20:34:41 remm Exp $
  - * $Revision: 1.11 $
  - * $Date: 2002/03/19 20:34:41 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.12 2002/03/22 03:54:33 remm Exp $
  + * $Revision: 1.12 $
  + * $Date: 2002/03/22 03:54:33 $
*
* 
*
  @@ -122,7 +122,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.11 $ $Date: 2002/03/19 20:34:41 $
  + * @version $Revision: 1.12 $ $Date: 2002/03/22 03:54:33 $
*/
   
   public class CoyoteRequest
  @@ -1035,7 +1035,16 @@
   String servletPath = (String) getAttribute(Globals.SERVLET_PATH_ATTR);
   if (servletPath == null)
   servletPath = getServletPath();
  -String relative = RequestUtil.normalize(servletPath + "/../" + path);
  +
  +int pos = servletPath.lastIndexOf('/');
  +String relative = null;
  +if (pos > 0) {
  +relative = RequestUtil.normalize
  +(servletPath.substring(0, pos + 1) + path);
  +} else {
  +relative = RequestUtil.normalize(servletPath + path);
  +}
  +
   return (context.getServletContext().getRequestDispatcher(relative));
   
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-03-14 Thread remm 

remm02/03/14 12:53:00

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Implement the new decoded request URI field accessors.
  
  Revision  ChangesPath
  1.10  +24 -4 
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CoyoteRequest.java11 Mar 2002 07:14:22 -  1.9
  +++ CoyoteRequest.java14 Mar 2002 20:52:59 -  1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.9 2002/03/11 07:14:22 remm Exp $
  - * $Revision: 1.9 $
  - * $Date: 2002/03/11 07:14:22 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.10 2002/03/14 20:52:59 remm Exp $
  + * $Revision: 1.10 $
  + * $Date: 2002/03/14 20:52:59 $
*
* 
*
  @@ -122,7 +122,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.9 $ $Date: 2002/03/11 07:14:22 $
  + * @version $Revision: 1.10 $ $Date: 2002/03/14 20:52:59 $
*/
   
   public class CoyoteRequest
  @@ -1325,6 +1325,26 @@
*/
   public void setRequestURI(String uri) {
   // Not used
  +}
  +
  +
  +/**
  + * Set the decoded request URI.
  + * 
  + * @param uri The decoded request URI
  + */
  +public void setDecodedRequestURI(String uri) {
  +// Not used
  +}
  +
  +
  +/**
  + * Get the decoded request URI.
  + * 
  + * @return the URL decoded request URI
  + */
  +public String getDecodedRequestURI() {
  +return (coyoteRequest.decodedURI().toString());
   }
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-03-10 Thread remm 

remm02/03/10 23:14:22

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - The query string should return null if it's empty.
  
  Revision  ChangesPath
  1.9   +10 -5 
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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CoyoteRequest.java9 Mar 2002 05:47:45 -   1.8
  +++ CoyoteRequest.java11 Mar 2002 07:14:22 -  1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.8 2002/03/09 05:47:45 remm Exp $
  - * $Revision: 1.8 $
  - * $Date: 2002/03/09 05:47:45 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.9 2002/03/11 07:14:22 remm Exp $
  + * $Revision: 1.9 $
  + * $Date: 2002/03/11 07:14:22 $
*
* 
*
  @@ -122,7 +122,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.8 $ $Date: 2002/03/09 05:47:45 $
  + * @version $Revision: 1.9 $ $Date: 2002/03/11 07:14:22 $
*/
   
   public class CoyoteRequest
  @@ -1507,7 +1507,12 @@
* Return the query string associated with this request.
*/
   public String getQueryString() {
  -return (coyoteRequest.queryString().toString());
  +String queryString = coyoteRequest.queryString().toString();
  +if (queryString.equals("")) {
  +return (null);
  +} else {
  +return queryString;
  +}
   }
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-03-08 Thread remm 

remm02/03/08 21:47:45

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Recycle the authorization.
  
  Revision  ChangesPath
  1.8   +5 -4  
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CoyoteRequest.java9 Mar 2002 03:35:23 -   1.7
  +++ CoyoteRequest.java9 Mar 2002 05:47:45 -   1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.7 2002/03/09 03:35:23 remm Exp $
  - * $Revision: 1.7 $
  - * $Date: 2002/03/09 03:35:23 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.8 2002/03/09 05:47:45 remm Exp $
  + * $Revision: 1.8 $
  + * $Date: 2002/03/09 05:47:45 $
*
* 
*
  @@ -122,7 +122,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.7 $ $Date: 2002/03/09 03:35:23 $
  + * @version $Revision: 1.8 $ $Date: 2002/03/09 05:47:45 $
*/
   
   public class CoyoteRequest
  @@ -369,6 +369,7 @@
   context = null;
   wrapper = null;
   
  +authorization = null;
   authType = null;
   usingInputStream = false;
   usingReader = false;
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2002-03-07 Thread remm 

remm02/03/07 21:17:54

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
  Log:
  - Implement request facade for Catalina.
  
  Revision  ChangesPath
  1.3   +231 -37   
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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CoyoteRequest.java31 Jan 2002 18:42:30 -  1.2
  +++ CoyoteRequest.java8 Mar 2002 05:17:54 -   1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.2 2002/01/31 18:42:30 remm Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/01/31 18:42:30 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
 1.3 2002/03/08 05:17:54 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/03/08 05:17:54 $
*
* 
*
  @@ -66,6 +66,7 @@
   
   
   import java.io.InputStream;
  +import java.io.InputStreamReader;
   import java.io.IOException;
   import java.io.BufferedReader;
   import java.io.UnsupportedEncodingException;
  @@ -104,6 +105,7 @@
   import org.apache.catalina.connector.HttpRequestFacade;
   
   import org.apache.catalina.util.Enumerator;
  +import org.apache.catalina.util.ParameterMap;
   import org.apache.catalina.util.RequestUtil;
   import org.apache.catalina.util.StringManager;
   
  @@ -112,7 +114,8 @@
* Wrapper object for the Coyote request.
*
* @author Remy Maucherat
  - * @version $Revision: 1.2 $ $Date: 2002/01/31 18:42:30 $
  + * @author Craig R. McClanahan
  + * @version $Revision: 1.3 $ $Date: 2002/03/08 05:17:54 $
*/
   
   public class CoyoteRequest
  @@ -134,6 +137,7 @@
*/
   public void setCoyoteRequest(Request coyoteRequest) {
   this.coyoteRequest = coyoteRequest;
  +inputStream.setRequest(coyoteRequest);
   }
   
   /**
  @@ -196,7 +200,31 @@
   
   
   /**
  + * The parsed parameters for this request.  This is populated only if
  + * parameter information is requested via one of the
  + * getParameter() family of method calls.  The key is the
  + * parameter name, while the value is a String array of values for this
  + * parameter.
  + * 
  + * IMPLEMENTATION NOTE - Once the parameters for a
  + * particular request are parsed and stored here, they are not modified.
  + * Therefore, application level access to the parameters need not be
  + * synchronized.
  + */
  +protected ParameterMap parameters = null;
  +
  +
  +/**
  + * Authentication type.
  + */
  +protected String authType = null;
  +
  +
  +/**
* Reader.
  + * Note: At the moment, no attempt is being made at recycling the reader,
  + * but this could be implemented in the future, using a design like the one
  + * used for the output buffer.
*/
   protected BufferedReader reader = null;
   
  @@ -204,7 +232,55 @@
   /**
* ServletInputStream.
*/
  -protected ServletInputStream stream = null;
  +protected CoyoteInputStream inputStream = new CoyoteInputStream();
  +
  +
  +/**
  + * Using stream flag.
  + */
  +protected boolean usingInputStream = false;
  +
  +
  +/**
  + * Context path.
  + */
  +protected String contextPath = "";
  +
  +
  +/**
  + * Path info.
  + */
  +protected String pathInfo = null;
  +
  +
  +/**
  + * Servlet path.
  + */
  +protected String servletPath = null;
  +
  +
  +/**
  + * Query string.
  + */
  +protected String queryString = null;
  +
  +
  +/**
  + * User principal.
  + */
  +protected Principal userPrincipal = null;
  +
  +
  +/**
  + * Session parsed flag.
  + */
  +protected boolean sessionParsed = false;
  +
  +
  +/**
  + * Request parameters parsed flag.
  + */
  +protected boolean requestParametersParsed = false;
   
   
   // - Public Methods
  @@ -215,6 +291,29 @@
* preparation for reuse of this object.
*/
   public void recycle() {
  +
  +context = null;
  +wrapper = null;
  +
  +authType = null;
  +usingInputStream = false;
  +contextPath = "";
  +pathInfo = null;
  +servletPath = null;
  +queryString = null;
  +reader = null;
  +userPrincipal = null;
  +sessionParsed = false;
  +requestParametersParsed = false;
  +
  +attributes.clear();
  +notes.clear();