DO NOT REPLY [Bug 34760] - Tomcat crash when .war put under webapps and redeploy is called

[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=34760


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2005-06-16 11:51 ---
The passivation mechanism for sessions is now more robust.

-- 
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/jni/native/src sslnetwork.c sslutils.c

[mturk]

mturk   2005/06/18 01:01:54

  Modified:jni/native/src sslnetwork.c sslutils.c
  Log:
  Fix compile time warnings.
  
  Revision  ChangesPath
  1.16  +18 -17jakarta-tomcat-connectors/jni/native/src/sslnetwork.c
  
  Index: sslnetwork.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslnetwork.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- sslnetwork.c  17 Jun 2005 14:17:00 -  1.15
  +++ sslnetwork.c  18 Jun 2005 08:01:54 -  1.16
  @@ -309,8 +309,9 @@
   }
   
   static apr_status_t APR_THREAD_FUNC
  -ssl_socket_recv(tcn_ssl_conn_t *con, char *buf, apr_size_t *len)
  +ssl_socket_recv(void *sock, char *buf, apr_size_t *len)
   {
  +tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
   int s, rd = (int)(*len);
   apr_status_t rv = APR_SUCCESS;
   
  @@ -355,9 +356,10 @@
   }
   
   static apr_status_t APR_THREAD_FUNC
  -ssl_socket_send(tcn_ssl_conn_t *con, const char *buf,
  +ssl_socket_send(void *sock, const char *buf,
   apr_size_t *len)
   {
  +tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
   int s, rd = (int)(*len);
   apr_status_t rv = APR_SUCCESS;
   
  @@ -397,17 +399,18 @@
   }
   
   static apr_status_t APR_THREAD_FUNC
  -ssl_socket_sendv(tcn_ssl_conn_t *sock,
  +ssl_socket_sendv(void *sock,
const struct iovec *vec,
apr_int32_t nvec, apr_size_t *len)
   {
  +tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
   apr_status_t rv;
   apr_size_t readed = 0;
   apr_int32_t i;
   
   for (i = 0; i < nvec; i++) {
   apr_size_t rd = vec[i].iov_len;
  -if ((rv = ssl_socket_send(sock, vec[i].iov_base, &rd)) != 
APR_SUCCESS) {
  +if ((rv = ssl_socket_send(con, vec[i].iov_base, &rd)) != 
APR_SUCCESS) {
   *len = readed;
   return rv;
   }
  @@ -419,23 +422,21 @@
   
   
   TCN_IMPLEMENT_CALL(jint, SSLSocket, attach)(TCN_STDARGS, jlong ctx,
  -jlong sock, jlong pool)
  +jlong sock)
   {
   tcn_ssl_ctxt_t *c = J2P(ctx, tcn_ssl_ctxt_t *);
   tcn_socket_t *s   = J2P(sock, tcn_socket_t *);
  -apr_pool_t *p = J2P(pool, apr_pool_t *);
   tcn_ssl_conn_t *con;
   apr_os_sock_t  oss;
   apr_status_t rv;
   
   UNREFERENCED(o);
  -TCN_ASSERT(pool != 0);
   TCN_ASSERT(ctx != 0);
   TCN_ASSERT(sock != 0);
   
   if ((rv = apr_os_sock_get(&oss, s->sock)) != APR_SUCCESS)
   return rv;
  -if ((con = ssl_create(e, c, p)) == NULL)
  +if ((con = ssl_create(e, c, s->pool)) == NULL)
   return APR_EGENERAL;
   con->sock = s->sock;
   
  @@ -445,14 +446,14 @@
   else
   SSL_set_connect_state(con->ssl);
   /* Change socket type */
  -s->type = TCN_SOCKET_SSL;
  -s->cleanup  = ssl_cleanup;
  -s->net_recv = ssl_socket_recv;
  -s->net_send = ssl_socket_send;
  -s->net_sendv= ssl_socket_sendv;
  -s->net_shutdown = ssl_socket_shutdown;
  -s->net_close= ssl_socket_close;
  -s->opaque= con;
  +s->type = TCN_SOCKET_SSL;
  +s->cleanup  = ssl_cleanup;
  +s->recv = ssl_socket_recv;
  +s->send = ssl_socket_send;
  +s->sendv= ssl_socket_sendv;
  +s->shutdown = ssl_socket_shutdown;
  +s->close= ssl_socket_close;
  +s->opaque   = con;
   
   return APR_SUCCESS;
   }
  
  
  
  1.30  +1 -3  jakarta-tomcat-connectors/jni/native/src/sslutils.c
  
  Index: sslutils.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslutils.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- sslutils.c17 Jun 2005 09:41:30 -  1.29
  +++ sslutils.c18 Jun 2005 08:01:54 -  1.30
  @@ -336,7 +336,6 @@
   
   RSA *SSL_callback_tmp_RSA(SSL *ssl, int export, int keylen)
   {
  -tcn_ssl_conn_t *conn = (tcn_ssl_conn_t *)SSL_get_app_data(ssl);
   int idx;
   
   /* doesn't matter if export flag is on,
  @@ -372,7 +371,6 @@
*/
   DH *SSL_callback_tmp_DH(SSL *ssl, int export, int keylen)
   {
  -tcn_ssl_conn_t *conn = (tcn_ssl_conn_t *)SSL_get_app_data(ssl);
   int idx;
   switch (keylen) {
   case 512:
  
  
  

-
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/06/18 01:03:21

  Modified:jni/examples/org/apache/tomcat/jni Echo.java SSLServer.java
   jni/java/org/apache/tomcat/jni Poll.java SSLSocket.java
Socket.java
   jni/native/include tcn.h
   jni/native/src network.c poll.c
   util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  Use auto pool management for Socket.accept.
  On each accept the socket's child pool is created and assigned
  to the accepted socket.
  
  Revision  ChangesPath
  1.14  +2 -2  
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java
  
  Index: Echo.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Echo.java 17 Jun 2005 12:03:51 -  1.13
  +++ Echo.java 18 Jun 2005 08:03:21 -  1.14
  @@ -99,7 +99,7 @@
   int i = 0;
   try {
   while (true) {
  -long clientSock = Socket.accept(serverSock, pool);
  +long clientSock = Socket.accept(serverSock);
   System.out.println("Accepted id: " +  i);
   
   try {
  
  
  
  1.10  +3 -3  
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java
  
  Index: SSLServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SSLServer.java17 Jun 2005 12:03:51 -  1.9
  +++ SSLServer.java18 Jun 2005 08:03:21 -  1.10
  @@ -116,7 +116,7 @@
   int i = 0;
   try {
   while (true) {
  -long clientSock = Socket.accept(serverSock, pool);
  +long clientSock = Socket.accept(serverSock);
   System.out.println("Accepted id: " +  i);
   
   try {
  @@ -142,7 +142,7 @@
   }
   
   Socket.timeoutSet(clientSock, 1000);
  -SSLSocket.attach(SSLServer.serverCtx, clientSock, pool);
  +SSLSocket.attach(SSLServer.serverCtx, clientSock);
   i = SSLSocket.handshake(clientSock);
   if (i == 0) {
   
  
  
  
  1.13  +3 -4  
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Poll.java
  
  Index: Poll.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Poll.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Poll.java 17 Jun 2005 11:22:04 -  1.12
  +++ Poll.java 18 Jun 2005 08:03:21 -  1.13
  @@ -113,11 +113,10 @@
* Maintain on the descriptor(s) in a pollset
* @param pollset The pollset to use
* @param descriptors Array of signalled descriptors (output parameter)
  - *The desctiptor array must be two times the size of pollset.
  + *The desctiptor array must be the size of pollset.
*and are populated as follows:
* 
  - * descriptors[n + 0] -> returned events
  - * descriptors[n + 1] -> socket
  + * descriptors[n] -> socket
* 
* @param remove Remove signaled descriptors from pollset
* @return Number of signalled descriptors (output parameter)
  
  
  
  1.15  +3 -5  
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSLSocket.java
  
  Index: SSLSocket.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSLSocket.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SSLSocket.java17 Jun 2005 12:04:40 -  1.14
  +++ SSLSocket.java18 Jun 2005 08:03:21 -  1.15
  @@ -30,12 +30,10 @@
   /**
* Attach APR socket on a SSL connection.
* @param ctx SSLContext to use.
  - * @param sock APR Socket that already did physical connect.
  - * @param pool The pool to use
  - * @param pool The pool to use
  + * @param sock APR Socket that already did physical connect or accept.
* @return APR_STATUS code.
*/
  -public static native int attach(long ctx, long sock, long pool)
  +public static native int attach(long ctx, long sock)
   throws Exception;
   
   /**
  
  
  
  1.17  +3 -3  
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java
  
  Index: Socket.java
  ===
  RCS file: 
/home/cvs/jakarta-

StandardContext and serialization

[Jan Luehe]

[Resending as first attempt seemed to have failed]

Has anybody ever tried serializing a StandardContext?

StandardContext implements java.io.Serializable, but many
of its fields are not. I assume StandardContext has to
be serializable so it can be transmitted (e.g., via RMI)
to any remote javax.management.NotificationListener
(e.g., MapperListener) that gets notified of the context's JMX
registration.

I've started marking some of the non-serializable fields
as transient and reinitialize them in readObject(), but there
are so many direct and indirect references to non-serializable classes
that I'm afraid I'm opening a can of worms.


Jan


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

Status of ajplib

[Alexander Lazic]

Hi,

i have looked at

http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-connectors/ajp/ajplib/src/

and there wasn't changes since 9-10 months.

Please can anybody answer me the questions ;-)

Is the lib up to date to the current mod_jk's?
Will the lib be maintained in the future?
Is this still the only one which implement the ajp?

Thanx.

al ;-)

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

Re: Status of ajplib

[Mladen Turk]

Alexander Lazic wrote:

Hi,

i have looked at

http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-connectors/ajp/ajplib/src/

and there wasn't changes since 9-10 months.



Right. The entire source has been moved to the Apache HTTPD,
and is now part of mod_proxy.

Regards,
Mladen.

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

HEAD build failed

[Mladen Turk]

Anyone has any idea why I'm getting the following error when doing:
'ant download'


build-tomcat-dbcp:

-build-tomcat-dbcp:

BUILD FAILED
C:\W\projects\tomcat\jakarta-tomcat-5\build.xml:1895: The following 
error occurred while executing this line:
C:\W\projects\tomcat\jakarta-tomcat-5\build.xml:671: The following error 
occurred while executing this line:
C:\W\projects\tomcat\jakarta-tomcat-5\build.xml:683: The following error 
occurred while executing this line:
C:\W\projects\tomcat\jakarta-tomcat-5\build.xml:718: Cannot replace 
directory 
C:\W\projects\tomcat\repository\tomcat-deps\src\java\org\apache\tomcat\dbcp 
with directory 
C:\W\projects\tomcat\repository\tomcat-deps\src\java\org\apache\commons



Any clues.

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

Re: HEAD build failed

[Mladen Turk]

Mladen Turk wrote:

Anyone has any idea why I'm getting the following error when doing:
'ant download'


build-tomcat-dbcp:

-build-tomcat-dbcp:

BUILD FAILED



Dissreagard that email ;)
It's an 'ant 1.6.4' problem. What did they do to mess up the move task?


Regards,
Mladen.

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

DO NOT REPLY [Bug 17762] - JNI problems

[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=17762


[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]




--- Additional Comments From [EMAIL PROTECTED]  2005-06-17 19:47 ---
(In reply to comment #8)
> I think people should just avoid JNI for now. It doesn't give any performance
> boost anyway.

Huhh?!? Sorry, I just have to comment..

Please compare the performance (should I say penalty) of *not* using JNI... The
last time I tested (and also just now), shoveling long byte streams through
ServletResponse.getOutputStream() __completely___ brings the native apache
server to a grinding hault (full CPU usage, e.g. D-O-S). My test on a 2GHZ box
of a file download via FileInputStream -> getOutputStream() (4096 buffer)
*pinned* the CPU (the Apache process, specifically), yet could only sustain a
mere 1-2 MBytes/second.

When I compared jni performance a year or two ago (when I could get it to work),
this performance hit was marginal or negligible as I recall. And other JNI based
servers (right now) also have no such performace hit.

I concede that this isn't neccsarily the socket channels architecture's fault
(perhaps it just need to be buffered/optimized on the mod_jk side?), but 
still...

-- 
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 35393] - errorReportValveClass not cound

[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=35393





--- Additional Comments From [EMAIL PROTECTED]  2005-06-17 08:45 ---
Created an attachment (id=15447)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=15447&action=view)
jar file containing the error report valve class


-- 
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/jni/native/src network.c

[mturk]

mturk   2005/06/18 05:02:51

  Modified:jni/native/src network.c
  Log:
  Add transport metricks when compiled with TRACE support.
  
  Revision  ChangesPath
  1.31  +94 -3 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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- network.c 18 Jun 2005 08:03:21 -  1.30
  +++ network.c 18 Jun 2005 12:02:51 -  1.31
  @@ -27,6 +27,17 @@
   static volatile apr_uint32_t sp_closed   = 0;
   static volatile apr_uint32_t sp_cleared  = 0;
   static volatile apr_uint32_t sp_accepted = 0;
  +static volatile apr_uint32_t sp_max_send = 0;
  +static volatile apr_uint32_t sp_min_send = 1000;
  +static volatile apr_uint32_t sp_num_send = 0;
  +static volatile apr_off_tsp_tot_send = 0;
  +static volatile apr_uint32_t sp_max_recv = 0;
  +static volatile apr_uint32_t sp_min_recv = 1000;
  +static volatile apr_uint32_t sp_num_recv = 0;
  +static volatile apr_off_tsp_tot_recv = 0;
  +static volatile apr_uint32_t sp_err_recv = 0;
  +static volatile apr_uint32_t sp_tmo_recv = 0;
  +
   /* Fake private pool struct to deal with APR private's socket
* struct not exposing function to access the pool.
*/
  @@ -60,6 +71,16 @@
   fprintf(stderr, "Sockets accepted: %d\n", sp_accepted);
   fprintf(stderr, "Sockets closed  : %d\n", sp_closed);
   fprintf(stderr, "Sockets cleared : %d\n", sp_cleared);
  +fprintf(stderr, "Total send calls: %d\n", sp_num_send);
  +fprintf(stderr, "Minimum send lenght : %d\n", sp_min_send);
  +fprintf(stderr, "Maximum send lenght : %d\n", sp_max_send);
  +fprintf(stderr, "Average send lenght : %.2f\n", 
(double)sp_tot_send/(double)sp_num_send);
  +fprintf(stderr, "Total recv calls: %d\n", sp_num_recv);
  +fprintf(stderr, "Minimum recv lenght : %d\n", sp_min_recv);
  +fprintf(stderr, "Maximum recv lenght : %d\n", sp_max_recv);
  +fprintf(stderr, "Average recv lenght : %.2f\n", 
(double)sp_tot_recv/(double)sp_num_recv);
  +fprintf(stderr, "Receive timeouts: %d\n", sp_tmo_recv);
  +fprintf(stderr, "Receive errors  : %d\n", sp_err_recv);
   }
   
   #endif
  @@ -399,6 +420,12 @@
   
   UNREFERENCED(o);
   TCN_ASSERT(sock != 0);
  +#ifdef TCN_DO_STATISTICS
  +sp_max_send = TCN_MAX(sp_max_send, nbytes);
  +sp_min_send = TCN_MIN(sp_min_send, nbytes);
  +sp_tot_send += nbytes;
  +sp_num_send++;
  +#endif
   
   if (tosend <= TCN_BUFFER_SZ) {
   char sb[TCN_BUFFER_SZ];
  @@ -438,6 +465,12 @@
   UNREFERENCED(o);
   TCN_ASSERT(sock != 0);
   TCN_ASSERT(buf != NULL);
  +#ifdef TCN_DO_STATISTICS
  +sp_max_send = TCN_MAX(sp_max_send, nbytes);
  +sp_min_send = TCN_MIN(sp_min_send, nbytes);
  +sp_tot_send += nbytes;
  +sp_num_send++;
  +#endif
   
   bytes  = (char *)(*e)->GetDirectBufferAddress(e, buf);
   ss = (*s->send)(s->opaque, bytes + offset, &nbytes);
  @@ -544,6 +577,21 @@
   (*e)->ReleaseByteArrayElements(e, buf, bytes,
  nbytes ? 0 : JNI_ABORT);
   }
  +#ifdef TCN_DO_STATISTICS
  +if (ss == APR_SUCCESS) {
  +sp_max_recv = TCN_MAX(sp_max_recv, nbytes);
  +sp_min_recv = TCN_MIN(sp_min_recv, nbytes);
  +sp_tot_recv += nbytes;
  +sp_num_recv++;
  +}
  +else {
  +if (APR_STATUS_IS_ETIMEDOUT(ss) ||
  +APR_STATUS_IS_TIMEUP(ss))
  +sp_tmo_recv++;
  +else
  +sp_err_recv++;
  +}
  +#endif
   if (ss == APR_SUCCESS)
   return (jint)nbytes;
   else {
  @@ -582,6 +630,21 @@
   }
   /* Resore the original timeout */
   apr_socket_timeout_set(s->sock, t);
  +#ifdef TCN_DO_STATISTICS
  +if (ss == APR_SUCCESS) {
  +sp_max_recv = TCN_MAX(sp_max_recv, nbytes);
  +sp_min_recv = TCN_MIN(sp_min_recv, nbytes);
  +sp_tot_recv += nbytes;
  +sp_num_recv++;
  +}
  +else {
  +if (APR_STATUS_IS_ETIMEDOUT(ss) ||
  +APR_STATUS_IS_TIMEUP(ss))
  +sp_tmo_recv++;
  +else
  +sp_err_recv++;
  +}
  +#endif
   cleanup:
   if (ss == APR_SUCCESS)
   return (jint)nbytes;
  @@ -606,7 +669,21 @@
   bytes  = (char *)(*e)->GetDirectBufferAddress(e, buf);
   TCN_ASSERT(bytes != NULL);
   ss = (*s->recv)(s->opaque, bytes + offset, &nbytes);
  -
  +#ifdef TCN_DO_STATISTICS
  +if (ss == APR_SUCCESS) {
  +sp_max_recv = TCN_MAX(sp_max_recv, nbytes);
  +sp_min_recv = TCN_MIN(sp_min_recv, nbytes);
  +sp_tot_recv += nbytes;
  +sp_num_recv++;
  +}
  +else {
  +if (APR_STATUS_IS_ETIMEDOUT(ss) ||
  +APR_STATUS_IS

cvs commit: jakarta-tomcat-connectors/jni/native configure.in

[mturk]

mturk   2005/06/18 06:04:42

  Modified:jni/native configure.in
  Log:
  Add --enable-maintainer-mode to the configure options, so that
  statistics gets compiled in when configure is called with that option.
  
  Revision  ChangesPath
  1.6   +20 -5 jakarta-tomcat-connectors/jni/native/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/configure.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- configure.in  12 Jun 2005 06:10:13 -  1.5
  +++ configure.in  18 Jun 2005 13:04:42 -  1.6
  @@ -12,7 +12,7 @@
   sinclude(build/find_apr.m4)
   
   dnl Generate ./config.nice for reproducing runs of configure
  -dnl 
  +dnl
   APR_CONFIG_NICE(config.nice)
   
   dnl # Some initial steps for configuration.  We setup the default directory
  @@ -94,11 +94,11 @@
   AC_SUBST(JAVA_OS)
   
   APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include])
  -APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include/$JAVA_OS]) 
  +APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include/$JAVA_OS])
   
   dnl
   dnl Detect openssl toolkit installation
  -dnl 
  +dnl
   TCN_CHECK_SSL_TOOLKIT
   
   so_ext=$APR_SO_EXT
  @@ -113,7 +113,7 @@
   host_alias=`uname -s`
   case "$host_alias" in
   dnl ### BeOS requires that ALL symbols resolve at LINK time!
  -dnl ### 
  +dnl ###
   dnl ### So, if we're building on BeOS then we need to add in the
   dnl ### apr and expat libraries to the build or it'll die a truly 
horrible
   dnl ### death. We now use the apr-config tool to determine the correct
  @@ -128,6 +128,21 @@
   
   AC_SUBST(EXTRA_OS_LINK)
   
  +dnl CFLAGS for maintainer mode
  +dnl it also allows the CFLAGS environment variable.
  +CFLAGS="${CFLAGS}"
  +AC_ARG_ENABLE(
  +maintainer-mode,
  +[  --enable-maintainer-mode   Turn on debugging and compile time warnings],
  +[
  +case "${enableval}" in
  +y | Y | YES | yes | TRUE | true )
  +CFLAGS="${CFLAGS} -DDEBUG -Wall"
  +AC_MSG_RESULT([...Enabling Maintainer mode...])
  +;;
  +esac
  +])
  +
   dnl
   dnl Prep all the flags and stuff for compilation and export to other builds
   dnl
  @@ -178,7 +193,7 @@
   fi
   
   dnl
  -dnl everthing is done. 
  +dnl everthing is done.
   MAKEFILES="Makefile"
   AC_OUTPUT([
   tcnative.pc
  
  
  

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

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

[mturk]

mturk   2005/06/18 07:03:09

  Modified:jni/native/include tcn.h
   jni/native/src network.c sslnetwork.c
  Log:
  Use apr_socket_t as proto for socket callback to make compilers
  happy about struct pointers.
  
  Revision  ChangesPath
  1.23  +6 -6  jakarta-tomcat-connectors/jni/native/include/tcn.h
  
  Index: tcn.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/include/tcn.h,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- tcn.h 18 Jun 2005 08:03:21 -  1.22
  +++ tcn.h 18 Jun 2005 14:03:09 -  1.23
  @@ -118,11 +118,11 @@
   void *opaque;
   int  type;
   apr_status_t (*cleanup)(void *);
  -apr_status_t (APR_THREAD_FUNC *send) (void *, const char *, apr_size_t 
*);
  -apr_status_t (APR_THREAD_FUNC *sendv)(void *, const struct iovec *, 
apr_int32_t, apr_size_t *);
  -apr_status_t (APR_THREAD_FUNC *recv) (void *, char *, apr_size_t *);
  -apr_status_t (APR_THREAD_FUNC *close) (void *);
  -apr_status_t (APR_THREAD_FUNC *shutdown) (void *, apr_shutdown_how_e);
  +apr_status_t (APR_THREAD_FUNC *send) (apr_socket_t *, const char *, 
apr_size_t *);
  +apr_status_t (APR_THREAD_FUNC *sendv)(apr_socket_t *, const struct iovec 
*, apr_int32_t, apr_size_t *);
  +apr_status_t (APR_THREAD_FUNC *recv) (apr_socket_t *, char *, apr_size_t 
*);
  +apr_status_t (APR_THREAD_FUNC *close) (apr_socket_t *);
  +apr_status_t (APR_THREAD_FUNC *shutdown) (apr_socket_t *, 
apr_shutdown_how_e);
   
   } tcn_socket_t;
   
  
  
  
  1.32  +9 -9  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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- network.c 18 Jun 2005 12:02:51 -  1.31
  +++ network.c 18 Jun 2005 14:03:09 -  1.32
  @@ -188,28 +188,28 @@
   
   #if defined(DEBUG) || defined(_DEBUG)
   static APR_INLINE apr_status_t APR_THREAD_FUNC
  -APR_socket_send(void *sock, const char *buf, apr_size_t *len)
  +APR_socket_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
   {
  -return apr_socket_send((apr_socket_t *)sock, buf, len);
  +return apr_socket_send(sock, buf, len);
   }
   
   static APR_INLINE apr_status_t APR_THREAD_FUNC
  -APR_socket_recv(void *sock, char *buf, apr_size_t *len)
  +APR_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
   {
  -return apr_socket_recv((apr_socket_t *)sock, buf, len);
  +return apr_socket_recv(sock, buf, len);
   }
   
   static APR_INLINE apr_status_t APR_THREAD_FUNC
  -APR_socket_sendv(void *sock, const struct iovec *vec,
  +APR_socket_sendv(apr_socket_t *sock, const struct iovec *vec,
apr_int32_t nvec, apr_size_t *len)
   {
  -return apr_socket_sendv((apr_socket_t *)sock, vec, nvec, len);
  +return apr_socket_sendv(sock, vec, nvec, len);
   }
   
   static APR_INLINE apr_status_t APR_THREAD_FUNC
  -APR_socket_shutdown(void *sock, apr_shutdown_how_e how)
  +APR_socket_shutdown(apr_socket_t *sock, apr_shutdown_how_e how)
   {
  -return apr_socket_shutdown((apr_socket_t *)sock, how);
  +return apr_socket_shutdown(sock, how);
   }
   
   #else
  
  
  
  1.17  +8 -7  jakarta-tomcat-connectors/jni/native/src/sslnetwork.c
  
  Index: sslnetwork.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslnetwork.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- sslnetwork.c  18 Jun 2005 08:01:54 -  1.16
  +++ sslnetwork.c  18 Jun 2005 14:03:09 -  1.17
  @@ -206,7 +206,7 @@
   }
   
   static apr_status_t APR_THREAD_FUNC
  -ssl_socket_shutdown(void *sock, apr_shutdown_how_e how)
  +ssl_socket_shutdown(apr_socket_t *sock, apr_shutdown_how_e how)
   {
   apr_status_t rv = APR_SUCCESS;
   tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
  @@ -223,7 +223,7 @@
   }
   
   static apr_status_t APR_THREAD_FUNC
  -ssl_socket_close(void *sock)
  +ssl_socket_close(apr_socket_t *sock)
   {
   tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
   apr_status_t rv = APR_SUCCESS;
  @@ -309,7 +309,7 @@
   }
   
   static apr_status_t APR_THREAD_FUNC
  -ssl_socket_recv(void *sock, char *buf, apr_size_t *len)
  +ssl_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
   {
   tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
   int s, rd = (int)(*len);
  @@ -356,7 +356,7 @@
   }
   
   static apr_status_t APR_THREAD_FUNC
  -ssl_socket_send(void *sock, const char *buf,
  +ssl_socket_send(apr_socket_t *sock, const char *buf,
   apr_size_t *len)
   {
   tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
  @@ -3

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

[mturk]

mturk   2005/06/18 07:34:28

  Modified:jni/native/include tcn.h
   jni/native/src network.c
  Log:
  Add more assertions to the network for DEBUG builds.
  
  Revision  ChangesPath
  1.24  +6 -5  jakarta-tomcat-connectors/jni/native/include/tcn.h
  
  Index: tcn.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/include/tcn.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- tcn.h 18 Jun 2005 14:03:09 -  1.23
  +++ tcn.h 18 Jun 2005 14:34:28 -  1.24
  @@ -107,10 +107,11 @@
   
   #define TCN_GETNET_METHOD(FN)  method_##FN
   
  -#define TCN_SOCKET_APR  0
  -#define TCN_SOCKET_SSL  1
  -#define TCN_SOCKET_UNIX 2
  -#define TCN_SOCKET_NTPIPE   3
  +#define TCN_SOCKET_UNKNOWN  0
  +#define TCN_SOCKET_APR  1
  +#define TCN_SOCKET_SSL  2
  +#define TCN_SOCKET_UNIX 3
  +#define TCN_SOCKET_NTPIPE   4
   
   typedef struct {
   apr_pool_t   *pool;
  
  
  
  1.33  +31 -11jakarta-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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- network.c 18 Jun 2005 14:03:09 -  1.32
  +++ network.c 18 Jun 2005 14:34:28 -  1.33
  @@ -233,21 +233,24 @@
   GET_S_FAMILY(f, family);
   GET_S_TYPE(t, type);
   
  -TCN_THROW_IF_ERR(apr_socket_create(&s,
  - f, t, protocol, p), a);
  -
  +if (family > 0) { 
  +TCN_THROW_IF_ERR(apr_socket_create(&s,
  + f, t, protocol, p), a);
  +}
   #ifdef TCN_DO_STATISTICS
   sp_created++;
   #endif
   a = (tcn_socket_t *)apr_pcalloc(p, sizeof(tcn_socket_t));
   a->sock = s;
   a->pool = p;
  -a->type = TCN_SOCKET_APR;
  -a->recv = APR_socket_recv;
  -a->send = APR_socket_send;
  -a->sendv= APR_socket_sendv;
  -a->shutdown = APR_socket_shutdown;
  -a->close= NULL;
  +if (family > 0) { 
  +a->type = TCN_SOCKET_APR;
  +a->recv = APR_socket_recv;
  +a->send = APR_socket_send;
  +a->sendv= APR_socket_sendv;
  +a->shutdown = APR_socket_shutdown;
  +a->close= NULL;
  +}
   a->opaque   = s;
   apr_pool_cleanup_register(p, (const void *)a,
 sp_socket_cleanup,
  @@ -262,6 +265,7 @@
   {
   tcn_socket_t *s = J2P(sock, tcn_socket_t *);
   UNREFERENCED_STDARGS;
  +TCN_ASSERT(sock != 0);
   apr_pool_destroy(s->pool);
   }
   
  @@ -271,6 +275,7 @@
   apr_pool_t *n;
   
   UNREFERENCED(o);
  +TCN_ASSERT(sock != 0);
   TCN_THROW_IF_ERR(apr_pool_create(&n, s->pool), n);
   cleanup:
   return P2J(n);
  @@ -313,6 +318,7 @@
   
   UNREFERENCED_STDARGS;
   TCN_ASSERT(sock != 0);
  +TCN_ASSERT(s->sock != NULL);
   return (jint)apr_socket_bind(s->sock, a);
   }
   
  @@ -323,6 +329,7 @@
   
   UNREFERENCED_STDARGS;
   TCN_ASSERT(sock != 0);
  +TCN_ASSERT(s->sock != NULL);
   return (jint)apr_socket_listen(s->sock, backlog);
   }
   
  @@ -336,6 +343,7 @@
   
   UNREFERENCED(o);
   TCN_ASSERT(sock != 0);
  +TCN_ASSERT(s->sock != NULL);
   
   TCN_THROW_IF_ERR(apr_socket_accept(&n, s->sock, p), n);
   
  @@ -371,6 +379,7 @@
   
   UNREFERENCED(o);
   TCN_ASSERT(sock != 0);
  +TCN_ASSERT(s->sock != NULL);
   
   TCN_THROW_IF_ERR(apr_pool_create(&p, s->pool), p);
   TCN_THROW_IF_ERR(apr_socket_accept(&n, s->sock, p), n);
  @@ -408,6 +417,7 @@
   
   UNREFERENCED_STDARGS;
   TCN_ASSERT(sock != 0);
  +TCN_ASSERT(s->sock != NULL);
   return (jint)apr_socket_connect(s->sock, a);
   }
   
  @@ -420,6 +430,7 @@
   
   UNREFERENCED(o);
   TCN_ASSERT(sock != 0);
  +TCN_ASSERT(s->sock != NULL);
   #ifdef TCN_DO_STATISTICS
   sp_max_send = TCN_MAX(sp_max_send, nbytes);
   sp_min_send = TCN_MIN(sp_min_send, nbytes);
  @@ -430,7 +441,7 @@
   if (tosend <= TCN_BUFFER_SZ) {
   char sb[TCN_BUFFER_SZ];
   (*e)->GetByteArrayRegion(e, buf, offset, tosend, (jbyte *)sb);
  -ss = apr_socket_send(s->sock, sb, &nbytes);
  +ss = (*s->send)(s->opaque, sb, &nbytes);
   }
   else {
   jbyte *bytes;
  @@ -533,6 +544,7 @@
   
   UNREFERENCED(o);
   TCN_ASSERT(sock != 0);
  +TCN_ASSERT(s->sock != NULL);
   
   bytes = (*e)->GetByteArrayElements(e, buf, NULL);
   TCN_ASSERT(bytes != NULL);
  @@ -611,6 +623,7 @@
   
   UNREFERENCED(o);
   TCN_ASSERT(sock != 0);
  +TCN_ASSERT(s->sock != NULL);
   TCN_ASSERT(buf != NULL);
   
   if ((ss = apr_socket_timeout_get(s->sock, &t)) != APR_SUCCESS)
  @@ -705,6 +718,7 @@
   UNREFERENCED(o);

Re: Status of ajplib

[Alexander Lazic]

Hi,

On Sam 18.06.2005 11:53, Mladen Turk wrote:

Alexander Lazic wrote:

Hi,

i have looked at

http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-connectors/ajp/ajplib/src/

and there wasn't changes since 9-10 months.



Right. The entire source has been moved to the Apache HTTPD, and is now
part of mod_proxy.


Oh, is the idea behind a ajblib dead?

---
From: Mladen Turk <[EMAIL PROTECTED]>
Subject: RE: Mod_ajp initial
Date: Sun, 1 Aug 2004 11:46:24 +0200
Message-Id: <[EMAIL PROTECTED]>
---

al ;-)

-
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/06/18 08:10:22

  Modified:jni/native/src network.c
  Log:
  Add TRACE for connection closed errors.
  
  Revision  ChangesPath
  1.34  +15 -1 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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- network.c 18 Jun 2005 14:34:28 -  1.33
  +++ network.c 18 Jun 2005 15:10:22 -  1.34
  @@ -37,6 +37,7 @@
   static volatile apr_off_tsp_tot_recv = 0;
   static volatile apr_uint32_t sp_err_recv = 0;
   static volatile apr_uint32_t sp_tmo_recv = 0;
  +static volatile apr_uint32_t sp_rst_recv = 0;
   
   /* Fake private pool struct to deal with APR private's socket
* struct not exposing function to access the pool.
  @@ -81,6 +82,7 @@
   fprintf(stderr, "Average recv lenght : %.2f\n", 
(double)sp_tot_recv/(double)sp_num_recv);
   fprintf(stderr, "Receive timeouts: %d\n", sp_tmo_recv);
   fprintf(stderr, "Receive errors  : %d\n", sp_err_recv);
  +fprintf(stderr, "Receive resets  : %d\n", sp_rst_recv);
   }
   
   #endif
  @@ -600,6 +602,9 @@
   if (APR_STATUS_IS_ETIMEDOUT(ss) ||
   APR_STATUS_IS_TIMEUP(ss))
   sp_tmo_recv++;
  +else if (APR_STATUS_IS_ECONNABORTED(ss) ||
  + APR_STATUS_IS_ECONNRESET(ss))
  +sp_rst_recv++;
   else
   sp_err_recv++;
   }
  @@ -654,6 +659,9 @@
   if (APR_STATUS_IS_ETIMEDOUT(ss) ||
   APR_STATUS_IS_TIMEUP(ss))
   sp_tmo_recv++;
  +else if (APR_STATUS_IS_ECONNABORTED(ss) ||
  + APR_STATUS_IS_ECONNRESET(ss))
  +sp_rst_recv++;
   else
   sp_err_recv++;
   }
  @@ -693,6 +701,9 @@
   if (APR_STATUS_IS_ETIMEDOUT(ss) ||
   APR_STATUS_IS_TIMEUP(ss))
   sp_tmo_recv++;
  +else if (APR_STATUS_IS_ECONNABORTED(ss) ||
  + APR_STATUS_IS_ECONNRESET(ss))
  +sp_rst_recv++;
   else
   sp_err_recv++;
   }
  @@ -741,6 +752,9 @@
   if (APR_STATUS_IS_ETIMEDOUT(ss) ||
   APR_STATUS_IS_TIMEUP(ss))
   sp_tmo_recv++;
  +else if (APR_STATUS_IS_ECONNABORTED(ss) ||
  + APR_STATUS_IS_ECONNRESET(ss))
  +sp_rst_recv++;
   else
   sp_err_recv++;
   }
  
  
  

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

DO NOT REPLY [Bug 21956] - org.apache.coyote.tomcat4.CoyoteConnector cannot recognise keystoreType for Solaris only

[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=21956


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Additional Comments From [EMAIL PROTECTED]  2005-06-18 17:19 ---
I don't have access to a solaris box to test this on but I have tested it on
both Windows (XP SP2) and Linux (Mandrake 10.0).

Given that JCEKS keystores worked for me on both this looks like either a
configuration error when you setup your solaris box or a Solaris specific JSSE
issue. My money would be on a configuration error but either way this isn't a
Tomcat issue.

-- 
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/jni/native/src network.c

[mturk]

mturk   2005/06/18 08:35:44

  Modified:jni/native/src network.c
  Log:
  APR_EOF is also the 'reset' event caused by remote closing the socket.
  
  Revision  ChangesPath
  1.35  +23 -9 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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- network.c 18 Jun 2005 15:10:22 -  1.34
  +++ network.c 18 Jun 2005 15:35:44 -  1.35
  @@ -38,6 +38,7 @@
   static volatile apr_uint32_t sp_err_recv = 0;
   static volatile apr_uint32_t sp_tmo_recv = 0;
   static volatile apr_uint32_t sp_rst_recv = 0;
  +static volatile apr_status_t sp_erl_recv = 0;
   
   /* Fake private pool struct to deal with APR private's socket
* struct not exposing function to access the pool.
  @@ -83,6 +84,7 @@
   fprintf(stderr, "Receive timeouts: %d\n", sp_tmo_recv);
   fprintf(stderr, "Receive errors  : %d\n", sp_err_recv);
   fprintf(stderr, "Receive resets  : %d\n", sp_rst_recv);
  +fprintf(stderr, "Last receive error  : %d\n", sp_erl_recv);
   }
   
   #endif
  @@ -603,10 +605,13 @@
   APR_STATUS_IS_TIMEUP(ss))
   sp_tmo_recv++;
   else if (APR_STATUS_IS_ECONNABORTED(ss) ||
  - APR_STATUS_IS_ECONNRESET(ss))
  + APR_STATUS_IS_ECONNRESET(ss) ||
  + APR_STATUS_IS_EOF(ss))
   sp_rst_recv++;
  -else
  +else {
   sp_err_recv++;
  +sp_erl_recv = ss;
  +}
   }
   #endif
   if (ss == APR_SUCCESS)
  @@ -660,10 +665,13 @@
   APR_STATUS_IS_TIMEUP(ss))
   sp_tmo_recv++;
   else if (APR_STATUS_IS_ECONNABORTED(ss) ||
  - APR_STATUS_IS_ECONNRESET(ss))
  + APR_STATUS_IS_ECONNRESET(ss) ||
  + APR_STATUS_IS_EOF(ss))
   sp_rst_recv++;
  -else
  +else {
   sp_err_recv++;
  +sp_erl_recv = ss;
  +}
   }
   #endif
   cleanup:
  @@ -702,10 +710,13 @@
   APR_STATUS_IS_TIMEUP(ss))
   sp_tmo_recv++;
   else if (APR_STATUS_IS_ECONNABORTED(ss) ||
  - APR_STATUS_IS_ECONNRESET(ss))
  + APR_STATUS_IS_ECONNRESET(ss) ||
  + APR_STATUS_IS_EOF(ss))
   sp_rst_recv++;
  -else
  +else {
   sp_err_recv++;
  +sp_erl_recv = ss;
  +}
   }
   #endif
   if (ss == APR_SUCCESS)
  @@ -753,10 +764,13 @@
   APR_STATUS_IS_TIMEUP(ss))
   sp_tmo_recv++;
   else if (APR_STATUS_IS_ECONNABORTED(ss) ||
  - APR_STATUS_IS_ECONNRESET(ss))
  + APR_STATUS_IS_ECONNRESET(ss) ||
  + APR_STATUS_IS_EOF(ss))
   sp_rst_recv++;
  -else
  +else {
   sp_err_recv++;
  +sp_erl_recv = ss;
  +}
   }
   #endif
   if (ss == APR_SUCCESS)
  
  
  

-
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/06/18 09:07:59

  Modified:jni/native/src network.c
  Log:
  Remove fake apr_socket_t struct. It is not needed any more.
  
  Revision  ChangesPath
  1.36  +1 -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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- network.c 18 Jun 2005 15:35:44 -  1.35
  +++ network.c 18 Jun 2005 16:07:59 -  1.36
  @@ -40,13 +40,6 @@
   static volatile apr_uint32_t sp_rst_recv = 0;
   static volatile apr_status_t sp_erl_recv = 0;
   
  -/* Fake private pool struct to deal with APR private's socket
  - * struct not exposing function to access the pool.
  - */
  -typedef struct
  -{
  -apr_pool_t *pool;
  -} fake_apr_socket_t;
   #endif
   
   #if  !APR_HAVE_IPV6
  
  
  

-
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/06/18 09:36:15

  Modified:jni/java/org/apache/tomcat/jni Socket.java
   jni/native/include tcn.h
   jni/native/src network.c
  Log:
  Add Socket.get method for obtaining private struct members.
  
  Revision  ChangesPath
  1.18  +21 -1 
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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Socket.java   18 Jun 2005 08:03:21 -  1.17
  +++ Socket.java   18 Jun 2005 16:36:15 -  1.18
  @@ -97,6 +97,12 @@
   public static final int APR_LOCAL  = 0;
   public static final int APR_REMOTE = 1;
   
  +/* Socket.get types */
  +public static final int SOCKET_GET_POOL = 0;
  +public static final int SOCKET_GET_IMPL = 1;
  +public static final int SOCKET_GET_APRS = 2;
  +public static final int SOCKET_GET_TYPE = 3;
  +
   /**
* Create a socket.
* @param family The address family of the socket (e.g., APR_INET).
  @@ -468,4 +474,18 @@
   public static native long pool(long thesocket)
   throws Exception;
   
  +/**
  + * Private method for geting the socket struct members
  + * @param socket The soocket to use
  + * @param what Struct member to obtain
  + * 
  + * SOCKET_GET_POOL  - The socket pool
  + * SOCKET_GET_IMPL  - The socket implementation object
  + * SOCKET_GET_APRS  - APR socket
  + * SOCKET_GET_TYPE  - Socket type
  + * 
  + * @return The stucture member address
  + */
  +private static native long get(long socket, int what);
  +
   }
  
  
  
  1.25  +6 -1  jakarta-tomcat-connectors/jni/native/include/tcn.h
  
  Index: tcn.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/include/tcn.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- tcn.h 18 Jun 2005 14:34:28 -  1.24
  +++ tcn.h 18 Jun 2005 16:36:15 -  1.25
  @@ -113,6 +113,11 @@
   #define TCN_SOCKET_UNIX 3
   #define TCN_SOCKET_NTPIPE   4
   
  +#define TCN_SOCKET_GET_POOL 0
  +#define TCN_SOCKET_GET_IMPL 1
  +#define TCN_SOCKET_GET_APRS 2
  +#define TCN_SOCKET_GET_TYPE 3
  +
   typedef struct {
   apr_pool_t   *pool;
   apr_socket_t *sock;
  
  
  
  1.37  +24 -1 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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- network.c 18 Jun 2005 16:07:59 -  1.36
  +++ network.c 18 Jun 2005 16:36:15 -  1.37
  @@ -278,6 +278,29 @@
   return P2J(n);
   }
   
  +TCN_IMPLEMENT_CALL(jlong, Socket, get)(TCN_STDARGS, jlong sock, jint what)
  +{
  +tcn_socket_t *s = J2P(sock, tcn_socket_t *);
  +UNREFERENCED_STDARGS;
  +TCN_ASSERT(sock != 0);
  +
  +switch (what) {
  +case TCN_SOCKET_GET_POOL:
  +return P2J(s->pool);
  +break;
  +case TCN_SOCKET_GET_IMPL:
  +return P2J(s->opaque);
  +break;
  +case TCN_SOCKET_GET_APRS:
  +return P2J(s->sock);
  +break;
  +case TCN_SOCKET_GET_TYPE:
  +return P2J(s->type);
  +break;
  +}
  +return 0;
  +}
  +
   TCN_IMPLEMENT_CALL(jint, Socket, shutdown)(TCN_STDARGS, jlong sock,
  jint how)
   {
  
  
  

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

Re: Status of ajplib

[Mladen Turk]

Alexander Lazic wrote:


Right. The entire source has been moved to the Apache HTTPD, and is now
part of mod_proxy.


Oh, is the idea behind a ajblib dead?



Not sure :).
Perhaps it will finish as a console application for testing AJP
protocol (something like ab does for the http).
Beside that I see no other purpose for that peace of code.

Well, I was thinking to use it as foundation for the windows
http.sys. But who knows what the next windows generation
will offer. Since the development would take much more
then  next WIN-xx release, and since it would be a WIN only,
there is no need to use the APR, so again probably useless.


Regards,
Mladen.

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

Tomcat native WIN32 binaries

[Mladen Turk]

Hi,

If someone wishes to test the bleeding edge Tomcat Native,
the WIN32 binaries can be found at:

http://people.apache.org/~mturk/native/

I'll try to keep those up to date until we figure out the
binary distribution mode.

Regards,
Mladen.


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

Re: HEAD build failed

[Bill Barker]

- Original Message - 
From: "Mladen Turk" <[EMAIL PROTECTED]>

To: "Tomcat Developers List" 
Sent: Saturday, June 18, 2005 3:41 AM
Subject: HEAD build failed



Anyone has any idea why I'm getting the following error when doing:
'ant download'



You're using a broken version of Ant.  You need to upgrade (or downgrade) to 
a version that works.




build-tomcat-dbcp:

-build-tomcat-dbcp:

BUILD FAILED
C:\W\projects\tomcat\jakarta-tomcat-5\build.xml:1895: The following error 
occurred while executing this line:
C:\W\projects\tomcat\jakarta-tomcat-5\build.xml:671: The following error 
occurred while executing this line:
C:\W\projects\tomcat\jakarta-tomcat-5\build.xml:683: The following error 
occurred while executing this line:
C:\W\projects\tomcat\jakarta-tomcat-5\build.xml:718: Cannot replace 
directory 
C:\W\projects\tomcat\repository\tomcat-deps\src\java\org\apache\tomcat\dbcp 
with directory 
C:\W\projects\tomcat\repository\tomcat-deps\src\java\org\apache\commons



Any clues.

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







This message is intended only for the use of the person(s) listed above as the 
intended recipient(s), and may contain information that is PRIVILEGED and 
CONFIDENTIAL.  If you are not an intended recipient, you may not read, copy, or 
distribute this message or any attachment. If you received this communication 
in error, please notify us immediately by e-mail and then delete all copies of 
this message and any attachments.

In addition you should be aware that ordinary (unencrypted) e-mail sent through 
the Internet is not secure. Do not send confidential or sensitive information, 
such as social security numbers, account numbers, personal identification 
numbers and passwords, to us via ordinary (unencrypted) e-mail.


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

DO NOT REPLY [Bug 35411] New: - jasper tries to create .java file in inexistant directory

[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=35411

   Summary: jasper tries to create .java file in inexistant
directory
   Product: Tomcat 5
   Version: 5.5.9
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Jasper
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


This happens even for some JSP examples bundled with tomcat itself, for example
the "JSP configuration" JSP 2.0 example:

Jun 18, 2005 10:03:51 PM org.apache.catalina.core.StandardWrapperValve invoke
SEVERE: Servlet.service() for servlet jsp threw exception
java.io.FileNotFoundException:
/home/www/gra/jakarta-tomcat-5.5.9/work/Catalina/localhost/jsp-examples/org/apache/jsp/jsp2/misc/config_jsp.java
at java.io.FileOutputStream.open(Native Method)
at java.io.FileOutputStream.(FileOutputStream.java:179)
at java.io.FileOutputStream.(FileOutputStream.java:70)
at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:131)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:286)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:267)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:255)
at
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:556)
at
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:293)
at 
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:291)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:241)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:802)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:252)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:173)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:213)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:178)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:407)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:126)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:105)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:107)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:148)
at
org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:856)
at
org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.processConnection(Http11Protocol.java:744)
at
org.apache.tomcat.util.net.PoolTcpEndpoint.processSocket(PoolTcpEndpoint.java:527)
at
org.apache.tomcat.util.net.LeaderFollowerWorkerThread.runIt(LeaderFollowerWorkerThread.java:80)
at
org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:684)
at java.lang.Thread.run(Thread.java:595)
java.io.FileNotFoundException:
/home/www/gra/jakarta-tomcat-5.5.9/work/Catalina/localhost/jsp-examples/org/apache/jsp/jsp2/misc/config_jsp.java
at java.io.FileOutputStream.open(Native Method)
at java.io.FileOutputStream.(FileOutputStream.java:179)
at java.io.FileOutputStream.(FileOutputStream.java:70)
at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:131)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:286)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:267)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:255)
at
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:556)
at
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:293)
at 
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:291)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:241)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:802)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:252)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:173)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:213)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:178)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:407)
at
org.apache.catalina.core.Standard