February 2008 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r456 - in trunk/java/org/apache/coyote: http11 and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-02-28 21:11:24 -0500 (Thu, 28 Feb 2008) New Revision: 456 Modified: trunk/java/org/apache/coyote/Response.java trunk/java/org/apache/coyote/http11/Http11AprProcessor.java trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Log: - Redo a lot of the algorithm for flushing and leftover bytes handling (turns out some subtle situations couldn't work). - Will remove the debug printlns later. Modified: trunk/java/org/apache/coyote/Response.java =================================================================== --- trunk/java/org/apache/coyote/Response.java 2008-02-28 22:59:22 UTC (rev 455) +++ trunk/java/org/apache/coyote/Response.java 2008-02-29 02:11:24 UTC (rev 456) @@ -125,6 +125,7 @@ protected Request req; protected int lastWrite = 1; + protected boolean flushLeftovers = true; // ------------------------------------------------------------- Properties @@ -189,8 +190,19 @@ // -------------------- State -------------------- + + public boolean getFlushLeftovers() { + return flushLeftovers; + } + + public void setFlushLeftovers(boolean flushLeftovers) { + this.flushLeftovers = flushLeftovers; + } + + public int getLastWrite() { + flushLeftovers = false; return lastWrite; } Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-02-28 22:59:22 UTC (rev 455) +++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-02-29 02:11:24 UTC (rev 456) @@ -785,12 +785,15 @@ try { // If processing a write event, must flush any leftover bytes first if (status == SocketStatus.OPEN_WRITE) { + // If the flush does not manage to flush all leftover bytes, the socket should + // go back to the poller. + if (!outputBuffer.flushLeftover()) { + return SocketState.LONG; + } // The write notification is now done writeNotification = false; - // FIXME: If the flush does not manage to flush all leftover bytes, it is possible - // that the servlet is not going to be able to write bytes. This will be handled properly, - // but is wasteful. - outputBuffer.flushLeftover(); + // Allow convenient synchronous blocking writes + response.setFlushLeftovers(true); } else if (status == SocketStatus.OPEN_CALLBACK) { // The resume notification is now done resumeNotification = false; Modified: trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java =================================================================== --- trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 2008-02-28 22:59:22 UTC (rev 455) +++ trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 2008-02-29 02:11:24 UTC (rev 456) @@ -720,36 +720,72 @@ */ public boolean flushLeftover() throws IOException { - if (leftover.getLength() > 0) { - int len = leftover.getLength(); - int start = leftover.getStart(); - byte[] b = leftover.getBuffer(); - while (len > 0) { - int thisTime = len; - if (bbuf.position() == bbuf.capacity()) { - int pos = 0; - int end = bbuf.position(); - int res = Socket.sendibb(socket, 0, bbuf.position()); - while (res > 0 && pos < end) { + int len = leftover.getLength(); + int start = leftover.getStart(); + byte[] b = leftover.getBuffer(); + + while (len > 0) { + int thisTime = len; + if (bbuf.position() == bbuf.capacity()) { + int pos = 0; + int end = bbuf.position(); + int res = 0; + while (pos < end) { + res = Socket.sendibb(socket, pos, bbuf.position()); + if (res > 0) { pos += res; - res = Socket.sendibb(socket, pos, bbuf.position()); + } else { + break; } - if (res < 0) { - throw new IOException("Error"); - } - if (pos < end) { - // Could not write all leftover data: put back to write poller - return false; - } } - if (thisTime > bbuf.capacity() - bbuf.position()) { - thisTime = bbuf.capacity() - bbuf.position(); + if (res < 0) { + throw new IOException("Error"); } - bbuf.put(b, start, thisTime); - len = len - thisTime; - start = start + thisTime; + System.out.println("Flushed leftover " + res); + response.setLastWrite(res); + if (pos < end) { + // Could not write all leftover data: put back to write poller + leftover.setOffset(start + pos); + bbuf.clear(); + return false; + } } + if (thisTime > bbuf.capacity() - bbuf.position()) { + thisTime = bbuf.capacity() - bbuf.position(); + } + bbuf.put(b, start, thisTime); + len = len - thisTime; + start = start + thisTime; } + + int pos = 0; + int end = bbuf.position(); + int res = 0; + while (pos < end) { + res = Socket.sendibb(socket, pos, bbuf.position()); + System.out.println("Write from main buffer " + res); + if (res > 0) { + pos += res; + } else { + break; + } + } + if (res < 0) { + throw new IOException("Error"); + } + response.setLastWrite(res); + if (pos < end) { + leftover.allocate(end - pos, -1); + bbuf.position(0); + bbuf.limit(end - pos); + bbuf.get(leftover.getBuffer(), 0, end - pos); + leftover.setEnd(end - pos); + bbuf.clear(); + return false; + } + bbuf.clear(); + leftover.recycle(); + return true; } @@ -759,59 +795,84 @@ */ protected void flushBuffer() throws IOException { + + int res = 0; + + // If there are still leftover bytes here, there's a problem: + // - If the call is asynchronous, throw an exception + // - If the call is synchronous, make a regular blocking write to flush the data + if (leftover.getLength() > 0) { + System.out.println("Leftovers present"); + if (Http11AprProcessor.containerThread.get() == Boolean.TRUE) { + System.out.println("Send leftovers using blocking"); + Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 0); + // Also use the usual timeout + Socket.timeoutSet(socket, 20000*1000); + // Send leftover bytes + res = Socket.send(socket, leftover.getBuffer(), leftover.getOffset(), leftover.getEnd()); + leftover.recycle(); + // Send current buffer + if (res > 0) { + res = Socket.sendbb(socket, 0, bbuf.position()); + } + Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 1); + Socket.timeoutSet(socket, 0); + } else { + throw new IOException("Backlog"); + } + } + if (bbuf.position() > 0) { - int res = 0; if (nonBlocking) { - // If there are still leftover bytes here, there's a problem: - // - If the call is asynchronous, throw an exception - // - If the call is synchronous, make a regular blocking write to flush the data - if (leftover.getLength() > 0) { - if (Http11AprProcessor.containerThread.get() == Boolean.TRUE) { + System.out.println("No leftovers present"); + // Perform non blocking writes until all data is written, or the result + // of the write is 0 + int pos = 0; + int end = bbuf.position(); + while (pos < end) { + // FIXME: temp testing + //res = 0; + res = Socket.sendibb(socket, pos, bbuf.position()); + if (res > 0) { + pos += res; + } else { + break; + } + } + if (pos < end) { + if (response.getFlushLeftovers() && (Http11AprProcessor.containerThread.get() == Boolean.TRUE)) { + System.out.println("Blocking write of all data"); + // Switch to blocking mode and write the data Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 0); - // Also use the usual timeout Socket.timeoutSet(socket, 20000*1000); - // Send leftover bytes - res = Socket.send(socket, leftover.getBuffer(), leftover.getOffset(), leftover.getEnd()); - // Send current buffer - if (res > 0) { - res = Socket.sendbb(socket, 0, bbuf.position()); - } + res = Socket.sendbb(socket, 0, bbuf.position()); Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 1); Socket.timeoutSet(socket, 0); } else { - throw new IOException("Backlog"); - } - } else { - // Perform non blocking writes until all data is written, or the result - // of the write is 0 - int pos = 0; - int end = bbuf.position(); - while (pos < end) { - res = Socket.sendibb(socket, pos, bbuf.position()); - if (res > 0) { - pos += res; - } else { - break; - } - } - // Put any leftover bytes in the leftover byte chunk - if (pos < end) { + // Put any leftover bytes in the leftover byte chunk leftover.allocate(end - pos, -1); + bbuf.position(0); + bbuf.limit(end - pos); bbuf.get(leftover.getBuffer(), 0, end - pos); leftover.setEnd(end - pos); + System.out.println("Put " + (end-pos) + " bytes in leftover: " + new String(leftover.getBuffer(), 0, end - pos) + " l:" + leftover.getBuffer().length); + // Call for a write event because it is possible that no further write + // operations are made + if (!response.getFlushLeftovers()) { + response.action(ActionCode.ACTION_COMET_WRITE, null); + } } } } else { res = Socket.sendbb(socket, 0, bbuf.position()); } - // FIXME: Delaying setting setLastWrite could be a good idea (chunking means separate writes, - // and could trigger an exception) response.setLastWrite(res); bbuf.clear(); if (res < 0) { throw new IOException("Error"); } } + } @@ -837,6 +898,7 @@ // part of the same write operation) if (leftover.getLength() > 0) { leftover.append(chunk); + System.out.println("Add chunk to leftover"); return chunk.getLength(); }

16 years, 10 months

1
0
0 / 0

JBossWeb SVN: r455 - in trunk/webapps/ROOT: images and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-02-28 17:59:22 -0500 (Thu, 28 Feb 2008) New Revision: 455 Added: trunk/webapps/ROOT/images/ trunk/webapps/ROOT/images/apr_pb.gif trunk/webapps/ROOT/images/bkg_shadow.png trunk/webapps/ROOT/images/favicon.ico trunk/webapps/ROOT/images/hdr_bkg.gif trunk/webapps/ROOT/images/hdr_hdrtitle.gif trunk/webapps/ROOT/images/hdr_jbosslogo.gif trunk/webapps/ROOT/images/hdr_jbossorglogo.gif trunk/webapps/ROOT/images/jboss_ics.gif trunk/webapps/ROOT/images/jboss_logo.gif trunk/webapps/ROOT/images/jbossorg_logo.gif trunk/webapps/ROOT/images/jbossweblogo.gif trunk/webapps/ROOT/images/jbweb_pb.gif trunk/webapps/ROOT/images/openssl_ics.gif trunk/webapps/ROOT/images/tomcat_pb.gif trunk/webapps/ROOT/jbossweb.css Removed: trunk/webapps/ROOT/apr_pb.gif trunk/webapps/ROOT/jboss_ics.gif trunk/webapps/ROOT/jboss_logo.gif trunk/webapps/ROOT/jbossorg_logo.gif trunk/webapps/ROOT/jbossweblogo.gif trunk/webapps/ROOT/jbweb_pb.gif trunk/webapps/ROOT/openssl_ics.gif trunk/webapps/ROOT/tomcat_pb.gif Modified: trunk/webapps/ROOT/index.html Log: - Add new look, submitted by James Cobb. Deleted: trunk/webapps/ROOT/apr_pb.gif =================================================================== (Binary files differ) Added: trunk/webapps/ROOT/images/apr_pb.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/apr_pb.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/bkg_shadow.png =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/bkg_shadow.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/favicon.ico =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/favicon.ico ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/hdr_bkg.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/hdr_bkg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/hdr_hdrtitle.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/hdr_hdrtitle.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/hdr_jbosslogo.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/hdr_jbosslogo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/hdr_jbossorglogo.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/hdr_jbossorglogo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/jboss_ics.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/jboss_ics.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/jboss_logo.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/jboss_logo.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/jbossorg_logo.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/jbossorg_logo.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/jbossweblogo.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/jbossweblogo.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/jbweb_pb.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/jbweb_pb.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/openssl_ics.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/openssl_ics.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/webapps/ROOT/images/tomcat_pb.gif =================================================================== (Binary files differ) Property changes on: trunk/webapps/ROOT/images/tomcat_pb.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/webapps/ROOT/index.html =================================================================== --- trunk/webapps/ROOT/index.html 2008-02-28 15:38:38 UTC (rev 454) +++ trunk/webapps/ROOT/index.html 2008-02-28 22:59:22 UTC (rev 455) @@ -1,225 +1,56 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> - <head> - <title>JBoss Web</title> - <style type="text/css"> - /*<![CDATA[*/ - body { - color: #000000; - background-color: #FFFFFF; - font-family: Arial, "Times New Roman", Times, serif; - margin: 10px 0px; - } - - img { - border: none; - } - - a:link, a:visited { - color: blue - } - - th { - font-family: Verdana, "Times New Roman", Times, serif; - font-size: 110%; - font-weight: normal; - font-style: italic; - background: #D2A41C; - text-align: left; - } - - td { - color: #000000; - font-family: Arial, Helvetica, sans-serif; - } - - td.menu { - background: #FFDC75; - } - - .center { - text-align: center; - } - - .code { - color: #000000; - font-family: "Courier New", Courier, monospace; - font-size: 110%; - margin-left: 2.5em; - } - - #banner { - margin-bottom: 12px; - } - - p#congrats { - margin-top: 0; - font-weight: bold; - text-align: center; - } - - p#footer { - text-align: right; - font-size: 80%; - } - /*]]>*/ - </style> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<title>JBoss Web</title> +<link href="jbossweb.css" rel="stylesheet" type="text/css" /> </head> - <body> - - -<table id="banner" width="100%"> - <tr> - <td align="left" style="width:400px"> - <a href="http://www.jboss.com/"> - <img src="jboss_logo.gif" alt="JBoss, a division of Red Hat"/> - </a> - </td> - <td align="left"> - <a href="http://labs.jboss.com/jbossweb/"> - <img src="jbossweblogo.gif" alt="JBoss Web"/> - </a> - </td> - <td align="right"> - <a href="http://www.jboss.org/"> - <img src="jbossorg_logo.gif" alt="JBoss.org"/> - </a> - </td> - </tr> -</table> - -<table> - <tr> - -  - <td valign="top"> - <table width="100%" border="1" cellspacing="0" cellpadding="3"> - <tr> - <th>Administration</th> - </tr> - <tr> - <td class="menu"> - <a href="manager/status">Status</a><br/> - <a href="manager/html">Manager</a><br/> -   - </td> - </tr> - </table> - - <br /> - <table width="100%" border="1" cellspacing="0" cellpadding="3"> - <tr> - <th>Documentation</th> - </tr> - <tr> - <td class="menu"> - <a href="RELEASE-NOTES.txt">Release Notes</a><br/> - <a href="docs/changelog.html">Change Log</a><br/> - <a href="docs">Documentation</a><br/> -   - </td> - </tr> - </table> - - <br/> - <table width="100%" border="1" cellspacing="0" cellpadding="3"> - <tr> - <th>JBoss Web Online</th> - </tr> - <tr> - <td class="menu"> - <a href="http://labs.jboss.com/jbossweb/">Home Page</a><br/> - <a href="http://jira.jboss.com/jira/browse/JBWEB">Bug Database</a><br/> -   - </td> - </tr> - </table> - - <br/> - <table width="100%" border="1" cellspacing="0" cellpadding="3"> - <tr> - <th>Apache Tomcat Online</th> - </tr> - <tr> - <td class="menu"> - <a href="http://tomcat.apache.org/">Home Page</a><br/> - <a href="http://tomcat.apache.org/faq/">FAQ</a><br/> - <a href="http://tomcat.apache.org/bugreport.html">Bug Database</a><br/> - <a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&...">Open Bugs</a><br/> - <a href="http://mail-archives.apache.org/mod_mbox/tomcat-users/">Users Mailing List</a><br/> - <a href="http://mail-archives.apache.org/mod_mbox/tomcat-dev/">Developers Mailing List</a><br/> - <a href="irc://irc.freenode.net/#tomcat">IRC</a><br/> -   - </td> - </tr> - </table> - - <br/> - <table width="100%" border="1" cellspacing="0" cellpadding="3"> - <tr> - <th>Miscellaneous</th> - </tr> - <tr> - <td class="menu"> - <a href="http://java.sun.com/products/servlet">Sun's Servlet Site</a><br/> - <a href="http://java.sun.com/products/jsp">Sun's Java Server Pages Site</a><br/> -   - </td> - </tr> - </table> - </td> - - <td style="width:20px"> </td> - -  - <td align="left" valign="top"> - <p id="congrats">If you're seeing this page via a web browser, it means you've setup JBoss Web successfully. Congratulations!</p> - - <p>As you may have guessed by now, this is the default JBoss Web home page. It can be found on the local filesystem at:</p> - <p class="code">$CATALINA_HOME/webapps/ROOT/index.html</p> - - <p>where "$CATALINA_HOME" is the root of the JBoss Web installation directory. If you're seeing this page, and - you don't think you should be, then either you're either a user who has arrived at new installation of JBoss Web, - or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, - please refer to the <a href="docs">JBoss Web Documentation</a> for more detailed setup and administration - information than is found in the INSTALL file.</p> - - <p><b>NOTE: For security reasons, using the administration webapp - is restricted to users with role "admin". The manager webapp - is restricted to users with role "manager".</b> - Users are defined in <code>$CATALINA_HOME/conf/tomcat-users.xml</code>.</p> - - <p>Included with this release are extensive documentation and an introductory guide to developing web applications.</p> - - - - <p>Thanks for using JBoss Web!</p> - - <p id="footer"> - <img border="0" src="jbweb_pb.gif"/> - <img border="0" src="tomcat_pb.gif"/> - <img border="0" src="apr_pb.gif"/> - <img border="0" src="openssl_ics.gif"/> - <img border="0" src="jboss_ics.gif"/> - <br/> -   - - © 2008 Red Hat Middleware, LLC. All Rights Reserved. - </p> - </td> - - </tr> -</table> - +<div class="wrapper"> + <div class="header"> + <div class="floatleft"><a href="index.html"><img src="images/hdr_hdrtitle.gif" border="0"></a></div> + <div class="floatright"><a href="http://www.jboss.com/"><img src="images/hdr_jbosslogo.gif" alt="JBoss, a division of Red Hat" border="0"></a><a href="http://www.jboss.org"><img src="images/hdr_jbossorglogo.gif" alt="JBoss.org - Community driven." border="0" /></a></div> + </div> + <div class="container"> + <div class="leftcol"> + <dl> + <dt>Administration</dt> + <dd><a href="manager/status">Status</a></dd> + <dd><a href="manager/html">Manager</a></dd> + <dt>Documentation</dt> + <dd><a href="RELEASE-NOTES.txt">Release Notes</a></dd> + <dd><a href="docs/changelog.html">Change Log</a></dd> + <dd><a href="docs">Documentation</a></dd> + <dt>JBoss Web Online</dt> + <dd><a href="http://labs.jboss.com/jbossweb/">JBoss Web Project Home Page</a></dd> + <dd><a href="http://jira.jboss.com/jira/browse/JBWEB">Bug Database</a></dd> + <dt>Apache Tomcat Online</dt> + <dd><a href="http://tomcat.apache.org/">Apache Tomcat Home Page</a></dd> + <dd><a href="http://tomcat.apache.org/faq/">FAQ</a></dd> + <dd><a href="http://tomcat.apache.org/bugreport.html">Bug Database</a></dd> + <dd><a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_...">Open Bugs</a></dd> + <dd><a href="http://mail-archives.apache.org/mod_mbox/tomcat-users/">Users Mailing List</a></dd> + <dd><a href="http://mail-archives.apache.org/mod_mbox/tomcat-dev/">Developers Mailing List</a></dd> + <dd><a href="irc://irc.freenode.net/#tomcat">IRC</a></dd> + <dt>Web Resources</dt> + <dd><a href="http://java.sun.com/products/servlet">Sun's Servlet Site</a></dd> + <dd><a href="http://java.sun.com/products/jsp">Sun's Java Server Pages Site</a></dd> + </dl> + </div> +  + <div class="maincol"> <img src="images/jboss_logo.gif" width="215" height="95" style="margin-bottom: 20px; " /> + <h1>Congratulations!<br /> + If you're seeing this page via a web browser, it means you've setup JBoss Web successfully. </h1> + <p>As you may have guessed by now, this is the default JBoss Web home page. It can be found on the local filesystem at:</p> + <code>$CATALINA_HOME/webapps/ROOT/index.html</code> (where "$CATALINA_HOME" is the root of the JBoss Web installation directory). + <p>If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of JBoss Web, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the <a href="docs">JBoss Web Documentation</a> for more detailed setup and administration information than is found in the INSTALL file.</p> + <p><b>NOTE: For security reasons, using the administration webapp is restricted to users with role "admin". The manager webapp is restricted to users with role "manager".</b> Users are defined in <code>$CATALINA_HOME/conf/tomcat-users.xml</code>.</p> + <p>Included with this release are extensive documentation and an introductory guide to developing web applications.</p> + <p>Thanks for using JBoss Web!</p> + <p> <img border="0" src="images/jbweb_pb.gif"/> <img border="0" src="images/tomcat_pb.gif"/> <img border="0" src="images/apr_pb.gif"/> <img border="0" src="images/openssl_ics.gif"/> <img border="0" src="images/jboss_ics.gif"/> </p> + </div> + </div> + <div class="footer">© 2008 Red Hat Middleware, LLC. All Rights Reserved. </div> +</div> </body> </html> Deleted: trunk/webapps/ROOT/jboss_ics.gif =================================================================== (Binary files differ) Deleted: trunk/webapps/ROOT/jboss_logo.gif =================================================================== (Binary files differ) Deleted: trunk/webapps/ROOT/jbossorg_logo.gif =================================================================== (Binary files differ) Added: trunk/webapps/ROOT/jbossweb.css =================================================================== --- trunk/webapps/ROOT/jbossweb.css (rev 0) +++ trunk/webapps/ROOT/jbossweb.css 2008-02-28 22:59:22 UTC (rev 455) @@ -0,0 +1,164 @@ + +/* ------- Common Elements ---------- */ + +html { + margin:0; + padding:0; +} + +body { + margin:20px; + padding: 0px; + font-family:Verdana, Arial, Helvetica, sans-serif; + background-color:#a3a9ad; + color:#424242; + font-size: 12px; +} + +p { } + +a { + color:#527fa8; +} + +hr { + border-top: 1px solid #a4b2b9; + border-right: 0px solid #a4b2b9; + border-left: 0px solid #a4b2b9; + border-bottom: 0px solid #a4b2b9; + margin-bottom: 3px; +} +img { border:0px; } + +h1 { + font-size:14px; + color:#4a5d75; + margin-top:0px; + padding-top: 6px; +} +h2 { + font-size:13px; + color:#32444d; +} + +h3 { } +h4 { } +h5 { } +h6 { } + +.wrapper { + min-width: 900px; + background-image:url(../images/bkg_shadow.png); + background-position:right; + background-repeat:repeat-y; + padding-right:7px; +} + +.container { + + margin: 0px; + padding:0px; + background-color: white; + overflow:hidden; +} + +.leftcol { + float:left; + width:300px; + background-color:#eaeff2; + border-right: 1px solid #c1c4ca; +} + +.maincol { + margin: 0px 20px 0px 325px; + padding-top: 30px; + +} + +/* -------- This equalizes the two column heights in the layout ----------------- */ + +.leftcol, .maincol { + padding-bottom: 30005px; + margin-bottom: -30000px; + } + +/* ---------- */ + +.header { + background-image: url(../images/hdr_bkg.gif); + background-position:bottom; + background-repeat: repeat-x; + background-color:#35485d; + height: 50px; +} + +.footer { + background-color:#35485d; + color:#dbe7ee; + line-height:2em; + font-size:9px; + text-align: center; + clear:both; +} + +.footer a { + color:#dbe7ee; + line-height:2em; + font-size:9px; + text-align: center; + clear:both; +} + +.floatright { + float:right; +} +.floatleft { + float:left; +} + +/* ------------------------------------------------- Left Navigation ------------------------------------------------------------------------- */ + +.leftcol dl { margin-left: 30px; } + +.leftcol dt { + color:#4a5d75; + font-weight: bold; + margin-left: 0px; + margin-right: 20px; + padding: 10px 0px 0px 0px; + border-bottom: 1px solid #424242; +} + +.leftcol dd { + margin-left: 4px; + padding:2px 0px; +} + +/* ------------------------------------------------- Breadcrumb navigation ------------------------------------------------------------------ */ + +#bread { + color: #656565; + padding-right: 3px; + margin-bottom: 10px; + } + +#bread ul { + margin-left: 0; + padding-left: 0; + display: inline; + border: none; + } + +#bread ul li { + margin-left: 0; + padding-left: 2px; + font-size:10px; + border: none; + list-style: none; + display: inline; + } + +#bread a { + color:#656565; + text-decoration: underline; +} Deleted: trunk/webapps/ROOT/jbossweblogo.gif =================================================================== (Binary files differ) Deleted: trunk/webapps/ROOT/jbweb_pb.gif =================================================================== (Binary files differ) Deleted: trunk/webapps/ROOT/openssl_ics.gif =================================================================== (Binary files differ) Deleted: trunk/webapps/ROOT/tomcat_pb.gif =================================================================== (Binary files differ)

16 years, 10 months

1
0
0 / 0

JBossWeb SVN: r454 - trunk/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-02-28 10:38:38 -0500 (Thu, 28 Feb 2008) New Revision: 454 Modified: trunk/java/org/apache/catalina/connector/InputBuffer.java Log: - Always convert up to the amount of bytes which have been read. Modified: trunk/java/org/apache/catalina/connector/InputBuffer.java =================================================================== --- trunk/java/org/apache/catalina/connector/InputBuffer.java 2008-02-27 21:44:34 UTC (rev 453) +++ trunk/java/org/apache/catalina/connector/InputBuffer.java 2008-02-28 15:38:38 UTC (rev 454) @@ -378,7 +378,7 @@ } state = CHAR_STATE; - conv.convert(bb, cb, len); + conv.convert(bb, cb, bb.getLength()); bb.setOffset(bb.getEnd()); return cb.getLength();

16 years, 10 months

1
0
0 / 0

JBossWeb SVN: r453 - in trunk/java/org/apache: coyote/http11 and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-02-27 16:44:34 -0500 (Wed, 27 Feb 2008) New Revision: 453 Modified: trunk/java/org/apache/catalina/connector/OutputBuffer.java trunk/java/org/apache/coyote/http11/Http11AprProcessor.java trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Log: - Add a protection against calling ready or resume multiple times. Modified: trunk/java/org/apache/catalina/connector/OutputBuffer.java =================================================================== --- trunk/java/org/apache/catalina/connector/OutputBuffer.java 2008-02-27 16:17:46 UTC (rev 452) +++ trunk/java/org/apache/catalina/connector/OutputBuffer.java 2008-02-27 21:44:34 UTC (rev 453) @@ -330,7 +330,6 @@ protected int lastWrite() { int res = coyoteResponse.getLastWrite(); if (res == 0) { - // FIXME: For efficiency, it would be nice to check if not calling it twice, and reset than when that is done coyoteResponse.action(ActionCode.ACTION_COMET_WRITE, null); } return res; Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-02-27 16:17:46 UTC (rev 452) +++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-02-27 21:44:34 UTC (rev 453) @@ -1283,19 +1283,17 @@ readNotifications = true; // An event is being processed already: adding for resume will be done // when the socket gets back to the poller - if (cometProcessing) { - resumeNotification = true; - } else { + if (!cometProcessing && !resumeNotification) { endpoint.getCometPoller().add(socket, timeout, false, false, true); } + resumeNotification = true; } else if (actionCode == ActionCode.ACTION_COMET_WRITE) { // An event is being processed already: adding for write will be done // when the socket gets back to the poller - if (cometProcessing) { - writeNotification = true; - } else { + if (!cometProcessing && !writeNotification) { endpoint.getCometPoller().add(socket, timeout, false, true, false); } + writeNotification = true; } else if (actionCode == ActionCode.ACTION_COMET_TIMEOUT) { cometTimeout = ((Integer) param).intValue(); } Modified: trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java =================================================================== --- trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 2008-02-27 16:17:46 UTC (rev 452) +++ trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 2008-02-27 21:44:34 UTC (rev 453) @@ -766,7 +766,6 @@ // - If the call is asynchronous, throw an exception // - If the call is synchronous, make a regular blocking write to flush the data if (leftover.getLength() > 0) { - // FIXME: the fact that it's a container thread was already tested in doWrite if (Http11AprProcessor.containerThread.get() == Boolean.TRUE) { Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 0); // Also use the usual timeout @@ -799,7 +798,7 @@ if (pos < end) { leftover.allocate(end - pos, -1); bbuf.get(leftover.getBuffer(), 0, end - pos); - leftover.setEnd(end-pos); + leftover.setEnd(end - pos); } } } else {

16 years, 10 months

1
0
0 / 0

JBossWeb SVN: r452 - trunk/java/org/apache/coyote/http11.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-02-27 11:17:46 -0500 (Wed, 27 Feb 2008) New Revision: 452 Modified: trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Log: - Fix buffer handling error. Modified: trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java =================================================================== --- trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 2008-02-27 14:31:04 UTC (rev 451) +++ trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 2008-02-27 16:17:46 UTC (rev 452) @@ -787,10 +787,13 @@ // of the write is 0 int pos = 0; int end = bbuf.position(); - res = Socket.sendibb(socket, 0, bbuf.position()); - while (res > 0 && pos < end) { - pos += res; + while (pos < end) { res = Socket.sendibb(socket, pos, bbuf.position()); + if (res > 0) { + pos += res; + } else { + break; + } } // Put any leftover bytes in the leftover byte chunk if (pos < end) {

16 years, 10 months

1
0
0 / 0

JBossWeb SVN: r451 - in trunk/java/org/apache: tomcat/util/net and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-02-27 09:31:04 -0500 (Wed, 27 Feb 2008) New Revision: 451 Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java trunk/java/org/apache/coyote/http11/Http11AprProtocol.java trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Log: - Improve handling of resume (which would cause sending of a resume event, just like write does), as it is not practical to have to code around an event which may not be sent. Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-02-26 15:01:53 UTC (rev 450) +++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-02-27 14:31:04 UTC (rev 451) @@ -327,6 +327,7 @@ protected int cometTimeout = -1; protected boolean readNotifications = true; protected boolean writeNotification = false; + protected boolean resumeNotification = false; protected boolean nonBlocking = true; protected boolean cometProcessing = false; @@ -349,6 +350,11 @@ } + public boolean getResumeNotification() { + return resumeNotification; + } + + public boolean getReadNotifications() { return readNotifications; } @@ -785,6 +791,9 @@ // that the servlet is not going to be able to write bytes. This will be handled properly, // but is wasteful. outputBuffer.flushLeftover(); + } else if (status == SocketStatus.OPEN_CALLBACK) { + // The resume notification is now done + resumeNotification = false; } containerThread.set(Boolean.TRUE); rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE); @@ -1272,11 +1281,15 @@ readNotifications = false; } else if (actionCode == ActionCode.ACTION_COMET_RESUME) { readNotifications = true; - if (!cometProcessing) { + // An event is being processed already: adding for resume will be done + // when the socket gets back to the poller + if (cometProcessing) { + resumeNotification = true; + } else { endpoint.getCometPoller().add(socket, timeout, false, false, true); } } else if (actionCode == ActionCode.ACTION_COMET_WRITE) { - // An event is being processed already:adding for write will be done + // An event is being processed already: adding for write will be done // when the socket gets back to the poller if (cometProcessing) { writeNotification = true; Modified: trunk/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2008-02-26 15:01:53 UTC (rev 450) +++ trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2008-02-27 14:31:04 UTC (rev 451) @@ -566,7 +566,7 @@ } else { if (proto.endpoint.isRunning()) { proto.endpoint.getCometPoller().add(socket, result.getCometTimeout(), - result.getReadNotifications(), result.getWriteNotification(), false); + result.getReadNotifications(), result.getWriteNotification(), result.getResumeNotification()); } } result.endProcessing(); Modified: trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java =================================================================== --- trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 2008-02-26 15:01:53 UTC (rev 450) +++ trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 2008-02-27 14:31:04 UTC (rev 451) @@ -769,6 +769,8 @@ // FIXME: the fact that it's a container thread was already tested in doWrite if (Http11AprProcessor.containerThread.get() == Boolean.TRUE) { Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 0); + // Also use the usual timeout + Socket.timeoutSet(socket, 20000*1000); // Send leftover bytes res = Socket.send(socket, leftover.getBuffer(), leftover.getOffset(), leftover.getEnd()); // Send current buffer @@ -776,6 +778,7 @@ res = Socket.sendbb(socket, 0, bbuf.position()); } Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 1); + Socket.timeoutSet(socket, 0); } else { throw new IOException("Backlog"); } Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-02-26 15:01:53 UTC (rev 450) +++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-02-27 14:31:04 UTC (rev 451) @@ -1527,28 +1527,35 @@ SocketInfo info = localAddList.get(); while (info != null) { if (info.read || info.write) { - // Store timeout - timeouts.add(info.socket, System.currentTimeMillis() + info.timeout); - if (comet) { + if (info.resume) { + // Resume event + timeouts.remove(info.socket); removeFromPoller(info.socket); - } - // Windows only: check status code and loop over the other pollers - int events = 0; - if (info.read) { - events = Poll.APR_POLLIN; - } - if (info.write) { - events = events | Poll.APR_POLLOUT; - } - if (!addToPoller(info.socket, events)) { - // Can't do anything: close the socket right away + processSocket(info.socket, SocketStatus.OPEN_CALLBACK); + } else { + // Store timeout + timeouts.add(info.socket, System.currentTimeMillis() + info.timeout); if (comet) { - processSocket(info.socket, SocketStatus.ERROR); + removeFromPoller(info.socket); + } + // Windows only: check status code and loop over the other pollers + int events = 0; + if (info.read) { + events = Poll.APR_POLLIN; + } + if (info.write) { + events = events | Poll.APR_POLLOUT; + } + if (!addToPoller(info.socket, events)) { + // Can't do anything: close the socket right away + if (comet) { + processSocket(info.socket, SocketStatus.ERROR); + } else { + Socket.destroy(info.socket); + } } else { - Socket.destroy(info.socket); + keepAliveCount++; } - } else { - keepAliveCount++; } } else { // This is either a resume or a suspend.

16 years, 10 months

1
0
0 / 0

JBossWeb SVN: r450 - in trunk/java/org/apache: tomcat/util/net and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-02-26 10:01:53 -0500 (Tue, 26 Feb 2008) New Revision: 450 Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java trunk/java/org/apache/coyote/http11/Http11AprProtocol.java trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Log: - Allow sync usage of resume. - Fix maintain with suspend when there's nothing going on in the server. Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-02-26 13:58:39 UTC (rev 449) +++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-02-26 15:01:53 UTC (rev 450) @@ -1272,7 +1272,9 @@ readNotifications = false; } else if (actionCode == ActionCode.ACTION_COMET_RESUME) { readNotifications = true; - endpoint.getCometPoller().add(socket, timeout, false, false, true); + if (!cometProcessing) { + endpoint.getCometPoller().add(socket, timeout, false, false, true); + } } else if (actionCode == ActionCode.ACTION_COMET_WRITE) { // An event is being processed already:adding for write will be done // when the socket gets back to the poller Modified: trunk/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2008-02-26 13:58:39 UTC (rev 449) +++ trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2008-02-26 15:01:53 UTC (rev 450) @@ -564,8 +564,10 @@ proto.endpoint.getPoller().add(socket); } } else { - proto.endpoint.getCometPoller().add(socket, result.getCometTimeout(), - result.getReadNotifications(), result.getWriteNotification(), false); + if (proto.endpoint.isRunning()) { + proto.endpoint.getCometPoller().add(socket, result.getCometTimeout(), + result.getReadNotifications(), result.getWriteNotification(), false); + } } result.endProcessing(); } Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-02-26 13:58:39 UTC (rev 449) +++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-02-26 15:01:53 UTC (rev 450) @@ -1463,6 +1463,25 @@ } /** + * Timeout checks. + */ + protected void maintain() { + + long date = System.currentTimeMillis(); + long socket = timeouts.check(date); + while (socket != 0) { + removeFromPoller(socket); + if (comet) { + processSocket(socket, SocketStatus.TIMEOUT); + } else { + Socket.destroy(socket); + } + socket = timeouts.check(date); + } + + } + + /** * The background thread that listens for incoming TCP/IP connections and * hands them off to an appropriate processor. */ @@ -1485,10 +1504,15 @@ maintainTime = 0; try { synchronized (this) { - this.wait(); + this.wait(10000); } + if (soTimeout > 0 && keepAliveCount < 1 && addList.size() < 1 && running) { + maintain(); + } } catch (InterruptedException e) { // Ignore + } catch (Throwable t) { + log.error(sm.getString("endpoint.poll.error"), t); } } @@ -1601,17 +1625,7 @@ // This works and uses only one timeout mechanism for everything, but the // non Comet poller might be a bit faster by using the old maintain. maintainTime = 0; - long date = System.currentTimeMillis(); - long socket = timeouts.check(date); - while (socket != 0) { - removeFromPoller(socket); - if (comet) { - processSocket(socket, SocketStatus.TIMEOUT); - } else { - Socket.destroy(socket); - } - socket = timeouts.check(date); - } + maintain(); } } catch (Throwable t) {

16 years, 10 months

1
0
0 / 0

JBossWeb SVN: r449 - trunk/java/org/apache/coyote/http11.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-02-26 08:58:39 -0500 (Tue, 26 Feb 2008) New Revision: 449 Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Log: - Fix setting non blocking mode. Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-02-26 13:06:42 UTC (rev 448) +++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-02-26 13:58:39 UTC (rev 449) @@ -786,6 +786,7 @@ // but is wasteful. outputBuffer.flushLeftover(); } + containerThread.set(Boolean.TRUE); rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE); error = !adapter.event(request, response, status); } catch (InterruptedIOException e) { @@ -1259,13 +1260,13 @@ comet = true; // Set socket to non blocking mode Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 1); - containerThread.set(Boolean.TRUE); + Socket.timeoutSet(socket, 0); outputBuffer.setNonBlocking(true); } else if (actionCode == ActionCode.ACTION_COMET_END) { comet = false; // End non blocking mode Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 0); - containerThread.set(null); + Socket.timeoutSet(socket, endpoint.getSoTimeout()); outputBuffer.setNonBlocking(false); } else if (actionCode == ActionCode.ACTION_COMET_SUSPEND) { readNotifications = false;

16 years, 10 months

1
0
0 / 0

JBossWeb SVN: r448 - trunk/java/org/jboss/web/comet.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-02-26 08:06:42 -0500 (Tue, 26 Feb 2008) New Revision: 448 Modified: trunk/java/org/jboss/web/comet/CometEvent.java Log: - Sort events (cosmetic). Modified: trunk/java/org/jboss/web/comet/CometEvent.java =================================================================== --- trunk/java/org/jboss/web/comet/CometEvent.java 2008-02-26 12:29:28 UTC (rev 447) +++ trunk/java/org/jboss/web/comet/CometEvent.java 2008-02-26 13:06:42 UTC (rev 448) @@ -44,18 +44,6 @@ * not synchronized, so when they are accessed by multiple threads adequate * synchronization is needed. After processing the initial event, the request * is considered to be committed.</li> - * <li>READ - This indicates that input data is available, and that at least one - * read can be made without blocking. The available and ready methods of the InputStream or - * Reader may be used to determine if there is a risk of blocking: the servlet - * must continue reading while data is reported available. When encountering a read error, - * the servlet should report it by propagating the exception properly. Throwing - * an exception will cause the error event to be invoked, and the connection - * will be closed. - * Alternately, it is also possible to catch any exception, perform clean up - * on any data structure the servlet may be using, and using the close method - * of the event. It is not allowed to attempt reading data from the request - * object outside of the processing of this event, unless the suspend() method - * has been used.</li> * <li>END - End may be called to end the processing of the request. Fields that have * been initialized in the begin method should be reset. After this event has * been processed, the request and response objects, as well as all their dependent @@ -68,18 +56,30 @@ * been initialized in the begin method should be reset. After this event has * been processed, the request and response objects, as well as all their dependent * objects will be recycled and used to process other requests.</li> - * <li>TIMEOUT - the connection timed out, but the connection will not be closed unless - * the servlet uses the close method of the event</li> * <li>EVENT - Event will be called by the container after the resume() method is called, * during which any operations can be performed, including closing the Comet connection * using the close() method.</li> + * <li>READ - This indicates that input data is available, and that at least one + * read can be made without blocking. The available and ready methods of the InputStream or + * Reader may be used to determine if there is a risk of blocking: the servlet + * must continue reading while data is reported available. When encountering a read error, + * the servlet should report it by propagating the exception properly. Throwing + * an exception will cause the error event to be invoked, and the connection + * will be closed. + * Alternately, it is also possible to catch any exception, perform clean up + * on any data structure the servlet may be using, and using the close method + * of the event. It is not allowed to attempt reading data from the request + * object outside of the processing of this event, unless the suspend() method + * has been used.</li> + * <li>TIMEOUT - the connection timed out, but the connection will not be closed unless + * the servlet uses the close method of the event</li> * <li>WRITE - Write is sent if the servlet is using the ready method. This means that * the connection is ready to receive data to be written out. This event will never * be received if the servlet is not using the ready() method, or if the ready() * method always returns true.</li> * </ul> */ - public enum EventType { BEGIN, READ, END, TIMEOUT, ERROR, WRITE, EVENT } + public enum EventType { BEGIN, END, ERROR, EVENT, READ, TIMEOUT, WRITE } /**

16 years, 10 months

1
0
0 / 0

JBossWeb SVN: r447 - trunk/java/org/apache/tomcat/util/net.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-02-26 07:29:28 -0500 (Tue, 26 Feb 2008) New Revision: 447 Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Log: - Use soTimeout as the defaault if no timeout has been specified. Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-02-25 21:42:23 UTC (rev 446) +++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-02-26 12:29:28 UTC (rev 447) @@ -1409,6 +1409,9 @@ * @param resume to send a callback event */ public void add(long socket, int timeout, boolean read, boolean write, boolean resume) { + if (timeout < 0) { + timeout = soTimeout; + } synchronized (this) { // Add socket to the list. Newly added sockets will wait // at most for pollTime before being polled

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits February 2008