cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelNioSocket.java

[billbarker]

billbarker2005/04/23 21:27:42

  Modified:jk/java/org/apache/jk/common ChannelNioSocket.java
  Log:
  Give up on switching between blocking/non-blocking Sockets, also move the 
Accecpt into the Poller instead of its own thread.
  
  This is still very much experimental, and nobody should even dream of using 
it in production.
  
  Testing on Windows, it's very flakey.  On Solaris, it's stable enough, but 
ChannelSocket is about 25% faster.
  
  Revision  ChangesPath
  1.2   +231 -80   
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelNioSocket.java
  
  Index: ChannelNioSocket.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelNioSocket.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ChannelNioSocket.java 17 Apr 2005 03:41:08 -  1.1
  +++ ChannelNioSocket.java 24 Apr 2005 04:27:42 -  1.2
  @@ -18,19 +18,22 @@
   
   import java.util.Set;
   import java.util.Iterator;
  -import java.io.BufferedInputStream;
  -import java.io.BufferedOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.OutputStream;
  +import java.nio.ByteBuffer;
   import java.nio.channels.Selector;
   import java.nio.channels.SelectionKey;
  +import java.nio.channels.SocketChannel;
   import java.nio.channels.ClosedSelectorException;
  +import java.nio.channels.ServerSocketChannel;
  +import java.nio.channels.CancelledKeyException;
  +import java.nio.channels.ClosedChannelException;
   import java.net.URLEncoder;
   import java.net.InetAddress;
  +import java.net.InetSocketAddress;
   import java.net.ServerSocket;
   import java.net.Socket;
  -import java.net.SocketException;
   
   import javax.management.ListenerNotFoundException;
   import javax.management.MBeanNotificationInfo;
  @@ -92,10 +95,10 @@
   int maxPort=8019; // 0 for backward compat.
   int port=startPort;
   InetAddress inet;
  -int serverTimeout;
  +int serverTimeout = 0;
   boolean tcpNoDelay=true; // nodelay to true by default
   int linger=100;
  -int socketTimeout;
  +int socketTimeout = 0;
   private Selector selector = null;
   
   long requestCount=0;
  @@ -105,7 +108,6 @@
  flush() is honored ( on my test, I got 367->433 RPS and
  52->35ms average time with a simple servlet )
   */
  -static final boolean BUFFER_WRITE=false;
   
   ThreadPool tp=ThreadPool.createThreadPool(true);
   
  @@ -271,12 +273,12 @@
   final int isNote=2;
   final int osNote=3;
   final int notifNote=4;
  -boolean paused = true;
  +boolean paused = false;
   
   public void pause() throws Exception {
   synchronized(this) {
   paused = true;
  -unLockSocket();
  +//unLockSocket();
   }
   }
   
  @@ -299,10 +301,11 @@
   }
   }
   }
  -Socket s=sSocket.accept();
  +SocketChannel sc=sSocket.getChannel().accept();
  +Socket s = sc.socket();
   ep.setNote( socketNote, s );
   if(log.isDebugEnabled() )
  -log.debug("Accepted socket " + s );
  +log.debug("Accepted socket " + s +" channel "  + 
sc.isBlocking());
   if( linger > 0 )
   s.setSoLinger( true, linger);
   if( socketTimeout > 0 ) 
  @@ -312,12 +315,9 @@
   
   requestCount++;
   
  -InputStream is=new BufferedInputStream(s.getInputStream());
  -OutputStream os;
  -if( BUFFER_WRITE )
  -os = new BufferedOutputStream( s.getOutputStream());
  -else
  -os = s.getOutputStream();
  +sc.configureBlocking(false);
  +InputStream is=new SocketInputStream(sc);
  +OutputStream os = new SocketOutputStream(sc);
   ep.setNote( isNote, is );
   ep.setNote( osNote, os );
   ep.setControl( tp );
  @@ -349,19 +349,24 @@
   }
   if (maxPort < startPort)
   maxPort = startPort;
  +ServerSocketChannel ssc = ServerSocketChannel.open();
  +ssc.configureBlocking(false);
   for( int i=startPort; i<=maxPort; i++ ) {
   try {
  +InetSocketAddress iddr = null;
   if( inet == null ) {
  -sSocket = new ServerSocket( i, 0 );
  +iddr = new InetSocketAddress( i);
   } else {
  -sSocket=new ServerSocket( i, 0, inet );
  +iddr=new InetSocketAddress( inet, i);
   }
  +sSocket = ssc.socket();
  +sSocket.bind(iddr);
   port=i;
   break;
   } catch( IOException ex ) {
   if(log.isInfoEnabled())
   log.info("Port busy " + i + " 

DO NOT REPLY [Bug 34560] - AuthenticatorBase tests and applies disableProxyCaching even if no auth-constraints

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34560





--- Additional Comments From [EMAIL PROTECTED]  2005-04-24 01:36 ---
Please see http://jakarta.apache.org/site/source.html#Patches for the format 
that patches should be submitted in.

That having been said, I'm -1 for the patch as is.  As I read section 12.8 of 
the servlet spec, the headers should be added for a transport-guarantee of 
CONFIDENTIAL.  I agree that it is optional for a transport-guarantee of 
INTEGRAL.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 34560] - AuthenticatorBase tests and applies disableProxyCaching even if no auth-constraints

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34560





--- Additional Comments From [EMAIL PROTECTED]  2005-04-24 00:13 ---
Created an attachment (id=14814)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=14814&action=view)
patch to head cvs (1.30)

line 437:

//+ ASF Bugzilla Bug 34560 fix:
boolean requireAuthentication = false;
for(i=0; i < constraints.length; i++) {
if (constraints[i].getAuthConstraint()) {
requireAuthentication=true;
break;
}
}
//+


// Make sure that constrained resources are not cached by web proxies
// or browsers as caching can provide a security hole
if (requireAuthentication && disableProxyCaching && //+ SSL can be
cached (by browser only, and by user choice), authenticated resources must not.


[...]


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java

[remm]

remm2005/04/23 11:59:52

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  - Convert to long.
  
  Revision  ChangesPath
  1.19  +6 -7  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AprEndpoint.java  23 Apr 2005 17:36:57 -  1.18
  +++ AprEndpoint.java  23 Apr 2005 18:59:52 -  1.19
  @@ -1064,14 +1064,13 @@
   // Set the socket to nonblocking mode
   Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 1);
   while (true) {
  -int nw = Socket.sendfile(socket, data.fd, null, null,
  - data.pos, (int)data.end, 0);
  +long nw = Socket.sendfile(socket, data.fd, null, null,
  + data.pos, data.end, 0);
   if (nw < 0) {
  -if (!Status.APR_STATUS_IS_EAGAIN(-nw)) {
  +if (!Status.APR_STATUS_IS_EAGAIN((int) -nw)) {
   Poll.destroy(data.pool);
   return false;
  -}
  -else {
  +} else {
   // Break the loop and add the socket to poller.
   break;
   }
  @@ -1165,9 +1164,9 @@
   continue;
   }
   // Write some data using sendfile
  -int nw = Socket.sendfile(desc[n*4+1], state.fd,
  +long nw = Socket.sendfile(desc[n*4+1], state.fd,
null, null, state.pos,
  - (int) (state.end - 
state.pos), 0);
  + state.end - state.pos, 
0);
   if (nw < 0) {
   // Close socket and clear pool
   remove(desc[n*4+1]);
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jni/native/src network.c

[mturk]

mturk   2005/04/23 11:33:39

  Modified:jni/java/org/apache/tomcat/jni Socket.java
   jni/native/src network.c
  Log:
  Use long for sendfile size.
  
  Revision  ChangesPath
  1.14  +4 -4  
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java
  
  Index: Socket.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Socket.java   23 Apr 2005 15:51:03 -  1.13
  +++ Socket.java   23 Apr 2005 18:33:39 -  1.14
  @@ -441,8 +441,8 @@
* file, and trailers
*
*/
  -public static native int sendfile(long sock, long file, byte [][] 
headers,
  -  byte[][] trailers, long offset,
  -  int len, int flags);
  +public static native long sendfile(long sock, long file, byte [][] 
headers,
  +   byte[][] trailers, long offset,
  +   long len, int flags);
   
   }
  
  
  
  1.15  +8 -8  jakarta-tomcat-connectors/jni/native/src/network.c
  
  Index: network.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/network.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- network.c 23 Apr 2005 15:51:03 -  1.14
  +++ network.c 23 Apr 2005 18:33:39 -  1.15
  @@ -512,12 +512,12 @@
   }
   
   
  -TCN_IMPLEMENT_CALL(jint, Socket, sendfile)(TCN_STDARGS, jlong sock,
  -   jlong file,
  -   jobjectArray headers,
  -   jobjectArray trailers,
  -   jlong offset, jint len,
  -   jint flags)
  +TCN_IMPLEMENT_CALL(jlong, Socket, sendfile)(TCN_STDARGS, jlong sock,
  +jlong file,
  +jobjectArray headers,
  +jobjectArray trailers,
  +jlong offset, jlong len,
  +jint flags)
   {
   apr_socket_t *s = J2P(sock, apr_socket_t *);
   apr_file_t *f = J2P(file, apr_file_t *);
  @@ -573,7 +573,7 @@
* including headers, file, and trailers
*/
   if (ss == APR_SUCCESS)
  -return (jint)written;
  +return (jlong)written;
   else
  -return -(jint)ss;
  +return -(jlong)ss;
   }
  
  
  

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

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java

[remm]

remm2005/04/23 10:36:57

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  - It works great (very good performance, seems reliable seen from ab), so 
attempt to use sendfile by default.
  - So far, I haven't seen a socket going to the poller, but as I'm doing 
localhost testing, it might be normal.
  
  Revision  ChangesPath
  1.18  +1 -1  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- AprEndpoint.java  23 Apr 2005 17:33:40 -  1.17
  +++ AprEndpoint.java  23 Apr 2005 17:36:57 -  1.18
  @@ -284,7 +284,7 @@
   /**
* Use endfile for sending static files.
*/
  -protected boolean useSendfile = false;
  +protected boolean useSendfile = true;
   public void setUseSendfile(boolean useSendfile) { this.useSendfile = 
useSendfile; }
   public boolean getUseSendfile() { return useSendfile; }
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProcessor.java

[remm]

remm2005/04/23 10:33:40

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
   http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java
  Log:
  - Fix keepalive for sendfile.
  
  Revision  ChangesPath
  1.17  +9 -7  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AprEndpoint.java  23 Apr 2005 17:05:31 -  1.16
  +++ AprEndpoint.java  23 Apr 2005 17:33:40 -  1.17
  @@ -1052,7 +1052,7 @@
   Pool.destroy(pool);
   }
   
  -public void add(long socket, SendfileData data) {
  +public boolean add(long socket, SendfileData data) {
   // Initialize fd from data given
   try {
   data.fdpool = Pool.create(data.pool);
  @@ -1069,26 +1069,27 @@
   if (nw < 0) {
   if (!Status.APR_STATUS_IS_EAGAIN(-nw)) {
   Poll.destroy(data.pool);
  -return;
  +return false;
   }
   else {
   // Break the loop and add the socket to poller.
   break;
   }
  -}
  -else {
  +} else {
   data.pos = data.pos + nw;
   if (data.pos >= data.end) {
   // Entire file has been send
  -Poll.destroy(data.pool);
  -return;
  +Poll.destroy(data.fdpool);
  +// Set back socket to blocking mode
  +Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 0);
  +return true;
   }
   }
   }
   } catch (Error e) {
   // FIXME: more appropriate logging
   e.printStackTrace();
  -return;
  +return false;
   }
   synchronized (this) {
   // Add socket to the poller
  @@ -1103,6 +1104,7 @@
   Pool.destroy(data.pool);
   }
   }
  +return false;
   }
   
   public void remove(long socket) {
  
  
  
  1.9   +3 -2  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
  
  Index: Http11AprProcessor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Http11AprProcessor.java   20 Apr 2005 16:13:23 -  1.8
  +++ Http11AprProcessor.java   23 Apr 2005 17:33:40 -  1.9
  @@ -872,9 +872,10 @@
   
   // Do sendfile as needed: add socket to sendfile and end
   if (sendfileData != null) {
  -keepAlive = false;
   sendfileData.pool = pool;
  -endpoint.getSendfile().add(socket, sendfileData);
  +if (!endpoint.getSendfile().add(socket, sendfileData)) {
  +keepAlive = false;
  +}
   }
   
   }
  
  
  

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

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java

[mturk]

mturk   2005/04/23 10:05:31

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  Fix partial results from sendfile. Do not break the loop while the
  sendfile will not block.
  
  Revision  ChangesPath
  1.16  +18 -17
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AprEndpoint.java  23 Apr 2005 15:57:24 -  1.15
  +++ AprEndpoint.java  23 Apr 2005 17:05:31 -  1.16
  @@ -1063,25 +1063,26 @@
   data.pos = data.start;
   // Set the socket to nonblocking mode
   Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 1);
  -int nw = Socket.sendfile(socket, data.fd, null, null,
  - data.pos, (int)data.end, 0);
  -if (nw < 0) {
  -if (!Status.APR_STATUS_IS_EAGAIN(-nw)) {
  -Poll.destroy(data.pool);
  -return;
  -}
  -}
  -else {
  -data.pos = data.pos + nw;
  -if (data.pos >= data.end) {
  -// Entire file has been send
  -Poll.destroy(data.pool);
  -return;
  +while (true) {
  +int nw = Socket.sendfile(socket, data.fd, null, null,
  + data.pos, (int)data.end, 0);
  +if (nw < 0) {
  +if (!Status.APR_STATUS_IS_EAGAIN(-nw)) {
  +Poll.destroy(data.pool);
  +return;
  +}
  +else {
  +// Break the loop and add the socket to poller.
  +break;
  +}
   }
   else {
  -//FIXME: Ether EAGAIN of full data should be returned
  -Poll.destroy(data.pool);
  -return;
  +data.pos = data.pos + nw;
  +if (data.pos >= data.end) {
  +// Entire file has been send
  +Poll.destroy(data.pool);
  +return;
  +}
   }
   }
   } catch (Error e) {
  
  
  

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

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java

[mturk]

mturk   2005/04/23 08:57:24

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  Make Senfile usable. Sendfile should be added to the poller, only
  if it returns EAGAIN status. In any other case the poller will break.
  
  Revision  ChangesPath
  1.15  +31 -9 
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AprEndpoint.java  20 Apr 2005 16:13:23 -  1.14
  +++ AprEndpoint.java  23 Apr 2005 15:57:24 -  1.15
  @@ -839,7 +839,6 @@
   } else if (rv < 0) {
   // FIXME: Log with WARN at least
   // Handle poll critical failure
  -Pool.clear(serverSockPool);
   synchronized (this) {
   destroy();
   init();
  @@ -1023,7 +1022,6 @@
   protected long pool = 0;
   protected long[] desc;
   protected HashMap sendfileData;
  -
   protected void init() {
   pool = Pool.create(serverSockPool);
   try {
  @@ -1063,12 +1061,36 @@
| File.APR_FOPEN_SENDFILE_ENABLED | 
File.APR_FOPEN_BINARY,
0, data.fdpool);
   data.pos = data.start;
  +// Set the socket to nonblocking mode
  +Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 1);
  +int nw = Socket.sendfile(socket, data.fd, null, null,
  + data.pos, (int)data.end, 0);
  +if (nw < 0) {
  +if (!Status.APR_STATUS_IS_EAGAIN(-nw)) {
  +Poll.destroy(data.pool);
  +return;
  +}
  +}
  +else {
  +data.pos = data.pos + nw;
  +if (data.pos >= data.end) {
  +// Entire file has been send
  +Poll.destroy(data.pool);
  +return;
  +}
  +else {
  +//FIXME: Ether EAGAIN of full data should be returned
  +Poll.destroy(data.pool);
  +return;
  +}
  +}
   } catch (Error e) {
   // FIXME: more appropriate logging
   e.printStackTrace();
   return;
   }
   synchronized (this) {
  +// Add socket to the poller
   sendfileData.put(new Long(socket), data);
   int rv = Poll.add(sendfilePollset, socket, 0, 
Poll.APR_POLLOUT);
   if (rv == Status.APR_SUCCESS) {
  @@ -1088,6 +1110,8 @@
   if (rv == Status.APR_SUCCESS) {
   sendfileCount--;
   }
  +// Set the socket to blocking mode again
  +Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 0);
   sendfileData.remove(new Long(socket));
   }
   }
  @@ -1138,18 +1162,18 @@
   continue;
   }
   // Write some data using sendfile
  -int nw = Socket.sendfilet(desc[n*4+1], state.fd,
  -  null, null, state.pos,
  -  (int) (state.end - 
state.pos), 0, 0);
  +int nw = Socket.sendfile(desc[n*4+1], state.fd,
  + null, null, state.pos,
  + (int) (state.end - 
state.pos), 0);
   if (nw < 0) {
   // Close socket and clear pool
   remove(desc[n*4+1]);
  -// Destroy file descriptor pool, which 
should close the file
  -Pool.destroy(state.fdpool);
   // Close the socket, as the reponse would be 
incomplete
  +// This will close the file too.
   Pool.destroy(state.pool);
   continue;
   }
  +
   state.pos = state.pos + nw;
   if (state.pos >= state.end) {
   remove(desc[n*4+1]);
  @@ -1163,7 +1187,6 @@
   } else if (rv < 0) {

cvs commit: jakarta-tomcat-connectors/jni/native/src network.c poll.c

[mturk]

mturk   2005/04/23 08:51:03

  Modified:jni/java/org/apache/tomcat/jni Socket.java
   jni/native/src network.c poll.c
  Log:
  Remove 'senfilet' function, because it's useless. Also return
  the error from Poll.poll
  
  Revision  ChangesPath
  1.13  +1 -24 
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java
  
  Index: Socket.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Socket.java   18 Apr 2005 16:25:20 -  1.12
  +++ Socket.java   23 Apr 2005 15:51:03 -  1.13
  @@ -445,27 +445,4 @@
 byte[][] trailers, long offset,
 int len, int flags);
   
  -/**
  - * Send a file from an open file descriptor to a socket, along with
  - * optional headers and trailers, with a timeout.
  - * The number of bytes actually sent is stored in the len parameter.
  - * The offset parameter is passed by reference for no reason; its
  - * value will never be modified by the apr_socket_sendfile() function.
  - * @param sock The socket to which we're writing
  - * @param file The open file from which to read
  - * @param headers Array containing the headers to send
  - * @param trailers Array containing the trailers to send
  - * @param offset Offset into the file where we should begin writing
  - * @param len Number of bytes to send from the file
  - * @param flags APR flags that are mapped to OS specific flags
  - * @param timeout Socket timeout to use with the call. The original
  - *socket timeout will be preserved.
  - * @return Number of bytes actually sent, including headers,
  - * file, and trailers
  - *
  - */
  -public static native int sendfilet(long sock, long file, byte [][] 
headers,
  -   byte[][] trailers, long offset,
  -   int len, int flags, long timeout);
  -
   }
  
  
  
  1.14  +0 -73 jakarta-tomcat-connectors/jni/native/src/network.c
  
  Index: network.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/network.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- network.c 18 Apr 2005 16:22:23 -  1.13
  +++ network.c 23 Apr 2005 15:51:03 -  1.14
  @@ -577,76 +577,3 @@
   else
   return -(jint)ss;
   }
  -
  -TCN_IMPLEMENT_CALL(jint, Socket, sendfilet)(TCN_STDARGS, jlong sock,
  -jlong file,
  -jobjectArray headers,
  -jobjectArray trailers,
  -jlong offset, jint len,
  -jint flags, jlong timeout)
  -{
  -apr_socket_t *s = J2P(sock, apr_socket_t *);
  -apr_file_t *f = J2P(file, apr_file_t *);
  -jsize nh = 0;
  -jsize nt = 0;
  -jsize i;
  -struct iovec hvec[APR_MAX_IOVEC_SIZE];
  -struct iovec tvec[APR_MAX_IOVEC_SIZE];
  -jobject hba[APR_MAX_IOVEC_SIZE];
  -jobject tba[APR_MAX_IOVEC_SIZE];
  -apr_off_t off = (apr_off_t)offset;
  -apr_size_t written = (apr_size_t)len;
  -apr_hdtr_t hdrs;
  -apr_status_t ss;
  -apr_interval_time_t t;
  -
  -UNREFERENCED(o);
  -TCN_ASSERT(sock != 0);
  -TCN_ASSERT(file != 0);
  -
  -if (headers)
  -nh = (*e)->GetArrayLength(e, headers);
  -if (trailers)
  -nt = (*e)->GetArrayLength(e, trailers);
  -/* Check for overflow */
  -if (nh >= APR_MAX_IOVEC_SIZE || nt >= APR_MAX_IOVEC_SIZE)
  -return (jint)(-APR_ENOMEM);
  -if ((ss = apr_socket_timeout_get(s, &t)) != APR_SUCCESS)
  - return -(jint)ss;
  -if ((ss = apr_socket_timeout_set(s, J2T(timeout))) != APR_SUCCESS)
  - return -(jint)ss;
  -
  -for (i = 0; i < nh; i++) {
  -hba[i] = (*e)->GetObjectArrayElement(e, headers, i);
  -hvec[i].iov_len  = (*e)->GetArrayLength(e, hba[i]);
  -hvec[i].iov_base = (*e)->GetByteArrayElements(e, hba[i], NULL);
  -}
  -for (i = 0; i < nt; i++) {
  -tba[i] = (*e)->GetObjectArrayElement(e, trailers, i);
  -tvec[i].iov_len  = (*e)->GetArrayLength(e, tba[i]);
  -tvec[i].iov_base = (*e)->GetByteArrayElements(e, tba[i], NULL);
  -}
  -hdrs.headers = &hvec[0];
  -hdrs.numheaders = nh;
  -hdrs.trailers = &tvec[0];
  -hdrs.numtrailers = nt;
  -
  -ss = apr_socket_sendfile(s, f, &hdrs, &off, &written, 
(apr_int32_t)flags);
  -/* Resore the original timeout */
  -apr_socket_timeout_set(s, t);

Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml

[Mark Thomas]

Thanks,
Mark
Peter Rossbach wrote:
Hey Mark,
I roll it back.
Thanks
Peter
Mark Thomas schrieb:
Peter,
One of your related changes 
(http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-catalina/modules/cluster/build.xml?r1=1.14&r2=1.15&diff_format=h) 
has broken the 5.5 build on 1.4 JDKs :(

Can you roll it back or commit an alternative please?
Cheers,
Mark
[EMAIL PROTECTED] wrote:
pero2005/04/22 13:38:38
  Modified:webapps/docs changelog.xml
  Log:
  redesign DeltaManager restart under load
Revision  ChangesPath
  1.291 +3 -1  
jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.290
  retrieving revision 1.291
  diff -u -r1.290 -r1.291
  --- changelog.xml15 Apr 2005 20:15:17 -1.290
  +++ changelog.xml22 Apr 2005 20:38:38 -1.291
  @@ -146,7 +146,9 @@
 
   Refactor DeltaManager:
 - createSession call now ManagerBase super class method
  -  - extract some long methods (pero)+  - 
extract some long methods
  +  - send GET_ALL_SESSION with session blocks
  +  - don't sync sessions map when send all sessions (pero)  

   Add developer actions at to-do.txt (Proposal of changes) 
(pero)   
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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


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


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

cvs commit: jakarta-tomcat-catalina/modules/cluster build.xml

[pero]

pero2005/04/23 05:20:59

  Modified:modules/cluster build.xml
  Log:
  revert change for compile with java 1.4
  
  Revision  ChangesPath
  1.16  +0 -1  jakarta-tomcat-catalina/modules/cluster/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml 22 Apr 2005 20:33:44 -  1.15
  +++ build.xml 23 Apr 2005 12:20:59 -  1.16
  @@ -81,7 +81,6 @@
  optimize="${compile.optimize}"
  excludes="**/CVS/**" 
>
  - 
   
   
   

Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml

[Peter Rossbach]

Hey Mark,
I roll it back.
Thanks
Peter
Mark Thomas schrieb:
Peter,
One of your related changes 
(http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-catalina/modules/cluster/build.xml?r1=1.14&r2=1.15&diff_format=h) 
has broken the 5.5 build on 1.4 JDKs :(

Can you roll it back or commit an alternative please?
Cheers,
Mark
[EMAIL PROTECTED] wrote:
pero2005/04/22 13:38:38
  Modified:webapps/docs changelog.xml
  Log:
  redesign DeltaManager restart under load
Revision  ChangesPath
  1.291 +3 -1  
jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.290
  retrieving revision 1.291
  diff -u -r1.290 -r1.291
  --- changelog.xml15 Apr 2005 20:15:17 -1.290
  +++ changelog.xml22 Apr 2005 20:38:38 -1.291
  @@ -146,7 +146,9 @@
 
   Refactor DeltaManager:
 - createSession call now ManagerBase super class method
  -  - extract some long methods (pero)+  - 
extract some long methods
  +  - send GET_ALL_SESSION with session blocks
  +  - don't sync sessions map when send all sessions (pero)  

   Add developer actions at to-do.txt (Proposal of changes) 
(pero)   
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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


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

cvs commit: jakarta-tomcat-connectors/jk/xdocs changelog.xml

[mturk]

mturk   2005/04/23 03:32:06

  Modified:jk/xdocs changelog.xml
  Log:
  Add recent changes. Seems there is enough for the next release,
  because some of them are critical.
  
  Revision  ChangesPath
  1.22  +31 -10jakarta-tomcat-connectors/jk/xdocs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/changelog.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- changelog.xml 9 Apr 2005 15:44:58 -   1.21
  +++ changelog.xml 23 Apr 2005 10:32:06 -  1.22
  @@ -25,16 +25,37 @@
 
 
   
  -  
  -Add --enable-prefork to the documentation (pero)
  +  Add unique directives checking. The directives if
  +  unique are now overwritten instead concatenated. (mturk)
 
  +  Allow multiple worker.list directives. (mturk)
  +  
  +  
  +  34577: For IIS log original request instead loging
  +  the request for ISAPI extension. (mturk)
  +  
  +  
  +  34558: Make sure the returned status codes are the same
  +  for ajp and lb workers. (mturk)
  +  
 
  -  34358: Fix the load balance worker load balance method.
  -  It was not being set from the worker.properties file
  +  34423: Use APR_USE_FLOCK_SERIALIZE for setting log lock
  +  on platforms like FreeBSD. Patch provided by Allan Saddi. (mturk)
 
 
  -  34357: Fix a segfault in Apache 2 when using JKAutoAlias.
  +  33843: Fix obtaining LDFLAGS that were used for building
  +  Apache HTTPD. Patch provided by Beat Kneubuehl. (mturk)
 
  +  
  +  34358: Enable load balancer method configuration. (glenn)
  +  
  +  
  +  34357: In some situations Apache 2 mod_jk could segfault
  +  when the JkAutoAlias directive is used. (glenn)
  +  
  +  
  +Add --enable-prefork to the documentation (pero)
  +
   
 
   
  @@ -63,7 +84,7 @@
 32696: Return 404 instead 403 when WEB-INF is requested
 to comply with Servlet spec. (mturk)
 
  -  Added ANT task for managing jkstatus. (pero)
  +  Added ANT task for managing jkstatus. (pero)
 
 
 If socket_timeout is set, check if socket is alive before
  @@ -138,10 +159,10 @@
 threads per child process. (mturk).
 
 
  -  Fix Apache content-length header parsing using case insensitive 
compare. (billbarker) 
  +  Fix Apache content-length header parsing using case insensitive 
compare. (billbarker)
 
 
  -  Fix parsing AJP headers using case insensitive compare. (mturk) 
  +  Fix parsing AJP headers using case insensitive compare. (mturk)
 
 
 Use infinite socket timeout if socket_timeout is set to zero or less 
then zero. (mturk)
  @@ -192,7 +213,7 @@
 
 
 Added wildchar match uri mappings. One can now use JkMount to
  -  map /app/*/servlet/* or /app?/*/*.jsp. (mturk)  
  +  map /app/*/servlet/* or /app?/*/*.jsp. (mturk)
 
 
 Rewrite the logging by adding Trace options. (mturk)
  @@ -226,7 +247,7 @@
   JK2 has been put in maintainer mode and no further development will take 
place.
   The reason for shutting down JK2 development was the lack of developers 
interest.
   Other reason was lack of users interest in adopting JK2, caused by 
configuration
  -complexity when compared to JK. 
  +complexity when compared to JK.
   
   
   
  
  
  

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

DO NOT REPLY [Bug 33106] - SSI Processing Enhancements (patch provided)

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33106


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2005-04-23 12:24 ---
Many thanks for the patch.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml ssi-howto.xml

[markt]

markt   2005/04/23 03:22:37

  Modified:catalina/src/conf web.xml
   catalina/src/share/org/apache/catalina/ssi
ResponseIncludeWrapper.java SSICommand.java
SSIConditional.java SSIConfig.java SSIEcho.java
SSIExec.java SSIFlastmod.java SSIFsize.java
SSIInclude.java SSIMediator.java SSIPrintenv.java
SSIProcessor.java SSIServlet.java
SSIServletExternalResolver.java SSISet.java
   webapps/docs changelog.xml ssi-howto.xml
  Log:
  Provide an ServletFilter implementation of Server Side Includes (SSI). This 
was submitted by David Becker under bug
   33106.
  
  Revision  ChangesPath
  1.57  +79 -0 jakarta-tomcat-catalina/catalina/src/conf/web.xml
  
  Index: web.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- web.xml   4 Apr 2005 20:57:02 -   1.56
  +++ web.xml   23 Apr 2005 10:22:37 -  1.57
  @@ -206,6 +206,9 @@
   
   
   
  +  
  +  
  +  
 
 
 
  @@ -362,6 +365,78 @@
   -->
   
   
  +  
  +
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +
  +
  +
  +
  +  
  +
  +  
  +
  +
  +
 
 
 
  @@ -783,6 +858,10 @@
   application/x-shar
   
   
  +shtml
  +text/x-server-parsed-html
  +
  +
   smf
   audio/x-midi
   
  
  
  
  1.6   +135 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java
  
  Index: ResponseIncludeWrapper.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ResponseIncludeWrapper.java   1 Sep 2004 18:33:33 -   1.5
  +++ ResponseIncludeWrapper.java   23 Apr 2005 10:22:37 -  1.6
  @@ -13,23 +13,40 @@
   
   import java.io.IOException;
   import java.io.PrintWriter;
  +
  +import javax.servlet.ServletContext;
   import javax.servlet.ServletOutputStream;
  +import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   import javax.servlet.http.HttpServletResponseWrapper;
  +
  +import org.apache.catalina.util.DateTool;
   /**
* A HttpServletResponseWrapper, used from
* SSIServletExternalResolver
* 
* @author Bip Thelin
  + * @author David Becker
* @version $Revision$, $Date$
*/
   public class ResponseIncludeWrapper extends HttpServletResponseWrapper {
   /**
  + * The names of some headers we want to capture.
  + */
  + private static final String CONTENT_TYPE = "content-type";
  +private static final String LAST_MODIFIED = "last-modified";
  +protected long lastModified = -1;
  +private String contentType = null;
  +
  +/**
* Our ServletOutputStream
*/
  -protected ServletOutputStream originalServletOutputStream;
  +protected ServletOutputStream captureServletOutputStream;
   protected ServletOutputStream servletOutputStream;
   protected PrintWriter printWriter;
  +
  + private ServletContext context;
  + private HttpServletRequest request;
   
   
   /**
  @@ -41,10 +58,13 @@
* @param out
*The ServletOutputStream' to use
*/
  -public ResponseIncludeWrapper(HttpServletResponse res,
  -ServletOutputStream originalServletOutputStream) {
  -super(res);
  -this.originalServletOutputStream = originalServletOutputStream;
  +public ResponseIncludeWrapper(ServletContext context, 
  + HttpServletRequest request, HttpServletResponse response,
  +   ServletOutputStream captureServletOutputStream) {
  +super(response);
  +this.context = context;
  +this.request = request;
  +this.captureServletOutputStream = captureServletOutputStream;
   }
   
   
  @@ -74,7 +94,7 @@
   public PrintWriter getWriter() throws java.io.IOException {
   if (servletOutputStream == null) {
   if (printWriter == null) {
  -printWriter = new PrintWriter(originalServletOutputStream);
  +printWriter = new PrintWriter(captureServletOutputStream);
   }
   return printWriter;
   }
  @@ -93,10 +113,117 @@
   public ServletOutputStream getOutputStream() throws java.io.IOException {
   if (printWriter == null) {
   if (servletOutputStream == null) {
  - 

Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml

[Mark Thomas]

Peter,
One of your related changes 
(http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-catalina/modules/cluster/build.xml?r1=1.14&r2=1.15&diff_format=h) 
has broken the 5.5 build on 1.4 JDKs :(

Can you roll it back or commit an alternative please?
Cheers,
Mark
[EMAIL PROTECTED] wrote:
pero2005/04/22 13:38:38
  Modified:webapps/docs changelog.xml
  Log:
  redesign DeltaManager restart under load
  
  Revision  ChangesPath
  1.291 +3 -1  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.290
  retrieving revision 1.291
  diff -u -r1.290 -r1.291
  --- changelog.xml	15 Apr 2005 20:15:17 -	1.290
  +++ changelog.xml	22 Apr 2005 20:38:38 -	1.291
  @@ -146,7 +146,9 @@
 
   Refactor DeltaManager:
 - createSession call now ManagerBase super class method
  -  - extract some long methods (pero)  
  +  - extract some long methods
  +  - send GET_ALL_SESSION with session blocks
  +  - don't sync sessions map when send all sessions (pero)  
   
 
   Add developer actions at to-do.txt (Proposal of changes) (pero)  
  
  
  

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


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

DO NOT REPLY [Bug 34577] - IIS 6.0 with isapi_redirect.dll (jk 1.2.10) filter does not log page requests

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34577


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2005-04-23 12:03 ---
Added SF_NOTIFY_LOG for logging original request instead
logging isapi extension.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c

[mturk]

mturk   2005/04/23 03:02:21

  Modified:jk/native/iis jk_isapi_plugin.c
  Log:
  Log original request instead logging request for isapi extension,
  by using SF_NOTIFY_LOG handler.
  
  Revision  ChangesPath
  1.46  +29 -1 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- jk_isapi_plugin.c 17 Mar 2005 12:06:03 -  1.45
  +++ jk_isapi_plugin.c 23 Apr 2005 10:02:21 -  1.46
  @@ -152,6 +152,11 @@
   LPEXTENSION_CONTROL_BLOCK lpEcb;
   };
   
  +typedef struct isapi_log_data_t isapi_log_data_t;
  +struct isapi_log_data_t {
  +char uri[INTERNET_MAX_URL_LENGTH];
  +char query[INTERNET_MAX_URL_LENGTH];
  +};
   
   static int JK_METHOD start_response(jk_ws_service_t *s,
   int status,
  @@ -649,6 +654,7 @@
   SF_NOTIFY_SECURE_PORT |
   SF_NOTIFY_NONSECURE_PORT |
   SF_NOTIFY_PREPROC_HEADERS |
  +SF_NOTIFY_LOG |
   SF_NOTIFY_AUTH_COMPLETE;
   
   strcpy(pVer->lpszFilterDesc, VERSION_STRING);
  @@ -901,6 +907,20 @@
   }
   SetHeader(pfc, "Translate:", NULL);
   }
  +if (!pfc->pFilterContext) {
  +isapi_log_data_t *ld = (isapi_log_data_t 
*)pfc->AllocMem(pfc, sizeof(isapi_log_data_t), 0);
  +if (!ld) {
  +jk_log(logger, JK_LOG_ERROR,
  +   "error while allocating memory");
  +SetLastError(ERROR_NOT_ENOUGH_MEMORY);
  +return SF_STATUS_REQ_ERROR;
  +}
  +memset(ld, 0, sizeof(isapi_log_data_t));
  +strcpy(ld->uri, forwardURI);
  +if (query && strlen(query) > 0)
  +strcpy(ld->query, query);
  +pfc->pFilterContext = ld;
  +}
   }
   else {
   if (JK_IS_DEBUG_LEVEL(logger))
  @@ -909,6 +929,14 @@
   }
   }
   }
  +else if (is_inited && (dwNotificationType == SF_NOTIFY_LOG)) {
  +if (pfc->pFilterContext) {
  +isapi_log_data_t *ld = (isapi_log_data_t *)pfc->pFilterContext;
  +HTTP_FILTER_LOG  *pl = (HTTP_FILTER_LOG *)pvNotification;
  +pl->pszTarget = ld->uri;
  +pl->pszParameters = ld->query;
  +}
  +}
   return SF_STATUS_REQ_NEXT_NOTIFICATION;
   }
   
  
  
  

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

[EMAIL PROTECTED]: Project jakarta-tomcat-jk-native (in module jakarta-tomcat-connectors) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project jakarta-tomcat-jk-native has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 111 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- jakarta-tomcat-jk-native :  Connectors to various web servers


Full details are available at:

http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/gump_work/build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native.html
Work Name: build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native (Type: 
Build)
Work ended in a state of : Failed
Elapsed: 
Command Line: make 
[Working Directory: 
/usr/local/gump/public/workspace/jakarta-tomcat-connectors/jk/native]
-
Making all in common
make[1]: Entering directory 
`/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common'
/bin/sh 
/usr/local/gump/public/workspace/apache-httpd/dest-23042005/build/libtool 
--silent --mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-23042005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-23042005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE 
-I/home/gump/workspaces2/public/workspace/apache-httpd/srclib/pcre -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp12_worker.c 
/usr/local/gump/public/workspace/apache-httpd/dest-23042005/build/libtool: 
/usr/local/gump/public/workspace/apache-httpd/dest-23042005/build/libtool: No 
such file or directory
make[1]: *** [jk_ajp12_worker.lo] Error 127
make[1]: Leaving directory 
`/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common'
make: *** [all-recursive] Error 1
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/rss.xml
- Atom: 
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/atom.xml

== Gump Tracking Only ===
Produced by Gump version 2.2.
Gump Run 2223042005, brutus:brutus-public:2223042005
Gump E-mail Identifier (unique within run) #24.

--
Apache Gump
http://gump.apache.org/ [Instance: brutus]

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

DO NOT REPLY [Bug 34584] - Cannot run multiple instances of JK ISAPI Redirector Filter/Extension within a single instance of Microsoft Internet Information Server

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34584


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX




--- Additional Comments From [EMAIL PROTECTED]  2005-04-23 10:54 ---
Your solution will simply not work, because it will break any other
filter in the chain, like custom authentication filters, etc...

JK ISAPI filter has many static variables that limit it's option to
be included more then once. What we would need is the option to have
multiple configurations for each virtual web server, not having multiple
filter instances. And that is not an easy fix :).

Regards,
Mladen.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 34560] - AuthenticatorBase tests and applies disableProxyCaching even if no auth-constraints

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34560





--- Additional Comments From [EMAIL PROTECTED]  2005-04-23 09:40 ---
If the fix is trivial, and you want us to reconsider, you should submit a tested
patch against CVS HEAD.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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