Menu
▾
▴
[jboss-cvs] contrib/jetty/src/main/org/mortbay/http ChunkableInputStream.java ChunkableOutputStream.java ContextLoader.java HashUserRealm.java HttpConnection.java HttpContext.java HttpEncoding.java HttpException.java HttpFields.java HttpHandler.java HttpListener.java HttpMessage.java HttpRequest.java HttpResponse.java HttpServer.java JDBCUserRealm.java JsseListener.java MultiPartResponse.java NCSARequestLog.java OutputObserver.java PathMap.java RequestLog.java SecurityConstraint.java SocketListener.java SunJsseListener.java UserPrincipal.java UserRealm.java Version.java
User: jules_gosnell
Date: 02/06/20 15:54:26
Modified: jetty/src/main/org/mortbay/http ChunkableInputStream.java
ChunkableOutputStream.java ContextLoader.java
HashUserRealm.java HttpConnection.java
HttpContext.java HttpEncoding.java
HttpException.java HttpFields.java HttpHandler.java
HttpListener.java HttpMessage.java HttpRequest.java
HttpResponse.java HttpServer.java
JDBCUserRealm.java JsseListener.java
MultiPartResponse.java NCSARequestLog.java
OutputObserver.java PathMap.java RequestLog.java
SecurityConstraint.java SocketListener.java
SunJsseListener.java UserPrincipal.java
UserRealm.java Version.java
Log:
update to Jetty-4.0.3
Revision Changes Path
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/ChunkableInputStream.java
Index: ChunkableInputStream.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/ChunkableInputStream.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChunkableInputStream.java 22 May 2002 11:56:40 -0000 1.10
+++ ChunkableInputStream.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: ChunkableInputStream.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: ChunkableInputStream.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ---------------------------------------------------------------------------
package org.mortbay.http;
@@ -29,7 +29,7 @@
* explicitly if an instance is used by multiple threads.
*
* @see org.mortbay.util.LineInput
- * @version $Id: ChunkableInputStream.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: ChunkableInputStream.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class ChunkableInputStream extends FilterInputStream
1.11 +11 -6 contrib/jetty/src/main/org/mortbay/http/ChunkableOutputStream.java
Index: ChunkableOutputStream.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/ChunkableOutputStream.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChunkableOutputStream.java 22 May 2002 11:56:40 -0000 1.10
+++ ChunkableOutputStream.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: ChunkableOutputStream.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: ChunkableOutputStream.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ---------------------------------------------------------------------------
package org.mortbay.http;
@@ -33,7 +33,7 @@
* This class is not synchronized and should be synchronized
* explicitly if an instance is used by multiple threads.
*
- * @version $Id: ChunkableOutputStream.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: ChunkableOutputStream.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins
*/
public class ChunkableOutputStream extends FilterOutputStream
@@ -343,6 +343,9 @@
/* ------------------------------------------------------------ */
public void write(int b) throws IOException
{
+ if (out==null)
+ return;
+
if (!_written)
{
_written=true;
@@ -358,6 +361,9 @@
/* ------------------------------------------------------------ */
public void write(byte b[]) throws IOException
{
+ if (out==null)
+ return;
+
if (!_written)
{
_written=true;
@@ -372,6 +378,9 @@
/* ------------------------------------------------------------ */
public void write(byte b[], int off, int len) throws IOException
{
+ if (out==null)
+ return;
+
if (!_written)
{
_written=true;
@@ -495,7 +504,6 @@
/* ------------------------------------------------------------ */
/** Close the stream.
- * In chunking mode, the underlying stream is not closed.
* All filters are closed and discarded.
* @exception IOException
*/
@@ -511,9 +519,6 @@
notify(OutputObserver.__CLOSING);
flush(true);
out=null;
- if (!_chunking)
- _realOut.close();
-
notify(OutputObserver.__CLOSED);
}
catch (IOException e)
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/ContextLoader.java
Index: ContextLoader.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/ContextLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ContextLoader.java 22 May 2002 11:56:40 -0000 1.10
+++ ContextLoader.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ContextLoader.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: ContextLoader.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -32,7 +32,7 @@
* parent loader. Java2 compliant loading, where the parent loader
* always has priority, can be selected with the setJava2Complient method.
*
- * @version $Id: ContextLoader.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: ContextLoader.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class ContextLoader extends URLClassLoader
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/HashUserRealm.java
Index: HashUserRealm.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HashUserRealm.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HashUserRealm.java 22 May 2002 11:56:40 -0000 1.10
+++ HashUserRealm.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: HashUserRealm.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HashUserRealm.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ---------------------------------------------------------------------------
package org.mortbay.http;
@@ -28,7 +28,7 @@
/** HashMapped User Realm.
*
* @see Password
- * @version $Id: HashUserRealm.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: HashUserRealm.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class HashUserRealm extends HashMap implements UserRealm
1.13 +36 -30 contrib/jetty/src/main/org/mortbay/http/HttpConnection.java
Index: HttpConnection.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpConnection.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpConnection.java 22 May 2002 11:56:40 -0000 1.12
+++ HttpConnection.java 20 Jun 2002 22:54:25 -0000 1.13
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: HttpConnection.java,v 1.12 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HttpConnection.java,v 1.13 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -35,7 +35,7 @@
*
* @see HttpListener
* @see HttpServer
- * @version $Id: HttpConnection.java,v 1.12 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: HttpConnection.java,v 1.13 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class HttpConnection
@@ -616,39 +616,45 @@
// if we have no content or encoding,
// and no content length
int status = _response.getStatus();
- if (!_outputStream.isWritten() &&
- !_response.containsField(HttpFields.__TransferEncoding) &&
+ if (status!=HttpResponse.__304_Not_Modified &&
+ status!=HttpResponse.__204_No_Content &&
+ !_outputStream.isWritten() &&
!_response.containsField(HttpFields.__ContentLength) &&
- status!=HttpResponse.__304_Not_Modified &&
- status!=HttpResponse.__204_No_Content)
+ !_response.containsField(HttpFields.__TransferEncoding))
{
- // Persist only if idle threads are available.
if(_persistent)
{
- switch (_dotVersion)
+ if (status>=300 && status<400)
{
- case 0:
- {
- _close=true;
- _persistent=false;
- _response.setField(HttpFields.__Connection,
- HttpFields.__Close);
- }
- break;
- case 1:
- {
- // force chunking on.
- _response.setField(HttpFields.__TransferEncoding,
- HttpFields.__Chunked);
- _outputStream.setChunking();
- }
- break;
-
- default:
- _close=true;
- _response.setField(HttpFields.__Connection,
- HttpFields.__Close);
- break;
+ _response.setField(HttpFields.__ContentLength,"0");
+ }
+ else
+ {
+ switch (_dotVersion)
+ {
+ case 0:
+ {
+ _close=true;
+ _persistent=false;
+ _response.setField(HttpFields.__Connection,
+ HttpFields.__Close);
+ }
+ break;
+ case 1:
+ {
+ // force chunking on.
+ _response.setField(HttpFields.__TransferEncoding,
+ HttpFields.__Chunked);
+ _outputStream.setChunking();
+ }
+ break;
+
+ default:
+ _close=true;
+ _response.setField(HttpFields.__Connection,
+ HttpFields.__Close);
+ break;
+ }
}
}
else
1.13 +3 -4 contrib/jetty/src/main/org/mortbay/http/HttpContext.java
Index: HttpContext.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpContext.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpContext.java 30 May 2002 15:50:22 -0000 1.12
+++ HttpContext.java 20 Jun 2002 22:54:25 -0000 1.13
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: HttpContext.java,v 1.12 2002/05/30 15:50:22 gregwilkins Exp $
+// $Id: HttpContext.java,v 1.13 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -55,7 +55,7 @@
* @see HttpServer
* @see HttpHandler
* @see org.mortbay.jetty.servlet.ServletHttpContext
- * @version $Id: HttpContext.java,v 1.12 2002/05/30 15:50:22 gregwilkins Exp $
+ * @version $Id: HttpContext.java,v 1.13 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class HttpContext implements LifeCycle
@@ -1328,7 +1328,7 @@
finally
{
UserPrincipal user = request.getUserPrincipal();
- if (_userRealm!=null && user!=null)
+ if (_userRealm!=null)
_userRealm.dissassociate(user);
}
}
@@ -1460,7 +1460,6 @@
thread.setContextClassLoader(lastContextLoader);
_started=true;
}
-
}
/* ------------------------------------------------------------ */
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/HttpEncoding.java
Index: HttpEncoding.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpEncoding.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpEncoding.java 22 May 2002 11:56:40 -0000 1.10
+++ HttpEncoding.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: HttpEncoding.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HttpEncoding.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/HttpException.java
Index: HttpException.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpException.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpException.java 22 May 2002 11:56:40 -0000 1.10
+++ HttpException.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: HttpException.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HttpException.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -11,7 +11,7 @@
/* ------------------------------------------------------------ */
/** Exception for known HTTP error status.
*
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
* @author Greg Wilkins (gregw)
*/
public class HttpException extends IOException
1.11 +6 -3 contrib/jetty/src/main/org/mortbay/http/HttpFields.java
Index: HttpFields.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpFields.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpFields.java 22 May 2002 11:56:40 -0000 1.10
+++ HttpFields.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: HttpFields.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HttpFields.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ---------------------------------------------------------------------------
package org.mortbay.http;
@@ -48,7 +48,7 @@
* This class is not synchronized as it is expected that modifications
* will only be performed by a single thread.
*
- * @version $Id: HttpFields.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: HttpFields.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class HttpFields
@@ -579,6 +579,7 @@
while (e.hasMoreElements())
{
String value=(String)e.nextElement();
+
tok=new QuotedStringTokenizer(value,separators,false,false);
if (tok.hasMoreElements())
return true;
@@ -592,7 +593,9 @@
{
if (!hasMoreElements())
throw new NoSuchElementException();
- return tok.nextElement();
+ String next = (String) tok.nextElement();
+ if (next!=null)next=next.trim();
+ return next;
}
};
}
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/HttpHandler.java
Index: HttpHandler.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpHandler.java 22 May 2002 11:56:40 -0000 1.10
+++ HttpHandler.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: HttpHandler.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HttpHandler.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -20,7 +20,7 @@
* </UL>
* @see org.mortbay.http.HttpServer
* @see org.mortbay.http.HttpContext
- * @version $Id: HttpHandler.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: HttpHandler.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public interface HttpHandler extends LifeCycle
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/HttpListener.java
Index: HttpListener.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpListener.java 22 May 2002 11:56:40 -0000 1.10
+++ HttpListener.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: HttpListener.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HttpListener.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -13,7 +13,7 @@
/** HTTP Listener.
*
* @see HttpConnection
- * @version $Id: HttpListener.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: HttpListener.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public interface HttpListener extends LifeCycle
1.11 +4 -2 contrib/jetty/src/main/org/mortbay/http/HttpMessage.java
Index: HttpMessage.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpMessage.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpMessage.java 22 May 2002 11:56:40 -0000 1.10
+++ HttpMessage.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: HttpMessage.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HttpMessage.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ---------------------------------------------------------------------------
package org.mortbay.http;
@@ -45,7 +45,7 @@
* within a full webapplication.
* </UL>
*
- * @version $Id: HttpMessage.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: HttpMessage.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
@@ -769,6 +769,8 @@
_characterEncoding=null;
_mimeType=null;
_facade=null; // XXX could do better here????
+ if (_attributes!=null)
+ _attributes.clear();
}
/* ------------------------------------------------------------ */
1.11 +7 -6 contrib/jetty/src/main/org/mortbay/http/HttpRequest.java
Index: HttpRequest.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpRequest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpRequest.java 22 May 2002 11:56:40 -0000 1.10
+++ HttpRequest.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: HttpRequest.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HttpRequest.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ---------------------------------------------------------------------------
package org.mortbay.http;
@@ -45,7 +45,7 @@
* synchronized if it is used by multiple threads.
*
* @see HttpResponse
- * @version $Id: HttpRequest.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: HttpRequest.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class HttpRequest
@@ -840,7 +840,7 @@
int version=0;
Cookie cookie=null;
- Enumeration enum =_header.getValues(HttpFields.__Cookie,";");
+ Enumeration enum =_header.getValues(HttpFields.__Cookie,",;");
while (enum.hasMoreElements())
{
try
@@ -953,10 +953,10 @@
*/
void recycle(HttpConnection connection)
{
- super.recycle(connection);
_method=null;
_uri=null;
_host=null;
+ _hostPort=null;
_port=0;
_te=null;
if (_parameters!=null)
@@ -964,8 +964,9 @@
_paramsExtracted=false;
_handled=false;
_cookies=null;
- if (_attributes!=null)
- _attributes.clear();
+ _timeStamp=0;
+ _userPrincipal=null;
+ super.recycle(connection);
}
/* ------------------------------------------------------------ */
1.11 +12 -16 contrib/jetty/src/main/org/mortbay/http/HttpResponse.java
Index: HttpResponse.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpResponse.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpResponse.java 22 May 2002 11:56:40 -0000 1.10
+++ HttpResponse.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: HttpResponse.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HttpResponse.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -26,7 +26,7 @@
* synchronized if it is used by multiple threads.
*
* @see HttpRequest
- * @version $Id: HttpResponse.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: HttpResponse.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class HttpResponse
@@ -237,19 +237,16 @@
if (_dotVersion>=0)
{
- String status=_status+" ";
- if (Code.verbose())
- Code.debug("writeHeaders: ",status);
_state=__MSG_BAD;
- synchronized(writer)
- {
- writer.write(_version);
- writer.write(' ');
- writer.write(status);
- writer.write(getReason());
- writer.write(HttpFields.__CRLF);
- _header.write(writer);
- }
+ writer.write(_version);
+ writer.write(' ');
+ writer.write('0'+((_status/100)%10));
+ writer.write('0'+((_status/10)%10));
+ writer.write('0'+(_status%10));
+ writer.write(' ');
+ writer.write(getReason());
+ writer.write(HttpFields.__CRLF);
+ _header.write(writer);
}
_state=__MSG_SENDING;
}
@@ -512,9 +509,8 @@
{
super.recycle(connection);
_status=__200_OK;
- _version=__HTTP_1_0;
- _state=__MSG_EDITABLE;
_reason=null;
+ _httpContext=null;
}
/* ------------------------------------------------------------ */
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/HttpServer.java
Index: HttpServer.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpServer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpServer.java 22 May 2002 11:56:40 -0000 1.10
+++ HttpServer.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: HttpServer.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: HttpServer.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -55,7 +55,7 @@
* @see HttpConnection
* @see HttpListener
* @see org.mortbay.jetty.Server
- * @version $Id: HttpServer.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: HttpServer.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class HttpServer implements LifeCycle
1.9 +12 -10 contrib/jetty/src/main/org/mortbay/http/JDBCUserRealm.java
Index: JDBCUserRealm.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/JDBCUserRealm.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JDBCUserRealm.java 22 May 2002 11:56:40 -0000 1.8
+++ JDBCUserRealm.java 20 Jun 2002 22:54:25 -0000 1.9
@@ -19,24 +19,24 @@
/** HashMapped User Realm with JDBC as data source.
* JDBCUserRealm extends HashUserRealm and adds a method to fetch user
* information from database.
- * The getUser() method checks the inherited HashMap and if the user
- * is found, then it is returned.
- * Otherwise fetch information from database and populate inherited
- * hash.
- * Periodically (controled by configuration parameter), internal
+ * The authenticate() method checks the inherited HashMap for the user.
+ * If the user is not found, it will fetch details from the database
+ * and populate the inherited HashMap. It then calls the HashUserRealm
+ * authenticate() method to perform the actual authentication.
+ * Periodically (controlled by configuration parameter), internal
* hashes are cleared. Caching can be disabled by setting cache
* refresh interval to zero.
* Uses one database connection that is initialized at startup. Reconnect
- * on failures. getUser() is 'synchronized'.
+ * on failures. authenticate() is 'synchronized'.
*
* An example properties file for configuration is in
* $JETTY_HOME/etc/jdbcRealm.properties
*
- * @see Password
- * @version $Id: JDBCUserRealm.java,v 1.8 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: JDBCUserRealm.java,v 1.9 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Arkadi Shishlov (arkadi)
* @author Fredrik Borgh
* @author Greg Wilkins (gregw)
+ * @author Ben Alex
*/
public class JDBCUserRealm extends HashUserRealm
@@ -162,7 +162,9 @@
}
/* ------------------------------------------------------------ */
- public synchronized UserPrincipal getUser(String username)
+ public synchronized UserPrincipal authenticate(String username,
+ String credentials,
+ HttpRequest request)
{
long now = System.currentTimeMillis();
if (now - _lastHashPurge > _cacheTime || _cacheTime == 0)
@@ -177,7 +179,7 @@
loadUser(username);
user = (UserPrincipal)super.get(username);
}
- return user;
+ return super.authenticate(username, credentials, request);
}
/* ------------------------------------------------------------ */
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/JsseListener.java
Index: JsseListener.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/JsseListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JsseListener.java 22 May 2002 11:56:40 -0000 1.10
+++ JsseListener.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: JsseListener.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: JsseListener.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -36,7 +36,7 @@
* This is heavily based on the work from Court Demas, which in
* turn is based on the work from Forge Research.
*
- * @version $Id: JsseListener.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: JsseListener.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gr...@mo...)
* @author Court Demas (co...@ki...)
* @author Forge Research Pty Ltd ACN 003 491 576
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/MultiPartResponse.java
Index: MultiPartResponse.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/MultiPartResponse.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultiPartResponse.java 22 May 2002 11:56:40 -0000 1.10
+++ MultiPartResponse.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: MultiPartResponse.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: MultiPartResponse.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ------------------------------------------------------------------------
package org.mortbay.http;
@@ -11,7 +11,7 @@
/* ================================================================ */
/** Handle a multipart MIME response.
*
- * @version $Id: MultiPartResponse.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: MultiPartResponse.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins
* @author Jim Crossley
*/
1.12 +0 -0 contrib/jetty/src/main/org/mortbay/http/NCSARequestLog.java
Index: NCSARequestLog.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/NCSARequestLog.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NCSARequestLog.java 22 May 2002 11:56:40 -0000 1.11
+++ NCSARequestLog.java 20 Jun 2002 22:54:25 -0000 1.12
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: NCSARequestLog.java,v 1.11 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: NCSARequestLog.java,v 1.12 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -16,7 +16,7 @@
/* ------------------------------------------------------------ */
/** NCSA HTTP Request Log.
* NCSA common or NCSA extended (combined) request log.
- * @version $Id: NCSARequestLog.java,v 1.11 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: NCSARequestLog.java,v 1.12 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Tony Thompson
* @author Greg Wilkins
*/
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/OutputObserver.java
Index: OutputObserver.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/OutputObserver.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- OutputObserver.java 22 May 2002 11:56:40 -0000 1.10
+++ OutputObserver.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: OutputObserver.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: OutputObserver.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -11,7 +11,7 @@
/** Observer output events.
*
* @see ChunkableOutputStream
- * @version $Id: OutputObserver.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: OutputObserver.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public interface OutputObserver
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/PathMap.java
Index: PathMap.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/PathMap.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PathMap.java 22 May 2002 11:56:40 -0000 1.10
+++ PathMap.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: PathMap.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: PathMap.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -43,7 +43,7 @@
* in Jetty2.
* <P>
*
- * @version $Id: PathMap.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: PathMap.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class PathMap extends HashMap
1.10 +0 -0 contrib/jetty/src/main/org/mortbay/http/RequestLog.java
Index: RequestLog.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/RequestLog.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RequestLog.java 22 May 2002 11:56:40 -0000 1.9
+++ RequestLog.java 20 Jun 2002 22:54:25 -0000 1.10
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: RequestLog.java,v 1.9 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: RequestLog.java,v 1.10 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -9,7 +9,7 @@
/* ------------------------------------------------------------ */
/** Abstract HTTP Request Log format
- * @version $Id: RequestLog.java,v 1.9 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: RequestLog.java,v 1.10 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Tony Thompson
* @author Greg Wilkins
*/
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/SecurityConstraint.java
Index: SecurityConstraint.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/SecurityConstraint.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SecurityConstraint.java 22 May 2002 11:56:40 -0000 1.10
+++ SecurityConstraint.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: SecurityConstraint.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: SecurityConstraint.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -18,7 +18,7 @@
/* ------------------------------------------------------------ */
/** Describe an auth and/or data constraint.
*
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
* @author Greg Wilkins (gregw)
*/
public class SecurityConstraint
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/SocketListener.java
Index: SocketListener.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/SocketListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SocketListener.java 22 May 2002 11:56:40 -0000 1.10
+++ SocketListener.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: SocketListener.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: SocketListener.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -25,7 +25,7 @@
* LowResourcePersistTimeMs - time in ms that connections will persist if listener is
* low on resources.
* </PRE>
- * @version $Id: SocketListener.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: SocketListener.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class SocketListener
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/SunJsseListener.java
Index: SunJsseListener.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/SunJsseListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SunJsseListener.java 22 May 2002 11:56:40 -0000 1.10
+++ SunJsseListener.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: SunJsseListener.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: SunJsseListener.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -34,7 +34,7 @@
* This is heavily based on the work from Court Demas, which in
* turn is based on the work from Forge Research.
*
- * @version $Id: SunJsseListener.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: SunJsseListener.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gr...@mo...)
* @author Court Demas (co...@ki...)
* @author Forge Research Pty Ltd ACN 003 491 576
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/UserPrincipal.java
Index: UserPrincipal.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/UserPrincipal.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UserPrincipal.java 22 May 2002 11:56:40 -0000 1.10
+++ UserPrincipal.java 20 Jun 2002 22:54:25 -0000 1.11
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: UserPrincipal.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: UserPrincipal.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
// ---------------------------------------------------------------------------
package org.mortbay.http;
@@ -13,7 +13,7 @@
* Extends the security principal with a method to check if the user is in a
* role.
*
- * @version $Id: UserPrincipal.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: UserPrincipal.java,v 1.11 2002/06/20 22:54:25 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public interface UserPrincipal extends Principal
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/UserRealm.java
Index: UserRealm.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/UserRealm.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UserRealm.java 22 May 2002 11:56:40 -0000 1.10
+++ UserRealm.java 20 Jun 2002 22:54:26 -0000 1.11
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: UserRealm.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: UserRealm.java,v 1.11 2002/06/20 22:54:26 jules_gosnell Exp $
// ---------------------------------------------------------------------------
package org.mortbay.http;
@@ -11,7 +11,7 @@
* This interface should be specialized to provide specific user
* lookup and authentication using arbitrary methods.
*
- * @version $Id: UserRealm.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+ * @version $Id: UserRealm.java,v 1.11 2002/06/20 22:54:26 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public interface UserRealm
1.11 +0 -0 contrib/jetty/src/main/org/mortbay/http/Version.java
Index: Version.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/Version.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Version.java 22 May 2002 11:56:40 -0000 1.10
+++ Version.java 20 Jun 2002 22:54:26 -0000 1.11
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: Version.java,v 1.10 2002/05/22 11:56:40 gregwilkins Exp $
+// $Id: Version.java,v 1.11 2002/06/20 22:54:26 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -15,7 +15,7 @@
* java.org.mortbay.http.Version.paranoid System property is set to
* true, then this information is suppressed.
*
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
* @author Greg Wilkins (gregw)
*/
public class Version
|