DO NOT REPLY [Bug 28560] - Wrong session route used when more than one JSESSIONID cookie exists

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

Wrong session route used when more than one JSESSIONID cookie exists





--- Additional Comments From [EMAIL PROTECTED]  2004-08-02 06:15 ---
FYI: This has been fixed in CVS for mod_jk 1. Don't know about mod_jk2.

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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ConnectorMBean.java

[billbarker]

billbarker2004/08/01 23:13:32

  Modified:catalina/src/share/org/apache/catalina/mbeans
ConnectorMBean.java
  Log:
  Make certain that attributes get set, even if called before init.
  
  Also fix Connector <==> Protocol attribute name translation, and clean up the code a 
bit.
  
  Revision  ChangesPath
  1.8   +47 -15
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
  
  Index: ConnectorMBean.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ConnectorMBean.java   23 Jun 2004 08:25:03 -  1.7
  +++ ConnectorMBean.java   2 Aug 2004 06:13:32 -   1.8
  @@ -95,13 +95,9 @@
   throw new MBeanException(e);
   }

  - if (("algorithm").equals(name) || ("keystoreType").equals(name) ||
  -("maxThreads").equals(name) || ("maxSpareThreads").equals(name) ||
  -("minSpareThreads").equals(name)) {
  + if (isProtocolProperty(name)) {
   
  -if (("keystoreType").equals(name)) {
  -name = "keyType";
  -}
  +name = translateAttributeName(name);
   
   ProtocolHandler protocolHandler = connector.getProtocolHandler();
/* check the Protocol first, since JkCoyote has an independent
  @@ -110,6 +106,8 @@
   try {
   if( protocolHandler != null ) {
   attribute = IntrospectionUtils.getAttribute(protocolHandler, 
name);
  +} else {
  +attribute = connector.getProperty(name);
   }
   } catch (Exception e) {
   throw new MBeanException(e);
  @@ -161,13 +159,9 @@
   throw new MBeanException(e);
   }

  -if (("algorithm").equals(name) || ("keystoreType").equals(name) ||
  -("maxThreads").equals(name) || ("maxSpareThreads").equals(name) ||
  -("minSpareThreads").equals(name)) {
  +if (isProtocolProperty(name)) {
   
  -if (("keystoreType").equals(name)) {
  -name = "keyType";
  -}
  +name = translateAttributeName(name);
   
   ProtocolHandler protocolHandler = connector.getProtocolHandler();
/* check the Protocol first, since JkCoyote has an independent
  @@ -176,7 +170,9 @@
   try {
   if( protocolHandler != null ) {
   IntrospectionUtils.setAttribute(protocolHandler, name, value);
  -}   
  +} else {
  +connector.setProperty(name, value);
  +}
   } catch (Exception e) {
   throw new MBeanException(e);
   }
  @@ -190,5 +186,41 @@
   
   // - Operations
   
  -
  +// - Methods
  +
  +/**
  + * Test for a property that is really on the Protocol.
  + */
  +private boolean isProtocolProperty(String name) {
  +return ("algorithm").equals(name) || 
  +("keystoreType").equals(name) ||
  +("maxThreads").equals(name) || 
  +("maxSpareThreads").equals(name) ||
  +("minSpareThreads").equals(name);
  +}
  +
  +/*
  + * Translate the attribute name from the legacy Factory names to their
  + * internal protocol names.
  + */
  +private String translateAttributeName(String name) {
  + if ("clientAuth".equals(name)) {
  + return "clientauth";
  + } else if ("keystoreFile".equals(name)) {
  + return "keystore";
  + } else if ("randomFile".equals(name)) {
  + return "randomfile";
  + } else if ("rootFile".equals(name)) {
  + return "rootfile";
  + } else if ("keystorePass".equals(name)) {
  + return "keypass";
  + } else if ("keystoreType".equals(name)) {
  + return "keytype";
  + } else if ("sslProtocol".equals(name)) {
  + return "protocol";
  + } else if ("sslProtocols".equals(name)) {
  + return "protocols";
  + }
  + return name;
  +}
   }
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/proxy proxy_ajp.c

[jfclere]

jfclere 2004/08/01 10:56:32

  Modified:ajp/proxy proxy_ajp.c
  Log:
  Close only when needed.
  
  Revision  ChangesPath
  1.6   +13 -11jakarta-tomcat-connectors/ajp/proxy/proxy_ajp.c
  
  Index: proxy_ajp.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_ajp.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- proxy_ajp.c   1 Aug 2004 15:05:01 -   1.5
  +++ proxy_ajp.c   1 Aug 2004 17:56:32 -   1.6
  @@ -13,7 +13,7 @@
* limitations under the License.
*/
   
  -/* HTTP routines for Apache proxy */
  +/* AJP routines for Apache proxy */
   
   #include "mod_proxy.h"
   #include "ajp.h"
  @@ -34,7 +34,7 @@
   void   *data;  /* To store ajp data */
   } proxy_ajp_conn_t;
   
  -static apr_status_t ap_proxy_http_cleanup(request_rec *r,
  +static apr_status_t ap_proxy_ajp_cleanup(request_rec *r,
 proxy_ajp_conn_t *p_conn,
 proxy_conn_rec *backend);
   
  @@ -278,7 +278,7 @@
* For now we do nothing, ie we get DNS round robin.
* XXX FIXME
*/
  -failed = ap_proxy_connect_to_backend(&p_conn->sock, "HTTP",
  +failed = ap_proxy_connect_to_backend(&p_conn->sock, "AJP",
p_conn->addr, p_conn->name,
conf, r->server, c->pool);
   
  @@ -513,19 +513,18 @@
   }
   
   static
  -apr_status_t ap_proxy_http_cleanup(request_rec *r, proxy_ajp_conn_t *p_conn,
  +apr_status_t ap_proxy_ajp_cleanup(request_rec *r, proxy_ajp_conn_t *p_conn,
  proxy_conn_rec *backend) {
  -/* If there are no KeepAlives, or if the connection has been signalled
  +/* If the connection has been signalled
* to close, close the socket and clean up
*/
   
   /* if the connection is < HTTP/1.1, or Connection: close,
* we close the socket, otherwise we leave it open for KeepAlive support
*/
  -if (p_conn->close || (r->proto_num < HTTP_VERSION(1,1))) {
  -ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
  -  "ap_proxy_http_cleanup closing %d %d %d %s",
  -   p_conn->sock, p_conn->close, r->proto_num, 
apr_table_get(r->headers_out, "Connection"));
  +if (p_conn->close) {
  +ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
  +  "ap_proxy_ajp_cleanup closing");
   if (p_conn->sock) {
   apr_socket_close(p_conn->sock);
   p_conn->sock = NULL;
  @@ -641,6 +640,8 @@
   status = ap_proxy_ajp_request(p, r, p_conn, origin, conf, uri, url,
  server_portstr);
   if ( status != OK ) {
  +p_conn->close++;
  +ap_proxy_ajp_cleanup(r, p_conn, backend);
   return status;
   }
   
  @@ -649,12 +650,13 @@
   server_portstr);
   if ( status != OK ) {
   /* clean up even if there is an error */
  -ap_proxy_http_cleanup(r, p_conn, backend);
  +p_conn->close++;
  +ap_proxy_ajp_cleanup(r, p_conn, backend);
   return status;
   }
   
   /* Step Five: Clean Up */
  -status = ap_proxy_http_cleanup(r, p_conn, backend);
  +status = ap_proxy_ajp_cleanup(r, p_conn, backend);
   if ( status != OK ) {
   return status;
   }
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp.h

[jfclere]

jfclere 2004/08/01 09:52:18

  Modified:ajp/ajplib/test ajp.h
  Log:
  Ajust ajp_msg_create prototype to ajp_msg.c.
  
  Revision  ChangesPath
  1.26  +1 -1  jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h
  
  Index: ajp.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ajp.h 1 Aug 2004 15:33:34 -   1.25
  +++ ajp.h 1 Aug 2004 16:52:18 -   1.26
  @@ -307,7 +307,7 @@
* @param rmsg  Pointer to newly created AJP message
* @return  APR_SUCCESS or error
*/
  -apr_status_t ajp_msg_create(apr_pool_t *pool, void **rmsg);
  +apr_status_t ajp_msg_create(apr_pool_t *pool, ajp_msg_t **rmsg);
   
   /**
* Recopy an AJP Message to another
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp_header.c

[jfclere]

jfclere 2004/08/01 09:50:27

  Modified:ajp/ajplib/test ajp_header.c
  Log:
  Arrange uri handling.
  
  Revision  ChangesPath
  1.24  +12 -1 jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c
  
  Index: ajp_header.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ajp_header.c  1 Aug 2004 15:23:23 -   1.23
  +++ ajp_header.c  1 Aug 2004 16:50:27 -   1.24
  @@ -210,6 +210,7 @@
   apr_uint32_t i, num_headers = 0;
   apr_byte_t is_ssl;
   char *remote_host;
  +char *uri;
   
   
   ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
  @@ -229,14 +230,24 @@
   const apr_array_header_t *t = apr_table_elts(r->headers_in);
   num_headers = t->nelts;
   }
  +
   remote_host = (char *)ap_get_remote_host(r->connection, r->per_dir_config, 
REMOTE_HOST, NULL);
   
  +uri = apr_pstrdup(r->pool, r->uri);
  +if (uri != NULL) {
  +char *query_str = strchr(uri, '?');
  +if (query_str != NULL) {
  +*query_str = 0;
  +}
  +}
  +
  +
   ajp_msg_reset(msg);
   
   if (ajp_msg_append_uint8(msg, CMD_AJP13_FORWARD_REQUEST) ||
   ajp_msg_append_uint8(msg, method)||
   ajp_msg_append_string(msg, r->protocol)  ||
  -ajp_msg_append_string(msg, r->uri)   ||
  +ajp_msg_append_string(msg, uri)  ||
   ajp_msg_append_string(msg, r->connection->remote_ip) ||
   ajp_msg_append_string(msg, remote_host)  ||
   ajp_msg_append_string(msg, ap_get_server_name(r))||
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp_msg.c ajp.h

[mturk]

mturk   2004/08/01 08:33:34

  Modified:ajp/ajplib/test ajp_msg.c ajp.h
  Log:
  Make ajp_append_string as macro.
  There is no need to call an extra function for that.
  
  Revision  ChangesPath
  1.12  +2 -29 jakarta-tomcat-connectors/ajp/ajplib/test/ajp_msg.c
  
  Index: ajp_msg.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_msg.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ajp_msg.c 29 Jul 2004 10:10:21 -  1.11
  +++ ajp_msg.c 1 Aug 2004 15:33:34 -   1.12
  @@ -241,8 +241,8 @@
* @param convert   When set told to convert String to ASCII
* @return  APR_SUCCESS or error
*/
  -apr_status_t ajp_msg_append_cvt_string(ajp_msg_t *msg, const char *value,
  -   int convert)
  +apr_status_t ajp_msg_append_string_ex(ajp_msg_t *msg, const char *value,
  +  int convert)
   {
   size_t len;
   
  @@ -271,33 +271,6 @@
   
   return APR_SUCCESS;
   }
  -
  -/**
  - *  Add a String in AJP message, and transform 
  - *  the String in ASCII if we're on an EBCDIC machine
  - *
  - * @param msg   AJP Message to get value from
  - * @param value Pointer to String
  - * @return  APR_SUCCESS or error
  - */
  -apr_status_t ajp_msg_append_string(ajp_msg_t *msg, const char *value)
  -{
  -return ajp_msg_append_cvt_string(msg, value, 1);
  -}
  -
  -
  -/**
  - *  Add a String in AJP message. 
  - *
  - * @param msg   AJP Message to get value from
  - * @param value Pointer to String
  - * @return  APR_SUCCESS or error
  - */
  -apr_status_t ajp_msg_append_ascii_string(ajp_msg_t *msg, const char *value)
  -{
  -return ajp_msg_append_cvt_string(msg, value, 0);
  -}
  -
   
   /**
* Add a Byte array to AJP Message
  
  
  
  1.25  +4 -12 jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h
  
  Index: ajp.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ajp.h 1 Aug 2004 14:59:04 -   1.24
  +++ ajp.h 1 Aug 2004 15:33:34 -   1.25
  @@ -208,26 +208,18 @@
* @param convert   When set told to convert String to ASCII
* @return  APR_SUCCESS or error
*/
  -apr_status_t ajp_msg_append_cvt_string(ajp_msg_t *msg, const char *value,
  -   int convert);
  +apr_status_t ajp_msg_append_string_ex(ajp_msg_t *msg, const char *value,
  +  int convert);
   /**
*  Add a String in AJP message, and transform 
*  the String in ASCII if we're on an EBCDIC machine
  - *
  - * @param msg   AJP Message to get value from
  - * @param value Pointer to String
  - * @return  APR_SUCCESS or error
*/
  -apr_status_t ajp_msg_append_string(ajp_msg_t *msg, const char *value);
  +#define ajp_msg_append_string(m, v) ajp_msg_append_string_ex(m, v, 1)
   
   /**
*  Add a String in AJP message. 
  - *
  - * @param msg   AJP Message to get value from
  - * @param value Pointer to String
  - * @return  APR_SUCCESS or error
*/
  -apr_status_t ajp_msg_append_ascii_string(ajp_msg_t *msg, const char *value);
  +#define ajp_msg_append_string_ascii(m, v) ajp_msg_append_string_ex(m, v, 0)
   
   /**
* Add a Byte array to AJP Message
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test testajp.vcproj

[mturk]

mturk   2004/08/01 08:38:28

  Modified:ajp/ajplib/test testajp.vcproj
  Log:
  Add ajp_logon to build.
  
  Revision  ChangesPath
  1.3   +6 -0  jakarta-tomcat-connectors/ajp/ajplib/test/testajp.vcproj
  
  Index: testajp.vcproj
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/testajp.vcproj,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testajp.vcproj28 Jul 2004 17:29:30 -  1.2
  +++ testajp.vcproj1 Aug 2004 15:38:28 -   1.3
  @@ -121,6 +121,9 @@
RelativePath=".\ajp_link.c">





  + 

  + 







  + 

  + 





  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp_header.c

[mturk]

mturk   2004/08/01 08:23:23

  Modified:ajp/ajplib/test ajp_header.c
  Log:
  Use CMD_AJP13_SEND_HEADERS instead hard coded number.
  
  Revision  ChangesPath
  1.23  +1 -1  jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c
  
  Index: ajp_header.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ajp_header.c  1 Aug 2004 14:54:10 -   1.22
  +++ ajp_header.c  1 Aug 2004 15:23:23 -   1.23
  @@ -623,7 +623,7 @@
  "ajp_parse_headers: ajp_msg_get_byte failed");
   return rc;
   }
  -if (result != 4) {
  +if (result != CMD_AJP13_SEND_HEADERS) {
   ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
  "ajp_parse_headers: wrong type %02x", result);
   return APR_EGENERAL;
  
  
  

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

Libajp -- some naming considerations.

[Mladen Turk]

Hi,

Cause the API still in the stage of developement I'd like to make some
renaiming, cause we'll be stuck into for a while.

1. ajp_msg_get/peek_byte => ajp_msg_get/peek_uint8
to be consistent with other data type, or change the ajp_msg_append from
uint8 to byte.

2. ajp_parse_type => ajp_msg_get_type
Makes more sense, thought.

3. ajp_parse_headers => ajp_parse_header
think that we receive only on header message per request.


Any objections?
MT.




smime.p7s
Description: S/MIME cryptographic signature

cvs commit: jakarta-tomcat-connectors/ajp/proxy proxy_ajp.c

[mturk]

mturk   2004/08/01 08:05:01

  Modified:ajp/proxy proxy_ajp.c
  Log:
  Use protocol handler defines instead fixed numbers.
  Makes more sense what's happening.
  
  Revision  ChangesPath
  1.5   +5 -5  jakarta-tomcat-connectors/ajp/proxy/proxy_ajp.c
  
  Index: proxy_ajp.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_ajp.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- proxy_ajp.c   1 Aug 2004 14:06:24 -   1.4
  +++ proxy_ajp.c   1 Aug 2004 15:05:01 -   1.5
  @@ -422,8 +422,8 @@
   }
   
   /* parse the reponse */
  -result = ajp_parse_type(r,p_conn->data);
  -if (result == 4) {
  +result = ajp_parse_type(r, p_conn->data);
  +if (result == CMD_AJP13_SEND_HEADERS) {
   ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"proxy: got response from %pI (%s)",
p_conn->addr, p_conn->name);
  @@ -464,14 +464,14 @@
   
   type = ajp_parse_type(r, p_conn->data);
   status = APR_SUCCESS;
  -while (type != 5) {
  -if (type == 4) {
  +while (type != CMD_AJP13_END_RESPONSE) {
  +if (type == CMD_AJP13_SEND_HEADERS) {
   /* AJP13_SEND_HEADERS: process them */
   status = ajp_parse_headers(r, p_conn->data); 
   if (status != APR_SUCCESS) {
   break;
   }
  -} else if  (type == 3) {
  +} else if  (type == CMD_AJP13_SEND_BODY_CHUNK) {
   /* AJP13_SEND_BODY_CHUNK: piece of data */
   apr_uint16_t size;
   char *buff;
  
  
  

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

Mike Duffy/Oshkosh/Fonda is out of the office.

[Mike Duffy]

I will be out of the office starting Sat 07/24/2004 and will not return
until Mon 08/02/2004.

I will be on vacation 7-24 thru 8-2  --  if you need assistance please
contact Ann Cullen in our Customer Service Dept.  Her extension is 4101.  I
will respond to all e-mails on Monday August 2nd.  Thank you.


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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp.h

[mturk]

mturk   2004/08/01 07:59:04

  Modified:ajp/ajplib/test ajp.h
  Log:
  Added CMD_AJP13_SHUTDOWN directive.
  We will use that some day perhaps.
  
  Revision  ChangesPath
  1.24  +3 -1  jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h
  
  Index: ajp.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ajp.h 1 Aug 2004 14:53:23 -   1.23
  +++ ajp.h 1 Aug 2004 14:59:04 -   1.24
  @@ -134,8 +134,10 @@
   #define CMD_AJP13_SEND_HEADERS  (unsigned char)4
   /** Marks the end of response. */
   #define CMD_AJP13_END_RESPONSE  (unsigned char)5
  -/** XXX: Have no idea */
  +/** Get further data from the web server if it hasn't all been transferred yet. */
   #define CMD_AJP13_GET_BODY_CHUNK(unsigned char)6
  +/** The web server asks the container to shut itself down. */
  +#define CMD_AJP13_SHUTDOWN  (unsigned char)7
   /** Webserver ask container to take control (logon phase) */
   #define CMD_AJP13_PING  (unsigned char)8
   /** Container response to cping request */
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp_header.c

[mturk]

mturk   2004/08/01 07:54:10

  Modified:ajp/ajplib/test ajp_header.c
  Log:
  Use CMD_AJP13.
  
  Revision  ChangesPath
  1.22  +1 -1  jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c
  
  Index: ajp_header.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ajp_header.c  1 Aug 2004 13:28:02 -   1.21
  +++ ajp_header.c  1 Aug 2004 14:54:10 -   1.22
  @@ -233,7 +233,7 @@
   
   ajp_msg_reset(msg);
   
  -if (ajp_msg_append_uint8(msg, AJP13_FORWARD_REQUEST) ||
  +if (ajp_msg_append_uint8(msg, CMD_AJP13_FORWARD_REQUEST) ||
   ajp_msg_append_uint8(msg, method)||
   ajp_msg_append_string(msg, r->protocol)  ||
   ajp_msg_append_string(msg, r->uri)   ||
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp_header.h

[mturk]

mturk   2004/08/01 07:53:45

  Modified:ajp/ajplib/test ajp_header.h
  Log:
  Ensure single includes.
  
  Revision  ChangesPath
  1.3   +3 -4  jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.h
  
  Index: ajp_header.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ajp_header.h  29 Jul 2004 07:59:15 -  1.2
  +++ ajp_header.h  1 Aug 2004 14:53:45 -   1.3
  @@ -13,6 +13,8 @@
*  See the License for the specific language governing permissions and
*  limitations under the License.
*/
  +#ifndef AJP_HEADER_H
  +#define AJP_HEADER_H
   
   /*
* Conditional request attributes
  @@ -160,7 +162,4 @@
   #define SC_RESP_WWW_AUTHENTICATE(unsigned short)0xA00B
   #define SC_RES_HEADERS_NUM  11
   
  -/*
  - * Protocol elements
  - */
  -#define AJP13_FORWARD_REQUEST(unsigned char)2
  +#endif /* AJP_HEADER_H */
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp.h

[mturk]

mturk   2004/08/01 07:53:23

  Modified:ajp/ajplib/test ajp.h
  Log:
  Added defines for AJP13 protocol handles.
  Q: What #7 stands for.
  
  Revision  ChangesPath
  1.23  +24 -5 jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h
  
  Index: ajp.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ajp.h 1 Aug 2004 14:04:16 -   1.22
  +++ ajp.h 1 Aug 2004 14:53:23 -   1.23
  @@ -47,6 +47,7 @@
   #define AJP13_DEF_PORT 8009
   #endif
   
  +
   #if APR_CHARSET_EBCDIC
   
   #define USE_CHARSET_EBCDIC
  @@ -112,19 +113,37 @@
   int server_side;
   };
   
  +/**
  + * @defgroup AJP defines 
  + * @{
  + */
  +/**
  + * Signature for the messages sent from Apache to tomcat
  + */
  +#define AJP13_WS_HEADER 0x1234
   #define AJP_HEADER_LEN  4
   #define AJP_HEADER_SZ_LEN   2
   #define AJP_MSG_BUFFER_SZ   (8*1024)
   #define AJP13_MAX_SEND_BODY_SZ  (AJP_MSG_BUFFER_SZ - 6)
   
  -/* Webserver ask container to take control (logon phase) */
  +/** Send a request from web server to container*/
  +#define CMD_AJP13_FORWARD_REQUEST   (unsigned char)2
  +/** Write a body chunk from the servlet container to the web server */
  +#define CMD_AJP13_SEND_BODY_CHUNK   (unsigned char)3
  +/** Send response headers from the servlet container to the web server. */
  +#define CMD_AJP13_SEND_HEADERS  (unsigned char)4
  +/** Marks the end of response. */
  +#define CMD_AJP13_END_RESPONSE  (unsigned char)5
  +/** XXX: Have no idea */
  +#define CMD_AJP13_GET_BODY_CHUNK(unsigned char)6
  +/** Webserver ask container to take control (logon phase) */
   #define CMD_AJP13_PING  (unsigned char)8
  -
  -/* Webserver check if container is alive, since container should respond by cpong */
  +/** Container response to cping request */
  +#define CMD_AJP13_CPONG (unsigned char)9
  +/** Webserver check if container is alive, since container should respond by cpong 
*/
   #define CMD_AJP13_CPING (unsigned char)10
   
  -/* Container response to cping request */
  -#define CMD_AJP13_CPONG (unsigned char)9
  +/** @} */
   
   /**
* Check a new AJP Message by looking at signature and return its size
  
  
  

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

Bug report for Watchdog [2004/08/01]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|  278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug|
|  279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug|
|  469|Unc|Nor|2001-01-17|in example-taglib.tld "urn" should be "uri" BugRat|
|  470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B|
| 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths|
|10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher|
|11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()|
|11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav|
|11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie|
|11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro|
|11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.|
|14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec|
|15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv|
|24649|New|Nor|2003-11-12|getRemoteHost fails when agent has uppercase chara|
|29398|New|Nor|2004-06-04|Update site and note current status   |
+-+---+---+--+--+
| Total   15 bugs   |
+---+

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

Bug report for Tomcat 4 [2004/08/01]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 3614|Opn|Nor|2001-09-14|bug in manager webapp |
| 3839|Opn|Maj|2001-09-26|Problem bookmarking login page|
| 3888|Opn|Blk|2001-09-30|WebappClassLoader: Lifecycle error : CL stopped   |
| 4138|Opn|Nor|2001-10-12|Processor threads have inconsistent ClassLoader st|
| 4352|Ass|Nor|2001-10-22|JDBCRealm does not work with CLIENT-CERT auth-meth|
| 4663|Opn|Maj|2001-11-05|Broken Pipe under some load   |
| 5329|New|Nor|2001-12-08|NT Service exits startup before Tomcat is finished|
| 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob|
| 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi|
| 5858|New|Enh|2002-01-15|Add tomcat dir to java.library.path   |
| 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio|
| 6218|Opn|Nor|2002-02-04|Relative links broken for servlets|
| 6229|New|Enh|2002-02-04|Need way to specify where to write catalina.out   |
| 6582|New|Min|2002-02-20|Sample code does not match behavior   |
| 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI|
| 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam|
| 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty|
| 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store   |
| 7360|New|Nor|2002-03-22|res-sharing-scope not supported   |
| 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output|
| 7676|New|Enh|2002-04-02|Allow name property to use match experssions in  without className in server.xml produces N|
|10982|New|Min|2002-07-19|JNDI URL Handler class is missing in naming-resour|
|11069|Opn|Enh|2002-07-23|Tomcat not flag error if tld is outside of /WEB-IN|
|11129|New|Enh|2002-07-24|New valve for putting the sessionIDs in the reques|
|11248|New|Enh|2002-07-29|DefaultServlet doesn't send expires header|
|11489|New|Enh|2002-08-06|Scanning JAR files in WEB-INF/lib without temp dir|
|11561|New|Maj|2002-08-08|JNDI problem with jdk1.4  |
|11645|New|Nor|2002-08-13|RequestStream and HttpRequestStream throw an IOExc|
|11662|New|Maj|2002-08-13|GlobalResources unavailable in DefaultContext |
|11679|New|Min|2002-08-14|"anonymous bind failed" exceptions occur if connec|
|11754|Opn|Enh|2002-08-15|Synchronous shutdown script - shutdown.sh should w|
|12069|New|Enh|2002-08-27|Creation of more HttpSession objects for one previ|
|12089|New|Maj|2002-08-27|CATALINA_HOME ignored and reset by catalina.sh|
|12516|New|Nor|2002-09-11|form based auth / documentation   |
|12658|New|Enh|2002-09-15|a proxy host and port at the  element level |
|12682|Unc|Nor|2002-09-16|Problem when recompiling servlets with JDBC connec|
|12766|New|Enh|2002-09-18|Tomcat should use tld files in /WEB-INF/ over vers|
|12946|Unc|Nor|2002-09-24|parameter serverRoot from jk2.properties not read;|
|13014|New|Blk|2002-09-26|OS/390/USS - Invalid   in servlet ma|
|13040|New|Nor|2002-09-26|can't retrieve external context who's uri is a sub|
|13240|New|Nor|2002-10-03|CGI works only with Java version 1.3+ |
|13309|Opn|Enh|2002-10-04|Catalina calls System.exit()  |
|13331|New|Nor|2002-10-05|Class loader attempts to open directory as file   |
|13430|New|Nor|2002-10-09|WWW-Authenticate Header Is Not Sent   |
|13606|Opn|Nor|2002-10-14|Compiler not thread safe  |
|13634|New|Enh|2002-10-15|Allowing system properties to be substituted in co|
|13689|Opn|Enh|2002-10-16|Classloader paths for 'Common' classes and librari|
|13731|New|Enh|2002-10-17|Final request, response, session and other variabl|
|13846|New|Nor|2002-10-22|If-Modified-Since results in incorrect headers|
|13941|New|Enh|2002-10-24|reload is VERY slow   |
|13956|New|Nor|2002-10-24|XSI Namespace Declaration Causing JSP

Bug report for Tomcat 3 [2004/08/01]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt|
| 2478|Opn|Cri|2001-07-06|Passing Session variables between JSP's and Servle|
| 4551|Opn|Nor|2001-10-31|Ctx( /tt01 ): IOException in: R( /tt01 + /com/abc/|
| 4980|New|Min|2001-11-20|Startup message indicates incorrect log file  |
| 4994|New|Nor|2001-11-21|Tomcat needs a mechanism for clean and certain shu|
| 5064|New|Cri|2001-11-25|Socket write error when include files is more than|
| 5108|New|Maj|2001-11-26|Docs for Tomcat 3.2.x appear to be for Tomcat 3.3 |
| 5137|New|Nor|2001-11-27|Null pointer in class loader after attempting to r|
| 5160|Unc|Maj|2001-11-28|'IllegalStateException'   |
| 5331|New|Nor|2001-12-09|getPathInfo vs URL normalization  |
| 5510|New|Blk|2001-12-19|How to call ejb deployed in JBoss from Tomcat serv|
| 5756|New|Nor|2002-01-08|jspc.bat exits with wrong ERRORLEVEL  |
| 5797|New|Nor|2002-01-10|UnCatched ? StringIndexOutOfBoundsException: Strin|
| 6027|New|Maj|2002-01-25|Tomcat  Automatically shuts down as service   |
| 6168|New|Blk|2002-02-01|IllegalStateException |
| 6451|New|Cri|2002-02-14|Stackoverflow |
| 6478|New|Enh|2002-02-14|Default Tomcat Encoding   |
| 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c|
| 6648|New|Nor|2002-02-25|jakarta-servletapi build with java 1.4 javadoc err|
| 6702|New|Cri|2002-02-27|win 2k services not working   |
| 6796|New|Cri|2002-03-01|Tomcat dies periodically  |
| 6989|New|Maj|2002-03-08|Unable to read tld file during parallel JSP compil|
| 7013|New|Cri|2002-03-10|Entering a servlet path with non-ISO8859-1 charact|
| 7227|New|Nor|2002-03-19| directive don't work |
| 7626|New|Nor|2002-03-29|classloader not working properly  |
| 7652|New|Cri|2002-04-01|Tomcat stalls periodically|
| 7785|New|Blk|2002-04-06|tomcat bug in context reloading   |
| 7863|New|Maj|2002-04-09|I have a problem when running Tomcat with IIS |
| 8187|New|Cri|2002-04-17|Errors when Tomcat used with MS Access database   |
| 8239|New|Cri|2002-04-18|Resource temporary unavailable|
| 8263|New|Cri|2002-04-18|url-pattern easy to circumvent|
| 9250|New|Maj|2002-05-20|outOfMemoryError  |
| 9367|New|Maj|2002-05-23|HttpSessionBindingEvent not thrown for HttpSession|
| 9390|New|Nor|2002-05-24|jasper compilation error in tomcat|
| 9480|New|Nor|2002-05-29|Data connection pooling   |
| 9607|New|Maj|2002-06-04|precompile JSP|
| 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p|
|10047|New|Cri|2002-06-20|IllegalStateException |
|10202|New|Maj|2002-06-25|Tomcat is not responding in time  |
|10357|Unc|Blk|2002-06-30|java.lang.IllegalArgumentException: Short Read|
|10406|New|Cri|2002-07-02|IllegalStateException |
|11087|New|Blk|2002-07-23|IllegalStateException |
|11286|New|Maj|2002-07-30|Tomcat threads not respond if increase JVM size   |
|11466|New|Nor|2002-08-05|ContextManager: SocketException reading request   |
|12156|New|Cri|2002-08-29|Apache and Tomcat 3.3.1 Interworking problem  |
|12194|New|Maj|2002-08-30|Tomcat does not send WWW-Authenticate header  |
|12475|New|Nor|2002-09-10|CPU Usage is 0%, Tomcat doesn't response  |
|12852|New|Nor|2002-09-20|May be error in _jspService() -> out.flushBuffers(|
|13706|New|Nor|2002-10-16|Many Processs Java / TOMCAT in a PC with Linux Con|
|14386|New|Maj|2002-11-08|Date headers corrupted using setDateHeader|
|15632|New|Nor|2002-12-23|Problem with the Tomcat Sessions Parameter on URL |
|15872|New|Blk|2003

cvs commit: jakarta-tomcat-connectors/ajp/proxy mod_proxy_ajp.dsp

[mturk]

mturk   2004/08/01 07:12:20

  Added:   ajp/proxy mod_proxy_ajp.dsp
  Log:
  mod_proxy_ajp build dsp. Requires adding a line
  mod_proxy_ajp.so0x6FB40x0001
  to BaseAddr.ref
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-connectors/ajp/proxy/mod_proxy_ajp.dsp
  
  Index: mod_proxy_ajp.dsp
  ===
  # Microsoft Developer Studio Project File - Name="mod_proxy_ajp" - Package Owner=<4>

  # Microsoft Developer Studio Generated Build File, Format Version 6.00

  # ** DO NOT EDIT **

  

  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

  

  CFG=mod_proxy_ajp - Win32 Release

  !MESSAGE This is not a valid makefile. To build this project using NMAKE,

  !MESSAGE use the Export Makefile command and run

  !MESSAGE 

  !MESSAGE NMAKE /f "mod_proxy_ajp.mak".

  !MESSAGE 

  !MESSAGE You can specify a configuration when running NMAKE

  !MESSAGE by defining the macro CFG on the command line. For example:

  !MESSAGE 

  !MESSAGE NMAKE /f "mod_proxy_ajp.mak" CFG="mod_proxy_ajp - Win32 Release"

  !MESSAGE 

  !MESSAGE Possible choices for configuration are:

  !MESSAGE 

  !MESSAGE "mod_proxy_ajp - Win32 Release" (based on "Win32 (x86) Dynamic-Link 
Library")

  !MESSAGE "mod_proxy_ajp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

  !MESSAGE 

  

  # Begin Project

  # PROP AllowPerConfigDependencies 0

  # PROP Scc_ProjName ""

  # PROP Scc_LocalPath ""

  CPP=cl.exe

  MTL=midl.exe

  RSC=rc.exe

  

  !IF  "$(CFG)" == "mod_proxy_ajp - Win32 Release"

  

  # PROP BASE Use_MFC 0

  # PROP BASE Use_Debug_Libraries 0

  # PROP BASE Output_Dir "Release"

  # PROP BASE Intermediate_Dir "Release"

  # PROP BASE Target_Dir ""

  # PROP Use_MFC 0

  # PROP Use_Debug_Libraries 0

  # PROP Output_Dir "Release"

  # PROP Intermediate_Dir "Release"

  # PROP Ignore_Export_Lib 0

  # PROP Target_Dir ""

  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

  # ADD CPP /nologo /MD /W3 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" 
/I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" 
/Fd"Release\mod_proxy_ajp_src" /FD /c

  # ADD BASE MTL /nologo /D "NDEBUG" /win32

  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

  # ADD BASE RSC /l 0x809 /d "NDEBUG"

  # ADD RSC /l 0x809 /d "NDEBUG"

  BSC32=bscmake.exe

  # ADD BASE BSC32 /nologo

  # ADD BSC32 /nologo

  LINK32=link.exe

  # ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows 
/dll /machine:I386 /out:"Release/mod_proxy_ajp.so" 
/base:@..\..\os\win32\BaseAddr.ref,mod_proxy_ajp.so

  # ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll 
/debug /machine:I386 /out:"Release/mod_proxy_ajp.so" 
/base:@..\..\os\win32\BaseAddr.ref,mod_proxy_ajp.so /opt:ref

  

  !ELSEIF  "$(CFG)" == "mod_proxy_ajp - Win32 Debug"

  

  # PROP BASE Use_MFC 0

  # PROP BASE Use_Debug_Libraries 1

  # PROP BASE Output_Dir "Debug"

  # PROP BASE Intermediate_Dir "Debug"

  # PROP BASE Target_Dir ""

  # PROP Use_MFC 0

  # PROP Use_Debug_Libraries 1

  # PROP Output_Dir "Debug"

  # PROP Intermediate_Dir "Debug"

  # PROP Ignore_Export_Lib 0

  # PROP Target_Dir ""

  # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD 
/c

  # ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I 
"../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" 
/D "_WINDOWS" /Fd"Debug\mod_proxy_ajp_src" /FD /c

  # ADD BASE MTL /nologo /D "_DEBUG" /win32

  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

  # ADD BASE RSC /l 0x809 /d "_DEBUG"

  # ADD RSC /l 0x809 /d "_DEBUG"

  BSC32=bscmake.exe

  # ADD BASE BSC32 /nologo

  # ADD BSC32 /nologo

  LINK32=link.exe

  # ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows 
/dll /incremental:no /debug /machine:I386 /out:"Debug/mod_proxy_ajp.so" 
/base:@..\..\os\win32\BaseAddr.ref,mod_proxy_ajp.so

  # ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll 
/incremental:no /debug /machine:I386 /out:"Debug/mod_proxy_ajp.so" 
/base:@..\..\os\win32\BaseAddr.ref,mod_proxy_ajp.so

  

  !ENDIF 

  

  # Begin Target

  

  # Name "mod_proxy_ajp - Win32 Release"

  # Name "mod_proxy_ajp - Win32 Debug"

  # Begin Group "Source Files"

  

  # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

  # Begin Source File

  

  SOURCE=.\proxy_ajp.c

  # End Source File

  # End Group

  # Begin Group "Header Files"

  

  # PROP Default_Filter ".h"

  # Begin Source File

  

  SOURCE=.\mod_proxy.h

  # End Source File

  # End Group

  # Begin Group "Ajp Files"

  

  # PROP Default_Filter ""

  # Begin Source File

  

  SOURCE=.\ajp\ajp.h

  # End Source File

  # Begin Source File

  

  SOURCE=.\ajp\ajp_header.c

  # End Source File

  # Begin Source File

  

  SOURCE=.\ajp\ajp_header.h

  # End Source File

 

cvs commit: jakarta-tomcat-connectors/ajp/proxy config.m4.patch

[mturk]

mturk   2004/08/01 07:09:21

  Modified:ajp/proxy config.m4.patch
  Log:
  Added APR_ADDTO(INCLUDES
  It can be set to other location perhaps.
  
  Revision  ChangesPath
  1.3   +4 -3  jakarta-tomcat-connectors/ajp/proxy/config.m4.patch
  
  Index: config.m4.patch
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/config.m4.patch,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- config.m4.patch   29 Jul 2004 15:07:39 -  1.2
  +++ config.m4.patch   1 Aug 2004 14:09:21 -   1.3
  @@ -1,10 +1,10 @@
   Index: config.m4
   ===
  -RCS file: /home/cvs/apache/httpd-2.0/modules/proxy/config.m4,v
  +RCS file: /home/cvspublic/httpd-2.0/modules/proxy/config.m4,v
   retrieving revision 1.17
   diff -u -r1.17 config.m4
   --- config.m425 Apr 2002 03:16:44 -  1.17
  -+++ config.m429 Jul 2004 15:05:15 -
   config.m41 Aug 2004 14:07:06 -
   @@ -16,6 +16,7 @@
proxy_connect_objs="proxy_connect.lo"
proxy_ftp_objs="proxy_ftp.lo"
  @@ -17,6 +17,7 @@
APACHE_MODULE(proxy_connect, Apache proxy CONNECT module, $proxy_connect_objs, , 
$proxy_mods_enable)
APACHE_MODULE(proxy_ftp, Apache proxy FTP module, $proxy_ftp_objs, , 
$proxy_mods_enable)
APACHE_MODULE(proxy_http, Apache proxy HTTP module, $proxy_http_objs, , 
$proxy_mods_enable)
  +-
  ++APR_ADDTO(INCLUDES, [-I./ajp])
   +APACHE_MODULE(proxy_ajp, Apache proxy AJP module, $proxy_ajp_objs, , 
$proxy_mods_enable)
  - 
APACHE_MODPATH_FINISH
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/proxy proxy_ajp.c

[mturk]

mturk   2004/08/01 07:06:24

  Modified:ajp/proxy proxy_ajp.c
  Log:
  Added include "ajp.h", and made some casting
  
  Revision  ChangesPath
  1.4   +7 -5  jakarta-tomcat-connectors/ajp/proxy/proxy_ajp.c
  
  Index: proxy_ajp.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_ajp.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- proxy_ajp.c   30 Jul 2004 17:12:08 -  1.3
  +++ proxy_ajp.c   1 Aug 2004 14:06:24 -   1.4
  @@ -16,6 +16,7 @@
   /* HTTP routines for Apache proxy */
   
   #include "mod_proxy.h"
  +#include "ajp.h"
   
   module AP_MODULE_DECLARE_DATA proxy_ajp_module;
   
  @@ -379,10 +380,9 @@
   }
   
   if (1) { /*  only when something to send ? */
  -void *msg;
  +ajp_msg_t *msg;
   apr_size_t bufsiz;
   char *buff;
  -long len;
   status = ajp_alloc_data_msg(r, &buff, &bufsiz, &msg);
   if (status != APR_SUCCESS) {
   return status;
  @@ -412,7 +412,8 @@
   }
   
   /* read the response */
  -status = ajp_read_header(p_conn->sock, r, &(p_conn->data));
  +status = ajp_read_header(p_conn->sock, r,
  + (ajp_msg_t **)&(p_conn->data));
   if (status != APR_SUCCESS) {
   ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
"proxy: request failed to %pI (%s)",
  @@ -472,7 +473,7 @@
   }
   } else if  (type == 3) {
   /* AJP13_SEND_BODY_CHUNK: piece of data */
  -apr_size_t size;
  +apr_uint16_t size;
   char *buff;
   
   status = ajp_parse_data(r, p_conn->data, &size, &buff);
  @@ -483,7 +484,8 @@
   break;
   }
   /* Read the next message */
  -status = ajp_read_header(p_conn->sock, r, &(p_conn->data));
  +status = ajp_read_header(p_conn->sock, r,
  + (ajp_msg_t **)&(p_conn->data));
   if (status != APR_SUCCESS) {
   break;
   }
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp.h

[mturk]

mturk   2004/08/01 07:04:16

  Modified:ajp/ajplib/test ajp.h
  Log:
  Added ajp_parse_ prototypes
  
  Revision  ChangesPath
  1.22  +26 -0 jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h
  
  Index: ajp.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ajp.h 1 Aug 2004 13:29:40 -   1.21
  +++ ajp.h 1 Aug 2004 14:04:16 -   1.22
  @@ -397,5 +397,31 @@
   apr_status_t  ajp_send_data_msg(apr_socket_t *sock, request_rec  *r,
   ajp_msg_t *data, apr_size_t len);
   
  +/**
  + * Parse the message type 
  + * @param r current request
  + * @param msg   AJP message
  + * @return  AJP message type.
  + */
  +int ajp_parse_type(request_rec  *r, ajp_msg_t *msg);
  +
  +/**
  + * Parse the headers 
  + * @param r current request
  + * @param msg   AJP message
  + * @return  APR_SUCCESS or error
  + */
  +apr_status_t ajp_parse_headers(request_rec  *r, ajp_msg_t *msg);
  +
  +/** parse the header and return data address and length 
  + * @param r current request
  + * @param msg   AJP message
  + * @param len   returned AJP message length 
  + * @param ptr   returned data
  + * @return  APR_SUCCESS or error
  + */
  +apr_status_t  ajp_parse_data(request_rec  *r, ajp_msg_t *msg,
  + apr_uint16_t *len, char **ptr);
  +
   #endif /* AJP_H */
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp.h

[mturk]

mturk   2004/08/01 06:29:40

  Modified:ajp/ajplib/test ajp.h
  Log:
  Use directly apj_msg_t instead void. If j-f-c will still insist we can
  make ajp_msg_t abstract to hide the implementation.
  
  Revision  ChangesPath
  1.21  +4 -4  jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h
  
  Index: ajp.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ajp.h 30 Jul 2004 19:57:47 -  1.20
  +++ ajp.h 1 Aug 2004 13:29:40 -   1.21
  @@ -294,7 +294,7 @@
* @param rmsg  Pointer to newly created AJP message
* @return  APR_SUCCESS or error
*/
  -apr_status_t ajp_msg_create(apr_pool_t *pool, ajp_msg_t **rmsg);
  +apr_status_t ajp_msg_create(apr_pool_t *pool, void **rmsg);
   
   /**
* Recopy an AJP Message to another
  @@ -373,7 +373,7 @@
*/
   apr_status_t ajp_read_header(apr_socket_t *sock,
request_rec  *r,
  - void **msg);
  + ajp_msg_t **msg);
   
   /**
* Allocate a msg to send data
  @@ -384,7 +384,7 @@
* @return  APR_SUCCESS or error
*/
   apr_status_t  ajp_alloc_data_msg(request_rec *r, char **ptr, apr_size_t *len,
  - void **data);
  + ajp_msg_t **data);
   
   /**
* Send the data message
  @@ -395,7 +395,7 @@
* @return  APR_SUCCESS or error
*/
   apr_status_t  ajp_send_data_msg(apr_socket_t *sock, request_rec  *r,
  -void *data, apr_size_t len);
  +ajp_msg_t *data, apr_size_t len);
   
   #endif /* AJP_H */
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp_header.c

[mturk]

mturk   2004/08/01 06:28:02

  Modified:ajp/ajplib/test ajp_header.c
  Log:
  Removed sc_for_req_method function, cause not needed.
  We have sc_for_req_method_by_id. The current can be made using
  sc_for_req_method_by_id(ap_method_number_of(method)).
  
  Revision  ChangesPath
  1.21  +4 -179jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c
  
  Index: ajp_header.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ajp_header.c  30 Jul 2004 19:26:37 -  1.20
  +++ ajp_header.c  1 Aug 2004 13:28:02 -   1.21
  @@ -44,175 +44,6 @@
   
   #define UNKNOWN_METHOD (-1)
   
  -static int sc_for_req_method(const char *method)
  -{
  -apr_ssize_t len = strlen(method);
  -
  -switch (len)
  -{
  -case 3:
  -switch (method[0])
  -{
  -case 'P':
  -return (method[1] == 'U'
  -&& method[2] == 'T'
  -? SC_M_PUT : UNKNOWN_METHOD);
  -case 'G':
  -return (method[1] == 'E'
  -&& method[2] == 'T'
  -? SC_M_GET : UNKNOWN_METHOD);
  -case 'A':
  -return (method[1] == 'C'
  -&& method[2] == 'L'
  -? SC_M_ACL : UNKNOWN_METHOD);
  -default:
  -return UNKNOWN_METHOD;
  -}
  -
  -case 4:
  -switch (method[0])
  -{
  -case 'H':
  -return (method[1] == 'E'
  -&& method[2] == 'A'
  -&& method[3] == 'D'
  -? SC_M_HEAD : UNKNOWN_METHOD);
  -case 'P':
  -return (method[1] == 'O'
  -&& method[2] == 'S'
  -&& method[3] == 'T'
  -? SC_M_POST : UNKNOWN_METHOD);
  -case 'M':
  -return (method[1] == 'O'
  -&& method[2] == 'V'
  -&& method[3] == 'E'
  -? SC_M_MOVE : UNKNOWN_METHOD);
  -case 'L':
  -return (method[1] == 'O'
  -&& method[2] == 'C'
  -&& method[3] == 'K'
  -? SC_M_LOCK : UNKNOWN_METHOD);
  -case 'C':
  -return (method[1] == 'O'
  -&& method[2] == 'P'
  -&& method[3] == 'Y'
  -? SC_M_COPY : UNKNOWN_METHOD);
  -default:
  -return UNKNOWN_METHOD;
  -}
  -
  -case 5:
  -switch (method[2])
  -{
  -case 'R':
  -return (memcmp(method, "MERGE", 5) == 0
  -? SC_M_MERGE : UNKNOWN_METHOD);
  -case 'C':
  -return (memcmp(method, "MKCOL", 5) == 0
  -? SC_M_MKCOL : UNKNOWN_METHOD);
  -case 'B':
  -return (memcmp(method, "LABEL", 5) == 0
  -? SC_M_LABEL : UNKNOWN_METHOD);
  -case 'A':
  -return (memcmp(method, "TRACE", 5) == 0
  -? SC_M_TRACE : UNKNOWN_METHOD);
  -default:
  -return UNKNOWN_METHOD;
  -}
  -
  -case 6:
  -switch (method[0])
  -{
  -case 'U':
  -switch (method[5])
  -{
  -case 'K':
  -return (memcmp(method, "UNLOCK", 6) == 0
  -? SC_M_UNLOCK : UNKNOWN_METHOD);
  -case 'E':
  -return (memcmp(method, "UPDATE", 6) == 0
  -? SC_M_UPDATE : UNKNOWN_METHOD);
  -default:
  -return UNKNOWN_METHOD;
  -}
  -case 'R':
  -return (memcmp(method, "REPORT", 6) == 0
  -? SC_M_REPORT : UNKNOWN_METHOD);
  -case 'D':
  -return (memcmp(method, "DELETE", 6) == 0
  -? SC_M_DELETE : UNKNOWN_METHOD);
  -case 'S':
  -return (memcmp(method, "SEARCH", 6) == 0
  -? SC_M_SEARCH : UNKNOWN_METHOD);
  -default:
  -return UNKNOWN_METHOD;
  -}
  -
  -case 7:
  -switch (method[1])
  -{
  -case 'P':
  -return (memcmp(method, "OPTIONS", 7) == 0
  -? SC_M_OPTIONS : UNKNOWN_METHOD);
  -case 'H':
  -return (memcmp(method, "CHECKIN", 7) == 0
  -? SC_M_CHECKIN : UNKNOWN_METHOD);
  -default:
  -return UNKNOWN_METHOD;
  -}
  -
  -case 8:
  -switch (method[0])
  -{
  -case 'P':
  -return (memcmp(method, "PROPFIND", 8) == 0
  -? SC_M_PROPFIND : UNKNOWN_METHOD);
  -case 'C':
  -return (memcmp(method, "CHECKOUT", 8) == 0
  -   

cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test httpd_wrap.h httpd_wrap.c

[mturk]

mturk   2004/08/01 06:22:19

  Modified:ajp/ajplib/test httpd_wrap.h httpd_wrap.c
  Log:
  Added few more compat functions, like ap_create_conn_config, etc...
  
  Revision  ChangesPath
  1.9   +48 -4 jakarta-tomcat-connectors/ajp/ajplib/test/httpd_wrap.h
  
  Index: httpd_wrap.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/httpd_wrap.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- httpd_wrap.h  30 Jul 2004 10:20:00 -  1.8
  +++ httpd_wrap.h  1 Aug 2004 13:22:19 -   1.9
  @@ -31,6 +31,13 @@
   #define AP_DECLARE(type)type
   #define AP_DECLARE_NONSTD(type) type
   #define AP_DECLARE_DATA
  +/**
  + * @internal
  + * modules should not used functions marked AP_CORE_DECLARE
  + */
  +#ifndef AP_CORE_DECLARE
  +# define AP_CORE_DECLARE AP_DECLARE
  +#endif 
   
   /** The default string lengths */
   #define MAX_STRING_LEN HUGE_STRING_LEN
  @@ -131,6 +138,10 @@
   ((x) == HTTP_SERVICE_UNAVAILABLE) || \
   ((x) == HTTP_NOT_IMPLEMENTED))
   
  +/* Maximum number of dynamically loaded modules */
  +#ifndef DYNAMIC_MODULE_LIMIT
  +#define DYNAMIC_MODULE_LIMIT 64
  +#endif
   /* Default administrator's address */
   #define DEFAULT_ADMIN "[no address given]"
   /* The timeout for waiting for messages */
  @@ -238,6 +249,14 @@
* The method mask bit to shift for anding with a bitmask.
*/
   #define AP_METHOD_BIT ((apr_int64_t)1)
  +
  +/*
  + * This is a convenience macro to ease with checking a mask
  + * against a method name.
  + */
  +#define AP_METHOD_CHECK_ALLOWED(mask, methname) \
  +((mask) & (AP_METHOD_BIT << ap_method_number_of((methname
  +
   /** @} */
   
   /** default HTTP Server protocol */
  @@ -270,7 +289,8 @@
   typedef struct request_rec  request_rec;
   typedef struct conn_rec conn_rec;
   typedef struct server_rec   server_rec;
  -
  +typedef struct ap_conf_vector_t ap_conf_vector_t;
  + 
   
   /* fake structure definitions */
   /** A structure that represents one process */
  @@ -382,10 +402,9 @@
   /** A struct containing the components of URI */
   apr_uri_t parsed_uri;
   /** Options set in config files, etc. */
  -void *per_dir_config;
  +struct ap_conf_vector_t *per_dir_config;
   /** Notes on *this* request */
  -void *request_config;
  - 
  +struct ap_conf_vector_t *request_config; 
   };
   
   /** Structure to store things which are per connection */
  @@ -414,6 +433,8 @@
   char *local_host;
/** ID of this connection; unique at any point in time */
   long id;
  +/** Notes on *this* connection */
  +struct ap_conf_vector_t *conn_config;
   /** send note from one module to another, must remain valid for all
*  requests on this conn */
   apr_table_t *notes; 
  @@ -703,6 +724,29 @@
* for the AddOutputFilterByType directive to work correctly.
*/
   AP_DECLARE(void) ap_set_content_type(request_rec *r, const char *ct);
  +
  +/**
  + * Setup the config vector for a request_rec
  + * @param p The pool to allocate the config vector from
  + * @return The config vector
  + */
  +AP_CORE_DECLARE(ap_conf_vector_t*) ap_create_request_config(apr_pool_t *p);
  +
  +/* For http_connection.c... */
  +/**
  + * Setup the config vector for a connection_rec
  + * @param p The pool to allocate the config vector from
  + * @return The config vector
  + */
  +AP_CORE_DECLARE(ap_conf_vector_t*) ap_create_conn_config(apr_pool_t *p);
  +
  +/**
  + * Get the method number associated with the given string, assumed to
  + * contain an HTTP method.  Returns M_INVALID if not recognized.
  + * @param method A string containing a valid HTTP method
  + * @return The method number
  + */
  +AP_DECLARE(int) ap_method_number_of(const char *method);
   
   /**
* create the request_rec structure from fake client connection 
  
  
  
  1.12  +39 -2 jakarta-tomcat-connectors/ajp/ajplib/test/httpd_wrap.c
  
  Index: httpd_wrap.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/httpd_wrap.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- httpd_wrap.c  30 Jul 2004 10:20:00 -  1.11
  +++ httpd_wrap.c  1 Aug 2004 13:22:19 -   1.12
  @@ -232,6 +232,7 @@
   
   c->sbh = sbh;
   
  +c->conn_config = ap_create_conn_config(ptrans);
   /* Got a connection structure, so initialize what fields we can
* (the rest are zeroed out by pcalloc).
*/
  @@ -501,6 +502,41 @@
   /* NOTREACHED */
   }
   
  +/* Get the method number associated with the given string, assumed to
  + * contain an HTTP method.  Returns M_INVALID if not recognized.
  + *
  + * This is the first step towa

Re: Mod_ajp initial

[Alexander Lazic]

Hi,
On Son 01.08.2004 11:46, Mladen Turk wrote:
You can take a look at current development at j-t-c/ajp and http_wrap
that mimics the libhttpd functionality and enables console apps to
behave like a http server.
Thanx i will look there ;-)
This is the fundamental difference from JK/JK2 where we had our own web
server abstraction layer and API. Ajp will use only the Apache2 API and
nothing more.
Thanx for your explanation ;-)
I think it *ajp* would not be backported to apache 1.3.
Writing apache2 wrapper shouldn't be such a big deal, cause in any web
server you have headers, output and input stream, etc...
I will study the http_wrap-Code ;-)
al ,-)
PS: whith j-t-c you mean Jakarte-Tomcat-Connector, right?
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

RE: Mod_ajp initial

[Mladen Turk]

 

Alexander Lazic wrote:
> >
> >Since we plan to developp an AJP library, it will ease the task for 
> >ajp_proxy and we could validate many points like this and have a 
> >release rate independant from the HTTPD 2.0/2.1 rr.
> 
> Well does you plan to bind this library to apr?

Yes, but also to the libhttpd.

> I ask because i want to use tomcat without 
> apache-httpd-webserver and therefore it would be nice if the 
> lib don't depend on to many or to great libs.
>

You can take a look at current development at j-t-c/ajp and http_wrap that
mimics the libhttpd functionality and enables console apps to behave like a
http server.

> I plan to use this webserver:
> 
> http://www.fefe.de/gatling/
> http://cthulhu.fnord.at/
>

You will have to write your own implementation of the ap_xxx functions
(httpd_wrap).
Since almost all web servers tend to behave similar, using HTTP protocol you
will need to find a way to rewrite the apache API on top of your web server
API.
Exactly the same will be done if we eventually decide to make a IIS or any
other server support. We will expect that IIS behaves like Apache2 does, not
modifying libajp but rather writing httpd_iis_wrap.

This is the fundamental difference from JK/JK2 where we had our own web
server abstraction layer and API. Ajp will use only the Apache2 API and
nothing more.
Writing apache2 wrapper shouldn't be such a big deal, cause in any web
server you have headers, output and input stream, etc...


MT.


smime.p7s
Description: S/MIME cryptographic signature

Re: Dynamic updates and Apache v2.0

[Alexander Lazic]

Hi,
On Die 27.07.2004 19:45, Mladen Turk wrote:
B. Backend reports "I'm going down, no more new sessions please"
If these can be setup in the httpd with an option for a virtserver that
would be nice ;-)) (add Shutdown 30Min && graceful restart) 

But i think here is it offtopic, is'n it?
al ;-)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Mod_ajp initial

[Alexander Lazic]

Hi,
On Mon 26.07.2004 12:01, Henri Gomez wrote:
Since we plan to developp an AJP library, it will ease the task for
ajp_proxy and we could validate many points like this and have a
release rate independant from the HTTPD 2.0/2.1 rr.
Well does you plan to bind this library to apr?
I ask because i want to use tomcat without apache-httpd-webserver and
therefore it would be nice if the lib don't depend on to many or to
great libs.
I plan to use this webserver:
http://www.fefe.de/gatling/
http://cthulhu.fnord.at/
al ;-)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]