Return-Path: Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 56005 invoked from network); 9 Feb 2001 11:14:25 -0000 Received: from smtp-ft2.fr.colt.net (213.41.78.26) by h31.sny.collab.net with SMTP; 9 Feb 2001 11:14:25 -0000 Received: from www2.cs (access-138.93.rev.fr.colt.net [213.41.93.138]) by smtp-ft2.fr.colt.net with ESMTP id f19BFPB01834; Fri, 9 Feb 2001 12:15:25 +0100 Received: from css4.cs (css4.cs [172.31.1.8]) by www2.cs (8.9.3/8.9.3) with ESMTP id MAA22273; Fri, 9 Feb 2001 12:14:31 +0100 Received: by css4.cs with Internet Mail Service (5.5.2650.21) id <1SB40PG9>; Fri, 9 Feb 2001 12:14:31 +0100 Message-ID: <361024C34A6DD2118689006097AE2B4DBFE5CC@css4.cs> From: GOMEZ Henri To: tomcat-dev@jakarta.apache.org Cc: Dan Milstein , Keith Wannamaker Subject: mod_jk TC 3.2.2 != TC 3.3 => was RE: [PROPOSAL] Tomcat 3.2.2 Rele ase Plan Date: Fri, 9 Feb 2001 12:14:30 +0100 MIME-Version: 1.0 X-Mailer: Internet Mail Service (5.5.2650.21) Content-Type: multipart/mixed; boundary="----_=_NextPart_000_01C09289.793A33EA" X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N ------_=_NextPart_000_01C09289.793A33EA Content-Type: text/plain; charset="iso-8859-1" While looking updating TC 3.2.2 with mod_jk for Apache 2.0 I notice that mod_jk from TC 3.2.2 and 3.3 are still differents I attached a list of diff without the version which are also different in each files. I propose that the whole TC 3.3 mod_jk native code (ap1.3, ap2.0 and common) are reimported in TC 3.2.2 to avoid confusion and mistake, and let us be sure we at the same level. What about ? Who could do that ? ------_=_NextPart_000_01C09289.793A33EA Content-Type: application/octet-stream; name="jk-3.2-3.3.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="jk-3.2-3.3.diff" diff -Nru jakarta-tomcat-3.2/src/native/jk/jk_ajp13.c = jakarta-tomcat/src/native/mod_jk/common/jk_ajp13.c=0A= --- jakarta-tomcat-3.2/src/native/jk/jk_ajp13.c Fri Feb 9 10:07:12 = 2001=0A= +++ jakarta-tomcat/src/native/mod_jk/common/jk_ajp13.c Fri Feb 9 = 10:27:42 2001=0A= @@ -56,7 +56,7 @@=0A= = /***********************************************************************= ****=0A= * Description: Experimental bi-directionl protocol handler. = *=0A= * Author: Gal Shachor = *=0A= - * Version: $Revision: 1.5.2.3 $ = *=0A= + * Version: $Revision: 1.5 $ = *=0A= = ************************************************************************= ***/=0A= =0A= =0A= @@ -82,7 +82,8 @@=0A= =0A= /*=0A= * Request methods, coded as numbers instead of strings.=0A= - * The list of methods was taken from Section 5.1.1 of RFC 2616=0A= + * The list of methods was taken from Section 5.1.1 of RFC 2616,=0A= + * RFC 2518, and the ACL IETF draft.=0A= * Method =3D "OPTIONS"=0A= * | "GET" =0A= * | "HEAD" =0A= @@ -90,6 +91,14 @@=0A= * | "PUT" =0A= * | "DELETE" =0A= * | "TRACE" =0A= + * | "PROPFIND"=0A= + * | "PROPPATCH"=0A= + * | "MKCOL"=0A= + * | "COPY"=0A= + * | "MOVE"=0A= + * | "LOCK"=0A= + * | "UNLOCK"=0A= + * | "ACL"=0A= * =0A= */=0A= #define SC_M_OPTIONS (unsigned char)1=0A= @@ -99,6 +108,14 @@=0A= #define SC_M_PUT (unsigned char)5=0A= #define SC_M_DELETE (unsigned char)6=0A= #define SC_M_TRACE (unsigned char)7=0A= +#define SC_M_PROPFIND (unsigned char)8=0A= +#define SC_M_PROPPATCH (unsigned char)9=0A= +#define SC_M_MKCOL (unsigned char)10=0A= +#define SC_M_COPY (unsigned char)11=0A= +#define SC_M_MOVE (unsigned char)12=0A= +#define SC_M_LOCK (unsigned char)13=0A= +#define SC_M_UNLOCK (unsigned char)14=0A= +#define SC_M_ACL (unsigned char)15=0A= =0A= =0A= /*=0A= @@ -210,6 +227,22 @@=0A= *sc =3D SC_M_OPTIONS;=0A= } else if(0 =3D=3D strcmp(method, "TRACE")) {=0A= *sc =3D SC_M_TRACE;=0A= + } else if(0 =3D=3D strcmp(method, "PROPFIND")) {=0A= + *sc =3D SC_M_PROPFIND;=0A= + } else if(0 =3D=3D strcmp(method, "PROPPATCH")) {=0A= + *sc =3D SC_M_PROPPATCH;=0A= + } else if(0 =3D=3D strcmp(method, "MKCOL")) {=0A= + *sc =3D SC_M_MKCOL;=0A= + } else if(0 =3D=3D strcmp(method, "COPY")) {=0A= + *sc =3D SC_M_COPY;=0A= + } else if(0 =3D=3D strcmp(method, "MOVE")) {=0A= + *sc =3D SC_M_MOVE;=0A= + } else if(0 =3D=3D strcmp(method, "LOCK")) {=0A= + *sc =3D SC_M_LOCK;=0A= + } else if(0 =3D=3D strcmp(method, "UNLOCK")) {=0A= + *sc =3D SC_M_UNLOCK;=0A= + } else if(0 =3D=3D strcmp(method, "ACL")) {=0A= + *sc =3D SC_M_ACL;=0A= } else {=0A= rc =3D JK_FALSE;=0A= }=0A= diff -Nru jakarta-tomcat-3.2/src/native/jk/jk_ajp13_worker.c = jakarta-tomcat/src/native/mod_jk/common/jk_ajp13_worker.c=0A= --- jakarta-tomcat-3.2/src/native/jk/jk_ajp13_worker.c Fri Feb 9 = 10:07:12 2001=0A= +++ jakarta-tomcat/src/native/mod_jk/common/jk_ajp13_worker.c Fri Feb = 9 10:27:42 2001=0A= @@ -57,7 +57,7 @@=0A= * Description: Experimental bi-directionl protocol. = *=0A= * Author: Costin = *=0A= * Author: Gal Shachor = *=0A= - * Version: $Revision: 1.3.2.2 $ = *=0A= + * Version: $Revision: 1.4 $ = *=0A= = ************************************************************************= ***/=0A= =0A= #include "jk_pool.h"=0A= @@ -344,6 +344,7 @@=0A= }=0A= =0A= if(read_into_msg_buff(ep, r, msg, l, len)) {=0A= + r->content_read +=3D len;=0A= return JK_AJP13_HAS_RESPONSE;=0A= } =0A= =0A= @@ -604,6 +605,7 @@=0A= if(!read_into_msg_buff(p, s, msg, l, len)) {=0A= return JK_FALSE;=0A= } =0A= + s->content_read =3D len;=0A= if(!connection_tcp_send_message(p, msg, l)) {=0A= jk_log(l, JK_LOG_ERROR,=0A= "Error sending request body\n");=0A= diff -Nru jakarta-tomcat-3.2/src/native/jk/jk_lb_worker.c = jakarta-tomcat/src/native/mod_jk/common/jk_lb_worker.c=0A= --- jakarta-tomcat-3.2/src/native/jk/jk_lb_worker.c Fri Feb 9 10:07:12 = 2001=0A= +++ jakarta-tomcat/src/native/mod_jk/common/jk_lb_worker.c Fri Feb 9 = 10:27:42 2001=0A= @@ -58,7 +58,7 @@=0A= * several workers. = *=0A= * Author: Gal Shachor = *=0A= * Based on: = *=0A= - * Version: $Revision: 1.2.2.1 $ = *=0A= + * Version: $Revision: 1.4 $ = *=0A= = ************************************************************************= ***/=0A= =0A= #include "jk_pool.h"=0A= @@ -133,7 +133,7 @@=0A= * string if appended...=0A= */=0A= if(id_end =3D strchr(id_start, '?')) { =0A= - id_end =3D NULL;=0A= + *id_end =3D '\0';=0A= }=0A= return id_start;=0A= }=0A= diff -Nru jakarta-tomcat-3.2/src/native/jk/jk_service.h = jakarta-tomcat/src/native/mod_jk/common/jk_service.h=0A= --- jakarta-tomcat-3.2/src/native/jk/jk_service.h Fri Feb 9 10:07:12 = 2001=0A= +++ jakarta-tomcat/src/native/mod_jk/common/jk_service.h Fri Feb 9 = 10:27:42 2001=0A= @@ -58,7 +58,7 @@=0A= * These are the web server (ws) the worker and the = connection*=0A= * JVM connection point = *=0A= * Author: Gal Shachor = *=0A= - * Version: $Revision: 1.2 $ = *=0A= + * Version: $Revision: 1.3 $ = *=0A= = ************************************************************************= ***/=0A= =0A= #ifndef JK_SERVICE_H=0A= @@ -104,6 +104,7 @@=0A= char *server_software;=0A= unsigned content_length; /* integer that represents the content = */=0A= /* length should be 0 if unknown. = */=0A= + unsigned content_read;=0A= =0A= /*=0A= * SSL information=0A= diff -Nru jakarta-tomcat-3.2/src/native/jk/jk_uri_worker_map.c = jakarta-tomcat/src/native/mod_jk/common/jk_uri_worker_map.c=0A= --- jakarta-tomcat-3.2/src/native/jk/jk_uri_worker_map.c Fri Feb 9 = 10:07:12 2001=0A= +++ jakarta-tomcat/src/native/mod_jk/common/jk_uri_worker_map.c Fri Feb = 9 10:27:42 2001=0A= @@ -358,6 +358,7 @@=0A= uri =3D clean_uri;=0A= }=0A= =0A= + jk_log(l, JK_LOG_DEBUG, "Attempting to map URI %s\n", uri);=0A= for(i =3D 0 ; i < uw_map->size ; i++) {=0A= =0A= if(uw_map->maps[i].ctxt_len < longest_match) {=0A= @@ -369,10 +370,20 @@=0A= uw_map->maps[i].ctxt_len)) {=0A= if(MATCH_TYPE_EXACT =3D=3D uw_map->maps[i].match_type) = {=0A= if(strlen(uri) =3D=3D uw_map->maps[i].ctxt_len) = {=0A= + jk_log(l,=0A= + JK_LOG_DEBUG,=0A= + "jk_uri_worker_map_t::map_uri_to_worker, Found an exact = match %s ->%s\n",=0A= + uw_map->maps[i].worker_name,=0A= + uw_map->maps[i].context );=0A= return uw_map->maps[i].worker_name;=0A= }=0A= } else if(MATCH_TYPE_CONTEXT =3D=3D = uw_map->maps[i].match_type) {=0A= if(uw_map->maps[i].ctxt_len > longest_match) {=0A= + jk_log(l,=0A= + JK_LOG_DEBUG,=0A= + "jk_uri_worker_map_t::map_uri_to_worker, Found a context = match %s -> %s\n",=0A= + uw_map->maps[i].worker_name,=0A= + uw_map->maps[i].context );=0A= longest_match =3D uw_map->maps[i].ctxt_len;=0A= best_match =3D i;=0A= }=0A= @@ -393,6 +404,11 @@=0A= if(0 =3D=3D strcmp(suffix, = uw_map->maps[i].suffix)) {=0A= #endif=0A= if(uw_map->maps[i].ctxt_len >=3D = longest_match) {=0A= + jk_log(l,=0A= + JK_LOG_DEBUG,=0A= + "jk_uri_worker_map_t::map_uri_to_worker, Found a suffix = match %s -> *.%s\n",=0A= + uw_map->maps[i].worker_name,=0A= + uw_map->maps[i].suffix );=0A= longest_match =3D = uw_map->maps[i].ctxt_len;=0A= best_match =3D i;=0A= }=0A= @@ -403,10 +419,6 @@=0A= }=0A= =0A= if(-1 !=3D best_match) {=0A= - jk_log(l, JK_LOG_DEBUG, =0A= - "jk_uri_worker_map_t::map_uri_to_worker, Found a = match %s\n",=0A= - uw_map->maps[best_match].worker_name); =0A= -=0A= return uw_map->maps[best_match].worker_name;=0A= } else {=0A= /*=0A= @@ -435,4 +447,4 @@=0A= "jk_uri_worker_map_t::map_uri_to_worker, done without a = match\n"); =0A= =0A= return NULL;=0A= -}=0A= \ No newline at end of file=0A= +}=0A= diff -Nru jakarta-tomcat-3.2/src/native/jk/jk_util.c = jakarta-tomcat/src/native/mod_jk/common/jk_util.c=0A= --- jakarta-tomcat-3.2/src/native/jk/jk_util.c Fri Feb 9 10:07:12 = 2001=0A= +++ jakarta-tomcat/src/native/mod_jk/common/jk_util.c Fri Feb 9 = 10:27:42 2001=0A= @@ -56,7 +56,7 @@=0A= = /***********************************************************************= ****=0A= * Description: Utility functions (mainly configuration) = *=0A= * Author: Gal Shachor = *=0A= - * Version: $Revision: 1.6.2.3 $ = *=0A= + * Version: $Revision: 1.4 $ = *=0A= = ************************************************************************= ***/=0A= =0A= =0A= @@ -710,6 +710,7 @@=0A= s->server_port =3D 80;=0A= s->server_software =3D NULL;=0A= s->content_length =3D 0;=0A= + s->content_read =3D 0;=0A= s->is_ssl =3D JK_FALSE;=0A= s->ssl_cert =3D NULL;=0A= s->ssl_cert_len =3D 0;=0A= ------_=_NextPart_000_01C09289.793A33EA--