Re: Sun One/iPlanet nsapi_redirector issue

2005-06-15 Thread jean-frederic clere

Kevin Convy (Contractor) wrote:

I am having an issue posting a large request (that also requires
authentication) through a Sun One/IPlanet 6.0sp5 webserver to Tomcat 5.5
using the 1.2.8 nsapi_redirector. The client that is doing the posting
gets a server write error if the request body is over a certain size
(~150K). The issue occurs on both the Windows XP and Solaris
versions.The issue does NOT occur using an Apache-mod_jk configuration.
If I use the attached version of the ajp_process_callback method in
jk_ajp_common.c (changes from the 1.2.8 version of the code are marked
with KCADD comments) it resolves the problem.


A diff -u would help to see your changes.


It seems to resolve it by
making sure the entire request body is read off the netbuf before
turning around and starting the response (which occurs in this case
because an authentication challenge is sent before the entire request is
read by tomcat). I don't mean to offer this as a fix, but I was
wondering if this is a known issue and if there is a better fix
somewhere. 
 
I sent a slightly different version of this email to the tomcat-user

list a couple of weeks ago and apologize for the cross-post.
 
Thanks,
 
Kevin Convy

Icebox LLC
 
 
 
static int ajp_process_callback(jk_msg_buf_t *msg,

jk_msg_buf_t *pmsg,
ajp_endpoint_t * ae,
jk_ws_service_t *r, jk_logger_t *l)
{
int code = (int)jk_b_get_byte(msg);
// KCADD
int bytesread = 0;
unsigned char buf1[AJP13_MAX_SEND_BODY_SZ];
 
JK_TRACE_ENTER(l);

switch (code) {
case JK_AJP13_SEND_HEADERS:
{
jk_res_data_t res;
if (!ajp_unmarshal_response(msg, res, ae, l)) {
jk_log(l, JK_LOG_ERROR,
   ajp_unmarshal_response failed\n);
JK_TRACE_EXIT(l);
return JK_AJP13_ERROR;
}

//KCADD

// make sure the entire request body has been read.
jk_log(l, JK_LOG_INFO, KCDEBUG: this many bytes left: %d,
ae-left_bytes_to_send);
while(ae-left_bytes_to_send  0) {
r-read(r, buf1, AJP13_MAX_SEND_BODY_SZ, bytesread);
ae-left_bytes_to_send -= bytesread;
}
 
r-start_response(r, res.status, res.msg,

  (const char *const *)res.header_names,
  (const char *const *)res.header_values,
  res.num_headers);
}
return JK_AJP13_SEND_HEADERS;
 
case JK_AJP13_SEND_BODY_CHUNK:

{
unsigned len = (unsigned)jk_b_get_int(msg);
if (!r-write(r, jk_b_get_buff(msg) + jk_b_get_pos(msg),
len)) {
jk_log(l, JK_LOG_INFO,
   Connection aborted or network problems\n);
JK_TRACE_EXIT(l);
return JK_CLIENT_ERROR;
}
}
break;
 
case JK_AJP13_GET_BODY_CHUNK:

{
int len = (int)jk_b_get_int(msg);
 
if (len  0) {

len = 0;
}
if (len  AJP13_MAX_SEND_BODY_SZ) {
len = AJP13_MAX_SEND_BODY_SZ;
}
if ((unsigned int)len  ae-left_bytes_to_send) {
len = ae-left_bytes_to_send;
}
 
/* the right place to add file storage for upload */

if ((len = ajp_read_into_msg_buff(ae, r, pmsg, len, l)) =
0) {
r-content_read += len;
JK_TRACE_EXIT(l);
return JK_AJP13_HAS_RESPONSE;
}
 
jk_log(l, JK_LOG_INFO,

   Connection aborted or network problems\n);
 
JK_TRACE_EXIT(l);

return JK_CLIENT_ERROR;
}
break;
 
case JK_AJP13_END_RESPONSE:

{
ae-reuse = (int)jk_b_get_byte(msg);
 
if (!ae-reuse) {

/*
 * Strange protocol error.
 */
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG, Reuse: %d\n, ae-reuse);
ae-reuse = JK_FALSE;
}
/* Reuse in all cases */
ae-reuse = JK_TRUE;
}
JK_TRACE_EXIT(l);
return JK_AJP13_END_RESPONSE;
break;
 
default:

jk_log(l, JK_LOG_ERROR,
   Invalid code: %d\n, code);
JK_TRACE_EXIT(l);
return JK_AJP13_ERROR;
}
 
JK_TRACE_EXIT(l);

return JK_AJP13_NO_RESPONSE;
}




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



Removing the default server error pages

2005-06-15 Thread Robert Clarkson
Hi there, I am using tomcat 5.5 as an RTSP server, and I need to send
response codes back, but I do not need to send any HTML response back. I
know that I can change the response page that is returned by editing web.xml
and adding the following

error-page
 error-code404/error-code
 location/index.html/location
/error-page

But what I need is to prevent tomcat from sending an error page altogether.
It seems to me that I could get all of the error codes to redirect to an
empty page, but this is sloppy, I would much rather change something to
prevent tomcat from sending a page back.

Any help much appreciated

Rob



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



Re: Removing the default server error pages

2005-06-15 Thread Bernard
Hi Rob,

I have the same problem as you have.
I can tell you what I did but it is not as good as I want it to be.
Maybe others will help us with a better solution.

So I wrote SilentErrorValve.java. This is insufficient because one has
to have a response otherwise (in my case with apache httpd amd
mod_jk), I get 2 errors, the second being an error from mod_jk where
the error page is not found. But it is a start, and at least I don't
get a stack trace which was my primary objective.

To enable the custom response, I need the attribute
errorReportValveClass=mypackage.SilentErrorValve in every Host
entry in server.xml.

What I would prefer is to put the HTML code instead of a file into
web.xml such as (I am making this up - it would not work):
error-page
 error-code404/error-code
 content
 html![CDATA[bodyNot found/body]]/html
 /content
/error-page


But that is still ugly. What I would really like is that Tomcat and
mod_jk would pass on every error to Apache httpd as a 500 server
error. The reason is that in any case httpd has to have error response
pages and everyone hates creating two sets of pages for the same
thing.

In my case, tomcat does not serve any static pages, only generated
content, so it does not even have a document directory where it could
read files from.

BTW where is the correct use of error-page documented?


Regards,
Bernard

package mypackage;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.Globals;
import org.apache.catalina.valves.ValveBase;

public class SilentErrorValve extends ValveBase{
/**
 * Invoke the next Valve in the sequence. When the invoke returns,
check
 * the response state, and output an error report is necessary.
 *
 * @param request The servlet request to be processed
 * @param response The servlet response to be created
 *
 * @exception IOException if an input/output error occurs
 * @exception ServletException if a servlet error occurs
 */
public void invoke(Request request, Response response)
throws IOException, ServletException {

// Perform the request
getNext().invoke(request, response);

ServletRequest sreq = (ServletRequest) request;
Throwable throwable =
(Throwable) sreq.getAttribute(Globals.EXCEPTION_ATTR);

ServletResponse sresp = (ServletResponse) response;
if (sresp.isCommitted()) {
return;
}

if (throwable != null) {

// The response is an error
response.setError();

// Reset the response (if possible)
try {
sresp.reset();
} catch (IllegalStateException e) {
;
}

response.sendError
(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);

}

response.setSuspended(false);

// The difference from ErrorReportValve is that we don't return a
report
// in the response.
//try {
//report(request, response, throwable);
//} catch (Throwable tt) {
//tt.printStackTrace();
//}

}



}







On Wed, 15 Jun 2005 09:17:35 +0100, you wrote:

Hi there, I am using tomcat 5.5 as an RTSP server, and I need to send
response codes back, but I do not need to send any HTML response back. I
know that I can change the response page that is returned by editing web.xml
and adding the following

error-page
 error-code404/error-code
 location/index.html/location
/error-page

But what I need is to prevent tomcat from sending an error page altogether.
It seems to me that I could get all of the error codes to redirect to an
empty page, but this is sloppy, I would much rather change something to
prevent tomcat from sending a page back.

Any help much appreciated

Rob



-
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 34693] - Tomcat infinite wait on noised network

2005-06-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34693.
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=34693


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|CLOSED




--- Additional Comments From [EMAIL PROTECTED]  2005-06-15 10:40 ---
in conf/server.xml, in the node:

Connector port=8080 maxHttpHeaderSize=8192 ...

add the attribute connectionLinger=6 seem to solve/alleviate the 
problem.


-- 
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/scripts/build rules.mk

2005-06-15 Thread jfclere
jfclere 2005/06/15 04:10:40

  Modified:jk/native/scripts/build rules.mk
  Log:
  Use -o $@ overwise make in apache-2.0 will fail with libtool 1.5.2
  
  Revision  ChangesPath
  1.5   +1 -2  
jakarta-tomcat-connectors/jk/native/scripts/build/rules.mk
  
  Index: rules.mk
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/scripts/build/rules.mk,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- rules.mk  2 Nov 2001 18:42:25 -   1.4
  +++ rules.mk  15 Jun 2005 11:10:39 -  1.5
  @@ -4,8 +4,7 @@
   # Compile commands
   #VPATH=.:../common
   COMPILE  = $(CC) $(CFLAGS)
  -LT_COMPILE   = $(LIBTOOL) --mode=compile $(COMPILE) -c $ 
  -#  touch $@
  +LT_COMPILE   = $(LIBTOOL) --mode=compile $(COMPILE) -c $ -o $@
   
   # Implicit rules for creating outputs from input files
   
  
  
  

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



Risposta automatica

2005-06-15 Thread f . buratti
Il messaggio è stato ricevuto. Sarete contattati quanto prima.

Fabrizio Buratti

http://www.studioexe.it



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



DO NOT REPLY [Bug 35368] New: - CVS backups of removed jars prevent TldLocationsCache from initializing

2005-06-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=35368.
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=35368

   Summary: CVS backups of removed jars prevent TldLocationsCache
from initializing
   Product: Tomcat 5
   Version: 5.5.9
  Platform: All
OS/Version: All
Status: NEW
  Severity: minor
  Priority: P5
 Component: Jasper
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


When a jar file is removed from WEB-INF\lib using the CVS remove command.  A 
backup file is left in the directory named .#filename.removed.jar.  If the 
project is subsequently deployed and the jar backup remains in the WEB-INF\lib 
directory.  The following error occurs on JSP files that contain a %@ 
taglib ... % command...

SEVERE: Servlet.service() for servlet jsp threw exception
org.apache.jasper.JasperException: Unable to initialize TldLocationsCache: 
no !/ in spec
at org.apache.jasper.compiler.TldLocationsCache.init
(TldLocationsCache.java:252)

The error gives little indication as to the cause of the problem.  Removing 
the .#filename.removed.jar from the WEB-INF/lib will correct the 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]



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

2005-06-15 Thread 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 6 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://vmgump.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://vmgump.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: 48 secs
Command Line: make 
[Working Directory: 
/usr/local/gump/public/workspace/jakarta-tomcat-connectors/jk/native]
-
make[1]: Entering directory 
`/x1/gump/public/workspace/jakarta-tomcat-connectors/jk/native/common'
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp12_worker.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_connect.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_msg_buff.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_util.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp13.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_pool.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_worker.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp13_worker.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 

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

2005-06-15 Thread 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 6 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://vmgump.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://vmgump.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: 48 secs
Command Line: make 
[Working Directory: 
/usr/local/gump/public/workspace/jakarta-tomcat-connectors/jk/native]
-
make[1]: Entering directory 
`/x1/gump/public/workspace/jakarta-tomcat-connectors/jk/native/common'
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp12_worker.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_connect.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_msg_buff.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_util.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp13.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_pool.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_worker.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp13_worker.c 
mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-15062005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR  
-I/usr/local/gump/public/workspace/apr/dest-15062005/include/apr-1 
-I/usr/local/gump/public/workspace/apr-util/dest-15062005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I 

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

2005-06-15 Thread jean-frederic clere

Bill Barker wrote:

To whom it may engage...



I think I have fixed this one in rules.mk

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



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

2005-06-15 Thread mturk
mturk   2005/06/15 05:08:02

  Modified:jni/java/org/apache/tomcat/jni SSL.java SSLSocket.java
   jni/native/include ssl_private.h
   jni/native/src sslinfo.c
  Log:
  Update sslinfo to use the indexed approach to the params instead
  a name based. This way we'll keep the lower number of native functions.
  
  Revision  ChangesPath
  1.19  +7 -2  
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSL.java
  
  Index: SSL.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSL.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- SSL.java  12 Jun 2005 07:33:08 -  1.18
  +++ SSL.java  15 Jun 2005 12:08:02 -  1.19
  @@ -158,6 +158,11 @@
   public static final int SSL_SHUTDOWN_TYPE_UNCLEAN  = 2;
   public static final int SSL_SHUTDOWN_TYPE_ACCURATE = 3;
   
  +public static final int SSL_INFO_SESSION_ID = 1;
  +public static final int SSL_INFO_CIPHER = 2;
  +public static final int SSL_INFO_CIPHER_USEKEYSIZE  = 3;
  +public static final int SSL_INFO_CIPHER_ALGKEYSIZE  = 4;
  +
   /* Return OpenSSL version number */
   public static native int version();
   
  @@ -261,7 +266,7 @@
* @param file File contatining DH params.
*/
   public static native boolean loadDSATempKey(int idx, String file);
  -
  +
   /**
* Return last SSL error string
*/
  
  
  
  1.12  +27 -4 
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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- SSLSocket.java14 Jun 2005 20:59:33 -  1.11
  +++ SSLSocket.java15 Jun 2005 12:08:02 -  1.12
  @@ -234,10 +234,33 @@
   int offset, int nbytes, long timeout);
   
   /**
  - * Retrun SSL SESSION id.
  + * Retrun SSL Info parameter as byte array.
*
* @param sock The socket to read the data from.
  - * @return Byte array containing session id.
  + * @param id Parameter id.
  + * @return Byte array containing info id value.
*/
  -public static native byte[] getSessionId(long sock);
  +public static native byte[] getInfoB(long sock, int id)
  +throws Exception;
  +
  +/**
  + * Retrun SSL Info parameter as String.
  + *
  + * @param sock The socket to read the data from.
  + * @param id Parameter id.
  + * @return String containing info id value.
  + */
  +public static native String getInfoS(long sock, int id)
  +throws Exception;
  +
  +/**
  + * Retrun SSL Info parameter as integer.
  + *
  + * @param sock The socket to read the data from.
  + * @param id Parameter id.
  + * @return Integer containing info id value or -1 on error.
  + */
  +public static native int getInfoI(long sock, int id)
  +throws Exception;
  +
   }
  
  
  
  1.29  +6 -1  
jakarta-tomcat-connectors/jni/native/include/ssl_private.h
  
  Index: ssl_private.h
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/native/include/ssl_private.h,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ssl_private.h 12 Jun 2005 10:31:16 -  1.28
  +++ ssl_private.h 15 Jun 2005 12:08:02 -  1.29
  @@ -141,6 +141,11 @@
   
   #define SSL_TO_APR_ERROR(X) (APR_OS_START_USERERR + 1000 + X)
   
  +#define SSL_INFO_SESSION_ID (1)
  +#define SSL_INFO_CIPHER (2)
  +#define SSL_INFO_CIPHER_USEKEYSIZE  (3)
  +#define SSL_INFO_CIPHER_ALGKEYSIZE  (4)
  +
   #define SSL_VERIFY_ERROR_IS_OPTIONAL(errnum) \
  ((errnum == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) \
   || (errnum == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN) \
  
  
  
  1.2   +103 -13   jakarta-tomcat-connectors/jni/native/src/sslinfo.c
  
  Index: sslinfo.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslinfo.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sslinfo.c 14 Jun 2005 11:55:54 -  1.1
  +++ sslinfo.c 15 Jun 2005 12:08:02 -  1.2
  @@ -31,27 +31,117 @@
   #ifdef HAVE_OPENSSL
   #include ssl_private.h
   
  -TCN_IMPLEMENT_CALL(jobject, SSLSocket, getSessionId)(TCN_STDARGS, jlong sock)
  +static const char *hex_basis = 0123456789ABCDEF;
  +
  +static char *convert_to_hex(const void *buf, size_t len)
  +{
  +const unsigned char *p = ( const unsigned char *)buf;
  +

Re: Regression -- jakarta-tomcat-connectors/jk/native/common jk_uri_worker_map.c

2005-06-15 Thread Derrick Koes


What I mean by regression is that the URL rewriting bug was fixed in an 
earlier version of JK (1.2.8), but is now broken.


What I mean by URL rewriting, is that if the session ID is written on the 
URL rather than stored in a cookie, such as 
;jsessionid=DE7E48D33B5EDFE59B448ABF8D74FE15.dkoes8009, JK does not maintain 
it (removes it from the URL) correctly.  In a load balanced environment, 
this results in the first request of the session going to one server and the 
second, since JK thinks it needs a new session because ID is not maintained, 
goes to a second server.


Thanks,
Derrick


From: Mladen Turk [EMAIL PROTECTED]
Reply-To: Tomcat Developers List tomcat-dev@jakarta.apache.org
To: Tomcat Developers List tomcat-dev@jakarta.apache.org
Subject: Re: Regression -- jakarta-tomcat-connectors/jk/native/common 
jk_uri_worker_map.c

Date: Tue, 14 Jun 2005 19:59:45 +0200

Derrick Koes wrote:
URL rewriting is once again broken.  1.2.14 exhibits the problem for 
certain.  Older version may as well.  This was fixed in 1.2.8, but has 
regressed.


Has anyone else noticed the regression?



Could you explain what do you mean by 'regression',
and URL rewriting?

If you give some example of what are you doing,
what the JK does, and what in your opinion it should do,
that would be helpful.

Regards,
Mladen.

-
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]



RE: Sun One/iPlanet nsapi_redirector issue

2005-06-15 Thread Kevin Convy \(Contractor\)
--- jk_ajp_common.c.orig.c  2005-06-15 07:23:02.0 -0700
+++ jk_ajp_common.c 2005-06-15 07:29:00.0 -0700
@@ -1296,6 +1296,9 @@
 jk_ws_service_t *r, jk_logger_t *l)
 {
 int code = (int)jk_b_get_byte(msg);
+   //KCADD
+   int bytesread = 0;
+   unsigned char buf1[AJP13_MAX_SEND_BODY_SZ];
 
 JK_TRACE_ENTER(l);
 switch (code) {
@@ -1309,6 +1312,14 @@
 return JK_AJP13_ERROR;
 }

+   //KCADD
+   // make sure the entire request body has been
read.
+   jk_log(l, JK_LOG_INFO, KCDEBUG: this many bytes
left: %d, ae-left_bytes_to_send);
+   while(ae-left_bytes_to_send  0) {
+   r-read(r, buf1, AJP13_MAX_SEND_BODY_SZ,
bytesread);
+   ae-left_bytes_to_send -= bytesread;
+   }
+
 r-start_response(r, res.status, res.msg,
   (const char *const *)res.header_names,
   (const char *const *)res.header_values,

 -Original Message-
 From: jean-frederic clere 
 [mailto:[EMAIL PROTECTED] 
 Sent: Tuesday, June 14, 2005 11:53 PM
 To: Tomcat Developers List
 Subject: Re: Sun One/iPlanet nsapi_redirector issue
 
 
 Kevin Convy (Contractor) wrote:
  I am having an issue posting a large request (that also requires
  authentication) through a Sun One/IPlanet 6.0sp5 webserver 
 to Tomcat 
  5.5 using the 1.2.8 nsapi_redirector. The client that is doing the 
  posting gets a server write error if the request body is over a 
  certain size (~150K). The issue occurs on both the Windows XP and 
  Solaris versions.The issue does NOT occur using an Apache-mod_jk 
  configuration. If I use the attached version of the 
  ajp_process_callback method in jk_ajp_common.c (changes 
 from the 1.2.8 
  version of the code are marked with KCADD comments) it resolves the 
  problem.
 
 A diff -u would help to see your changes.
 
  It seems to resolve it by
  making sure the entire request body is read off the netbuf before 
  turning around and starting the response (which occurs in this case 
  because an authentication challenge is sent before the 
 entire request 
  is read by tomcat). I don't mean to offer this as a fix, but I was 
  wondering if this is a known issue and if there is a better fix 
  somewhere.
   
  I sent a slightly different version of this email to the 
 tomcat-user 
  list a couple of weeks ago and apologize for the cross-post.
   
  Thanks,
   
  Kevin Convy
  Icebox LLC
   
   
   
  static int ajp_process_callback(jk_msg_buf_t *msg,
  jk_msg_buf_t *pmsg,
  ajp_endpoint_t * ae,
  jk_ws_service_t *r, 
 jk_logger_t *l) {
  int code = (int)jk_b_get_byte(msg);
  // KCADD
  int bytesread = 0;
  unsigned char buf1[AJP13_MAX_SEND_BODY_SZ];
   
  JK_TRACE_ENTER(l);
  switch (code) {
  case JK_AJP13_SEND_HEADERS:
  {
  jk_res_data_t res;
  if (!ajp_unmarshal_response(msg, res, ae, l)) {
  jk_log(l, JK_LOG_ERROR,
 ajp_unmarshal_response failed\n);
  JK_TRACE_EXIT(l);
  return JK_AJP13_ERROR;
  }
  
  //KCADD
  // make sure the entire request body has been read.
  jk_log(l, JK_LOG_INFO, KCDEBUG: this many bytes left: 
  %d,
  ae-left_bytes_to_send);
  while(ae-left_bytes_to_send  0) {
  r-read(r, buf1, AJP13_MAX_SEND_BODY_SZ, 
 bytesread);
  ae-left_bytes_to_send -= bytesread;
  }
   
  r-start_response(r, res.status, res.msg,
(const char *const *)res.header_names,
(const char *const 
 *)res.header_values,
res.num_headers);
  }
  return JK_AJP13_SEND_HEADERS;
   
  case JK_AJP13_SEND_BODY_CHUNK:
  {
  unsigned len = (unsigned)jk_b_get_int(msg);
  if (!r-write(r, jk_b_get_buff(msg) + jk_b_get_pos(msg),
  len)) {
  jk_log(l, JK_LOG_INFO,
 Connection aborted or network problems\n);
  JK_TRACE_EXIT(l);
  return JK_CLIENT_ERROR;
  }
  }
  break;
   
  case JK_AJP13_GET_BODY_CHUNK:
  {
  int len = (int)jk_b_get_int(msg);
   
  if (len  0) {
  len = 0;
  }
  if (len  AJP13_MAX_SEND_BODY_SZ) {
  len = AJP13_MAX_SEND_BODY_SZ;
  }
  if ((unsigned int)len  ae-left_bytes_to_send) {
  len = ae-left_bytes_to_send;
  }
   
  /* the right place to add 

cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp AjpAprProcessor.java

2005-06-15 Thread remm
remm2005/06/15 08:27:33

  Modified:jk/java/org/apache/coyote/ajp AjpAprProcessor.java
  Log:
  - Fix some basic issues with the AJP on APR implementation.
  - In particular, endRequest is no longer called twice (oops ...).
  
  Revision  ChangesPath
  1.2   +15 -25
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
  
  Index: AjpAprProcessor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AjpAprProcessor.java  9 Jun 2005 16:14:51 -   1.1
  +++ AjpAprProcessor.java  15 Jun 2005 15:27:33 -  1.2
  @@ -88,7 +88,7 @@
   
   readBodyMessage.appendByte(Constants.JK_AJP13_GET_BODY_CHUNK);
   readBodyMessage.appendInt(Constants.MAX_READ_SIZE);
  -
  +
   }
   
   
  @@ -130,7 +130,7 @@
   /**
* Char version of the message header.
*/
  -protected char[] headerChar = new char[8*1024]; // FIXME: Size should be 
configurable
  +//protected char[] headerChar = new char[8*1024];
   
   
   /**
  @@ -375,14 +375,12 @@
   // (long keepalive), so that the processor should be 
recycled
   // and the method should return true
   rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
  -openSocket = true;
  -// Add the socket to the poller
  -endpoint.getPoller().add(socket, pool);
   break;
   }
  -// FIXME: Check message type, process right away and break 
if 
  +// Check message type, process right away and break if 
   // not regular request processing
   int type = headerMessage.getByte();
  +// FIXME: Any other types which should be checked ?
   if (type == Constants.JK_AJP13_CPING_REQUEST) {
   headerMessage.reset();
   headerMessage.appendByte(Constants.JK_AJP13_CPONG_REPLY);
  @@ -431,21 +429,6 @@
   }
   }
   
  -// Finish the handling of the request
  -try {
  -thrA.setCurrentStage(endpoint, endRequest);
  -rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
  -endRequest();
  -// FXIME: Do one last flush
  -} catch (IOException e) {
  -error = true;
  -} catch (Throwable t) {
  -log.error(Error finishing request, t);
  -// 500 - Internal Server Error
  -response.setStatus(500);
  -error = true;
  -}
  -
   // If there was an error, make sure the request is counted as
   // and error, and update the statistics counter
   if (error) {
  @@ -459,9 +442,16 @@
   
   }
   
  +// Add the socket to the poller
  +if (!error) {
  +endpoint.getPoller().add(socket, pool);
  +} else {
  +openSocket = false;
  +}
  +
   rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
   recycle();
  -
  +
   return openSocket;
   
   }
  @@ -1122,7 +1112,7 @@
   int headerLength = message.getHeaderLength();
   
   // Read the message header
  -// FIXME: do crazy tricks to avoid doing two reads 
  +// FIXME: better buffering to avoid doing two reads 
   if (first) {
   int nRead = Socket.recvt
   (socket, buf, 0, headerLength, readTimeout);
  @@ -1131,7 +1121,7 @@
   if (nRead == headerLength) {
   message.processHeader();
   } else {
  -if (Status.APR_STATUS_IS_ETIMEDOUT(-nRead)) {
  +if ((-nRead) == Status.ETIMEDOUT || (-nRead) == 
Status.TIMEUP) {
   return false;
   } else {
   throw new IOException(sm.getString(iib.failedread));
  @@ -1169,7 +1159,6 @@
*/
   protected void writeMessage(AjpMessage message) 
   throws IOException {
  -// FIXME: Write to a temporary direct buffer
   message.end();
   if (Socket.send(socket, message.getBuffer(), 0, message.getLen())  
0)
   throw new IOException(sm.getString(iib.failedwrite));
  @@ -1182,6 +1171,7 @@
   public void recycle() {
   
   // Recycle Request object
  +first = true;
   request.recycle();
   response.recycle();
   headerMessage.reset();
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni SSLServer.java

2005-06-15 Thread jfclere
jfclere 2005/06/15 08:15:54

  Modified:jni/examples/org/apache/tomcat/jni SSLServer.java
  Log:
  test retcode of recv() to prevent the example for looping.
  BTW: When testing with openssl 'Q' closes the socket in openssl ' Q' could
  be used to get the closing in SSLServer.
  
  Revision  ChangesPath
  1.7   +7 -9  
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SSLServer.java12 Jun 2005 10:31:16 -  1.6
  +++ SSLServer.java15 Jun 2005 15:15:54 -  1.7
  @@ -183,14 +183,12 @@
   while (!doClose) {
   /* Do a blocking read byte at a time */
   byte [] buf = new byte[1];
  -while (SSLSocket.recv(clientSock, buf, 0, 1) == 1) {
  -if (buf[0] == '\n')
  -break;
  -else if (buf[0] == 'Q') {
  -doClose = true;
  -break;
  -}
  -}
  +int ret;
  +ret = SSLSocket.recv(clientSock, buf, 0, 1);
  +if (ret != 1)
  +throw(new Exception(SSLSocket.recv failed));
  +if (buf[0] == 'Q')
  +doClose = true;
   if (doClose) {
   try {
   byte [] msg = (Bye from worker:  + workerId + 
\r\n).getBytes();
  
  
  

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



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

2005-06-15 Thread mturk
mturk   2005/06/15 07:43:13

  Modified:jni/native/src network.c
  Log:
  Use stack buffer for small ( 8K) byte arrays.
  
  Revision  ChangesPath
  1.26  +43 -26jakarta-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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- network.c 10 Jun 2005 07:06:10 -  1.25
  +++ network.c 15 Jun 2005 14:43:12 -  1.26
  @@ -27,7 +27,6 @@
   
   #ifdef TCN_DO_STATISTICS
   #include apr_atomic.h
  -
   static volatile apr_uint32_t sp_created  = 0;
   static volatile apr_uint32_t sp_closed   = 0;
   static volatile apr_uint32_t sp_cleared  = 0;
  @@ -272,23 +271,30 @@
   {
   apr_socket_t *s = J2P(sock, apr_socket_t *);
   apr_size_t nbytes = (apr_size_t)tosend;
  -jbyte *bytes;
  -apr_int32_t nb;
   apr_status_t ss;
   
   UNREFERENCED(o);
   TCN_ASSERT(sock != 0);
  -apr_socket_opt_get(s, APR_SO_NONBLOCK, nb);
  -if (nb)
  - bytes = (*e)-GetPrimitiveArrayCritical(e, buf, NULL);
  -else
  - bytes = (*e)-GetByteArrayElements(e, buf, NULL);
  -ss = apr_socket_send(s, bytes + offset, nbytes);
  -
  -if (nb)
  -(*e)-ReleasePrimitiveArrayCritical(e, buf, bytes, JNI_ABORT);
  -else
  -(*e)-ReleaseByteArrayElements(e, buf, bytes, JNI_ABORT);
  +if (tosend = TCN_BUFFER_SZ) {
  +char sb[TCN_BUFFER_SZ];
  +(*e)-GetByteArrayRegion(e, buf, offset, tosend, (jbyte *)sb);
  +ss = apr_socket_send(s, sb, nbytes);
  +}
  +else {
  +jbyte *bytes;
  +apr_int32_t nb;
  +apr_socket_opt_get(s, APR_SO_NONBLOCK, nb);
  +if (nb)
  +bytes = (*e)-GetPrimitiveArrayCritical(e, buf, NULL);
  +else
  +bytes = (*e)-GetByteArrayElements(e, buf, NULL);
  +ss = apr_socket_send(s, bytes + offset, nbytes);
  +
  +if (nb)
  +(*e)-ReleasePrimitiveArrayCritical(e, buf, bytes, JNI_ABORT);
  +else
  +(*e)-ReleaseByteArrayElements(e, buf, bytes, JNI_ABORT);
  +}
   if (ss == APR_SUCCESS)
   return (jint)nbytes;
   else {
  @@ -393,16 +399,21 @@
   {
   apr_socket_t *s = J2P(sock, apr_socket_t *);
   apr_size_t nbytes = (apr_size_t)toread;
  -jbyte *bytes = (*e)-GetByteArrayElements(e, buf, NULL);
   apr_status_t ss;
   
   UNREFERENCED(o);
   TCN_ASSERT(sock != 0);
  -TCN_ASSERT(bytes != NULL);
  -ss = apr_socket_recv(s, bytes + offset, nbytes);
  -
  -(*e)-ReleaseByteArrayElements(e, buf, bytes,
  -   nbytes ? 0 : JNI_ABORT);
  +if (toread = TCN_BUFFER_SZ) {
  +char sb[TCN_BUFFER_SZ];
  +if ((ss = apr_socket_recv(s, sb, nbytes)) == APR_SUCCESS)
  +(*e)-SetByteArrayRegion(e, buf, offset, (jsize)nbytes, sb);
  +}
  +else {
  +jbyte *bytes = (*e)-GetByteArrayElements(e, buf, NULL);
  +ss = apr_socket_recv(s, bytes + offset, nbytes);
  +(*e)-ReleaseByteArrayElements(e, buf, bytes,
  +   nbytes ? 0 : JNI_ABORT);
  +}
   if (ss == APR_SUCCESS)
   return (jint)nbytes;
   else {
  @@ -417,25 +428,31 @@
   {
   apr_socket_t *s = J2P(sock, apr_socket_t *);
   apr_size_t nbytes = (apr_size_t)toread;
  -jbyte *bytes = (*e)-GetByteArrayElements(e, buf, NULL);
   apr_status_t ss;
   apr_interval_time_t t;
   
   UNREFERENCED(o);
   TCN_ASSERT(sock != 0);
   TCN_ASSERT(buf != NULL);
  -TCN_ASSERT(bytes != NULL);
   
   if ((ss = apr_socket_timeout_get(s, t)) != APR_SUCCESS)
   goto cleanup;
   if ((ss = apr_socket_timeout_set(s, J2T(timeout))) != APR_SUCCESS)
   goto cleanup;
  -ss = apr_socket_recv(s, bytes + offset, nbytes);
  +if (toread = TCN_BUFFER_SZ) {
  +char sb[TCN_BUFFER_SZ];
  +ss = apr_socket_recv(s, sb, nbytes);
  +(*e)-SetByteArrayRegion(e, buf, offset, (jsize)nbytes, sb);
  +}
  +else {
  +jbyte *bytes = (*e)-GetByteArrayElements(e, buf, NULL);
  +ss = apr_socket_recv(s, bytes + offset, nbytes);
  +(*e)-ReleaseByteArrayElements(e, buf, bytes,
  +   nbytes ? 0 : JNI_ABORT);
  +}
   /* Resore the original timeout */
   apr_socket_timeout_set(s, t);
   cleanup:
  -(*e)-ReleaseByteArrayElements(e, buf, bytes,
  -   nbytes ? 0 : JNI_ABORT);
   if (ss == APR_SUCCESS)
   return (jint)nbytes;
   else {
  
  
  

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



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

2005-06-15 Thread Bill Barker

- Original Message -
From: jean-frederic clere [EMAIL PROTECTED]
To: Tomcat Developers List tomcat-dev@jakarta.apache.org
Sent: Wednesday, June 15, 2005 5:05 AM
Subject: Re: [EMAIL PROTECTED]: Project jakarta-tomcat-jk-native (in module
jakarta-tomcat-connectors) failed


 Bill Barker wrote:
  To whom it may engage...
 

 I think I have fixed this one in rules.mk


Doesn't seem to have worked.  The error is still the same.

 -
 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]



question about localhost/ error count in tomcat manager web app

2005-06-15 Thread Annie Wang
hi,

when i access the manager web app, i noticed that error count for localhost/ 
default[/] increments.  http connector error count also increments.  any ideas 
why this is happening?  am i missing some configuration or could this be a bug?

i asked a similar question on the tomcat-user alias a while back, but didn't
get any reply back, so thought i'd check here.  

thanks.
-annie

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



cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp AjpAprProcessor.java

2005-06-15 Thread remm
remm2005/06/15 10:35:24

  Modified:jk/java/org/apache/coyote/ajp AjpAprProcessor.java
  Log:
  - Fix uploading.
  
  Revision  ChangesPath
  1.3   +7 -9  
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
  
  Index: AjpAprProcessor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AjpAprProcessor.java  15 Jun 2005 15:27:33 -  1.2
  +++ AjpAprProcessor.java  15 Jun 2005 17:35:24 -  1.3
  @@ -86,9 +86,6 @@
   // Cause loading of HexUtils
   int foo = HexUtils.DEC[0];
   
  -readBodyMessage.appendByte(Constants.JK_AJP13_GET_BODY_CHUNK);
  -readBodyMessage.appendInt(Constants.MAX_READ_SIZE);
  -
   }
   
   
  @@ -1031,14 +1028,10 @@
   public boolean receive() throws IOException {
   first = false;
   bodyMessage.reset();
  -boolean err = readMessage(bodyMessage, false);
  +readMessage(bodyMessage, false);
   if( log.isDebugEnabled() )
  -log.info( Receiving: getting request body chunk  + err +   + 
bodyMessage.getLen() );
  +log.info( Receiving: getting request body chunk  + 
bodyMessage.getLen() );
   
  -if(err) {
  -throw new IOException();
  -}
  -
   // No data received.
   if( bodyMessage.getLen() == 0 ) { // just the header
   // Don't mark 'end of stream' for the first chunk.
  @@ -1083,6 +1076,9 @@
   }
   
   // Why not use outBuf??
  +readBodyMessage.reset();
  +readBodyMessage.appendByte(Constants.JK_AJP13_GET_BODY_CHUNK);
  +readBodyMessage.appendInt(Constants.MAX_READ_SIZE);
   writeMessage(readBodyMessage);
   
   // In JNI mode, response will be in bodyMsg. In TCP mode, response 
need to be
  @@ -1172,6 +1168,8 @@
   
   // Recycle Request object
   first = true;
  +endOfStream = false;
  +empty = true;
   request.recycle();
   response.recycle();
   headerMessage.reset();
  
  
  

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



JavaOne volunteers?

2005-06-15 Thread Henri Yandell
Unsure if the Tomcat community saw Geir's email asking for volunteers
at JavaOne.

The ASF have a booth there (donated to us) if we can get people to man
it etc. Given that it's the flagship product, will any Tomcat people
be interested in volunteering?

I think the idea is to spend 2 or 3 hours sitting at the desk etc,
being positive about Tomcat, ASF, Open-Source etc on June 27th-29th.

Wish I could convince my bosses to let me head out there :(

Hen

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



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

2005-06-15 Thread Bill Barker

- Original Message -
From: Bill Barker [EMAIL PROTECTED]
To: Tomcat Developers List tomcat-dev@jakarta.apache.org
Sent: Wednesday, June 15, 2005 10:17 AM
Subject: Re: [EMAIL PROTECTED]: Project jakarta-tomcat-jk-native (in module
jakarta-tomcat-connectors) failed



 - Original Message -
 From: jean-frederic clere [EMAIL PROTECTED]
 To: Tomcat Developers List tomcat-dev@jakarta.apache.org
 Sent: Wednesday, June 15, 2005 5:05 AM
 Subject: Re: [EMAIL PROTECTED]: Project jakarta-tomcat-jk-native (in module
 jakarta-tomcat-connectors) failed


  Bill Barker wrote:
   To whom it may engage...
  
 
  I think I have fixed this one in rules.mk
 

 Doesn't seem to have worked.  The error is still the same.


Ok, it seems that `apxs -q LIBTOOL` is broken again over in httpd land :(.

I guess I'll have to reopen BZ #32787, attach this patch, and wait another
another six months to get the patch applied.

  -
  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]




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.

*** config_vars.sh.in.orig  Wed Jun 15 15:35:10 2005
--- config_vars.sh.in   Wed Jun 15 15:35:41 2005
***
*** 60,64 
  /^UTIL_LDFLAGS/d
  /^APR_INCLUDEDIR.*$/s,.*,APR_INCLUDEDIR = ${APR_INCLUDEDIR},
  /^APU_INCLUDEDIR.*$/s,.*,APU_INCLUDEDIR = ${APU_INCLUDEDIR},
! /^LIBTOOL.*$/s,/[^ ]*/libtool \(.*\),${APR_LIBTOOL} \$(LTFLAGS),
  
--- 60,64 
  /^UTIL_LDFLAGS/d
  /^APR_INCLUDEDIR.*$/s,.*,APR_INCLUDEDIR = ${APR_INCLUDEDIR},
  /^APU_INCLUDEDIR.*$/s,.*,APU_INCLUDEDIR = ${APU_INCLUDEDIR},
! /^LIBTOOL.*$/s,/[^ ]*/libtool \(.*\),${APR_LIBTOOL} @LTFLAGS@,
  

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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session StandardSession.java

2005-06-15 Thread luehe
luehe   2005/06/15 16:41:25

  Modified:catalina/src/share/org/apache/catalina/session
StandardSession.java
  Log:
  After deserializing a StandardSession, reinit its transient
  listeners and notes fields, to prevent NPEs when they are
  accessed.
  
  Revision  ChangesPath
  1.58  +8 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java
  
  Index: StandardSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- StandardSession.java  31 Mar 2005 10:31:53 -  1.57
  +++ StandardSession.java  15 Jun 2005 23:41:25 -  1.58
  @@ -1393,6 +1393,13 @@
   }
   isValid = isValidSave;
   
  +if (listeners == null) {
  +listeners = new ArrayList();
  +}
  +
  +if (notes == null) {
  +notes = new HashMap();
  +}
   }
   
   
  
  
  

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



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session StandardSession.java

2005-06-15 Thread luehe
luehe   2005/06/15 16:50:12

  Modified:catalina/src/share/org/apache/catalina/session
StandardSession.java
  Log:
  Reverted the scope of readObject() and writeObject() from protected to
  private, in order to give subclasses an opportunity to implement their
  own.
  
  A class that wants to customize its Serialization must declare its
  readObject() and writeObject() with private scope.
  
  This won't be possible for subclasses of StandardSession.java, if the
  StandardSession.java superclass has already declared these methods with
  protected scope.
  
  Revision  ChangesPath
  1.59  +3 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java
  
  Index: StandardSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- StandardSession.java  15 Jun 2005 23:41:25 -  1.58
  +++ StandardSession.java  15 Jun 2005 23:50:12 -  1.59
  @@ -1355,7 +1355,7 @@
* @exception ClassNotFoundException if an unknown class is specified
* @exception IOException if an input/output error occurs
*/
  -protected void readObject(ObjectInputStream stream)
  +private void readObject(ObjectInputStream stream)
   throws ClassNotFoundException, IOException {
   
   // Deserialize the scalar instance variables (except Manager)
  @@ -1422,7 +1422,7 @@
*
* @exception IOException if an input/output error occurs
*/
  -protected void writeObject(ObjectOutputStream stream) throws IOException 
{
  +private void writeObject(ObjectOutputStream stream) throws IOException {
   
   // Write the scalar instance variables (except Manager)
   stream.writeObject(new Long(creationTime));
  
  
  

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



DO NOT REPLY [Bug 35379] - Doesn't compile with jikes / classpath errors

2005-06-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=35379.
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=35379


[EMAIL PROTECTED] changed:

   What|Removed |Added

  Attachment #15425|0   |1
is obsolete||




--- Additional Comments From [EMAIL PROTECTED]  2005-06-16 02:21 ---
Created an attachment (id=15427)
 -- (http://issues.apache.org/bugzilla/attachment.cgi?id=15427action=view)
Patch for jakarta-tomcat-catalina/webapps/host-manager/build.xml


-- 
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 35379] - Doesn't compile with jikes / classpath errors

2005-06-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=35379.
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=35379





--- Additional Comments From [EMAIL PROTECTED]  2005-06-16 02:20 ---
Created an attachment (id=15425)
 -- (http://issues.apache.org/bugzilla/attachment.cgi?id=15425action=view)
Patch for jakarta-tomcat-catalina/webapps/manager/build.xml


-- 
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 35379] New: - Doesn't compile with jikes / classpath errors

2005-06-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=35379.
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=35379

   Summary: Doesn't compile with jikes / classpath errors
   Product: Tomcat 5
   Version: 5.5.9
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: minor
  Priority: P2
 Component: Webapps:Manager
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


${commons-loggin.jar} is not specified in the classpath of webapps/manager and
webapps/host-manager. Mysteriously it compiles fine with Sun Javac, but not with
Jikes. With these patches, everything compiles fine.

-- 
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 35379] - Doesn't compile with jikes / classpath errors

2005-06-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=35379.
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=35379





--- Additional Comments From [EMAIL PROTECTED]  2005-06-16 02:21 ---
Created an attachment (id=15426)
 -- (http://issues.apache.org/bugzilla/attachment.cgi?id=15426action=view)
Patch for jakarta-tomcat-catalina/webapps/manager/build.xml


-- 
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 35378] New: - workers.properties:worker.inprocess.type=jni logs Unknown worker type jni for worker inprocess

2005-06-15 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=35378.
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=35378

   Summary: workers.properties:worker.inprocess.type=jni logs
Unknown worker type jni for worker inprocess
   Product: Tomcat 5
   Version: Unknown
  Platform: Other
OS/Version: Windows 2000
Status: NEW
  Severity: major
  Priority: P2
 Component: Native:JK
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


workers.properties:worker.inprocess.type=jni logs Unknown worker type jni for
worker inprocess. This was with JK-1.2.13.

It appears that the logged message is not descibing some other root problem, or
that the 'jni' string is no longer valid(?)

-- 
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]