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

2005-03-27 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=33106.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

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





--- Additional Comments From [EMAIL PROTECTED]  2005-03-27 14:10 ---
I have reviewed the patch and have found one area I would like to see a change.
The character encoding used to decode the query string has changed from platform
default to UTF-8. Such a change is likely to break things for existing users.

FYI the Tomcat Coyote connector has a number of configuration options for URI
decoding including:
- use platform default
- use body encoding
- use specified encoding

This could be fixed either by adding a configuration option or by reading the
settings from the connector. The downside to using the connector settings is it
obviously isn't portable.

I'll leave this a week or so and if an alternative approach to the query string
decoding isn't submitted I'll commit this patch less that one change.

-- 
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 34197] New: - index.jsp fails with Alias

2005-03-27 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=34197.
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=34197

   Summary: index.jsp fails with Alias
   Product: Tomcat 5
   Version: 5.5.7
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Native:JK
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


When using Tomcat 2 and mod_jk (1.2.8) to integrate apache2 and Tomcat 5 -
index.jsp fails to be loaded regardless of DirectoryIndex index.jsp when using
an Alias directory (e.g. for a context)

index.jsp will be loaded for the default context (/) - but no others.  When
using /context/index.jsp, all will work fine.  

Results:

http://localhost:8080/contextpath/ [success]
http://localhost/contextpath/index.jsp [success]
http://localhost/contextpath [fail]

If you remove mod_jk from the apache configuration completely, index.jsp will be
served as a text file!  Somehow, using mod_jk removes index.jsp from being
visible in the context of an alias.

I have used the following configuration in Apache:

IfModule mod_jk.c

#Tomcat Security
LocationMatch /WEB-INF/
  AllowOverride None
  deny from all
/LocationMatch

LocationMatch /META-INF/
  AllowOverride None
  deny from all
/LocationMatch

JkWorkersFile /usr/local/apache2/workers.properties
JkLogFile /usr/local/apache2/logs/mod_jk.log
JkLogLevel debug
JkOptions +ForwardDirectories #This does not seem to affect the issue

DirectoryIndex index.jsp

/IfModule

Then to Alias

Alias /jmx-console /usr/java/jboss/server/default/deploy/jmx-console.war

JkMount /jmx-console/*.jsp foo #this line appears to make no difference

Directory /usr/java/jboss/server/default/deploy/jmx-console.war
DirectoryIndex index.html index.htm index.jsp
/Directory

Note: Although I provided the configurations used as part of running the
embedded version of tomcat in jboss, the exact some behaviour can be observed
with a standard tomcat installation.

-- 
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 33774] - JNDIRealm fails when server disconnects after time

2005-03-27 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=33774.
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=33774





--- Additional Comments From [EMAIL PROTECTED]  2005-03-27 17:04 ---
The patch looks ok to me too. For historical reference see ...
http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
revision 1.12.

At one time, there was even more specific logic looking for Socket closed.


-- 
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-4.0/catalina/src/share/org/apache/catalina/valves AccessLogValve.java CertificatesValve.java ExtendedAccessLogValve.java JDBCAccessLogValve.java RequestDumperValve.java RequestFilterValve.java

2005-03-27 Thread markt
markt   2005/03/27 12:18:01

  Modified:catalina/src/share/org/apache/catalina/valves
AccessLogValve.java CertificatesValve.java
ExtendedAccessLogValve.java JDBCAccessLogValve.java
RequestDumperValve.java RequestFilterValve.java
  Log:
  Clean up Eclipse warnings for o.a.c.valves
   - remove unused imports
   - static access warnings
  
  Revision  ChangesPath
  1.19  +2 -3  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
  
  Index: AccessLogValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AccessLogValve.java   26 Aug 2004 21:43:51 -  1.18
  +++ AccessLogValve.java   27 Mar 2005 20:18:01 -  1.19
  @@ -36,7 +36,6 @@
   import javax.servlet.http.HttpSession;
   import org.apache.catalina.HttpResponse;
   import org.apache.catalina.Lifecycle;
  -import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.Request;
  @@ -339,7 +338,7 @@
*/
   public String getInfo() {
   
  -return (this.info);
  +return (info);
   
   }
   
  
  
  
  1.12  +1 -3  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/CertificatesValve.java
  
  Index: CertificatesValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/CertificatesValve.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CertificatesValve.java26 Aug 2004 21:43:51 -  1.11
  +++ CertificatesValve.java27 Mar 2005 20:18:01 -  1.12
  @@ -29,13 +29,11 @@
   import org.apache.catalina.Context;
   import org.apache.catalina.Globals;
   import org.apache.catalina.Lifecycle;
  -import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.Logger;
   import org.apache.catalina.Request;
   import org.apache.catalina.Response;
  -import org.apache.catalina.Valve;
   import org.apache.catalina.ValveContext;
   import org.apache.catalina.connector.RequestWrapper;
   import org.apache.catalina.deploy.LoginConfig;
  
  
  
  1.5   +2 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
  
  Index: ExtendedAccessLogValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExtendedAccessLogValve.java   26 Aug 2004 21:43:51 -  1.4
  +++ ExtendedAccessLogValve.java   27 Mar 2005 20:18:01 -  1.5
  @@ -32,14 +32,11 @@
   import java.util.TimeZone;
   import javax.servlet.ServletException;
   import javax.servlet.ServletRequest;
  -import javax.servlet.ServletResponse;
   import javax.servlet.http.Cookie;
   import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
   import javax.servlet.http.HttpSession;
   import org.apache.catalina.HttpResponse;
   import org.apache.catalina.Lifecycle;
  -import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.Request;
  @@ -349,7 +346,7 @@
*/
   public String getInfo() {
   
  -return (this.info);
  +return (info);
   
   }
   
  
  
  
  1.4   +0 -2  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java
  
  Index: JDBCAccessLogValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JDBCAccessLogValve.java   26 Aug 2004 21:43:51 -  1.3
  +++ JDBCAccessLogValve.java   27 Mar 2005 20:18:01 -  1.4
  @@ -27,7 +27,6 @@
   import org.apache.catalina.HttpResponse;
   import org.apache.catalina.ValveContext;
   import org.apache.catalina.Lifecycle;
  -import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.util.LifecycleSupport;
  @@ -35,7 +34,6 @@
   import org.apache.catalina.valves.ValveBase;
   import org.apache.catalina.valves.Constants;
   import java.util.Properties;
  

DO NOT REPLY [Bug 34189] - header encoding issue

2005-03-27 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=34189.
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=34189





--- Additional Comments From [EMAIL PROTECTED]  2005-03-28 00:13 ---
 and as a result, it always uses the HTTP defaults.
 If you need encoding there, you should URL encode/decode your headers using 

I can agree with you up to a point, but IMO, converting chars to bytes by
cutting the hibyte can't be right. Maybe inserting question marks could be a
more elegant solution, but it is not up to me to decide.

Btw, It seems that browsers do assume that header encoding is the same as
content's. I know it's not right, but forceing iso8859-2 solved my problem.(new
String(msg.getBytes(iso8859-2))) I've tried to use url encoding, but it was
useless. Browsers seems to ignore URL encoding there. (Stateing this does not
mean I want to convince you to use the same encoding for the headers as the
content, just for the record, maybe someone will run into the same problem)

Tamas

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



Bernhard Kluschat/EZW/EN01 ist =?iso-8859-1?Q?au=DFer_Haus=2E?=

2005-03-27 Thread Bernhard . Kluschat
Ich werde ab  18.03.2005 nicht im Büro sein. Ich kehre zurück am
04.04.2005.

Ich werde Ihre Nachricht nach meiner Rückkehr beantworten.

In dringenden Fällen wenden Sie sich bitte an meinen Kollegen
 Rolf-Dieter Gross, Tel.: 02056/ 259-5440
e-mail:[EMAIL PROTECTED]
oder erreichen mich unter Mobil: 0172 745 81 45




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



[ANN] Apache Jakarta Tomcat v5.5.9-alpha Released

2005-03-27 Thread Yoav Shapira
The Apache Jakarta Tomcat team is proud to announce the immediate availability
of Tomcat 5.5.9-alpha. This build contains numerous bug fixes, documentation
updates, and other improvements.

Release notes: http://jakarta.apache.org/tomcat/tomcat-5.5-doc/RELEASE-NOTES

Please refer to the change log for the list of changes:
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/changelog.html

Downloads: Binaries: http://jakarta.apache.org/site/binindex.cgi#tomcat-5.5
Sources: http://jakarta.apache.org/site/sourceindex.cgi#tomcat-5.5

The Apache Jakarta Tomcat Team 

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



cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.c jk_shm.h

2005-03-27 Thread mturk
mturk   2005/03/27 22:27:39

  Modified:jk/native/common jk_shm.c jk_shm.h
  Log:
  Lower the default shared memory size from 1Mb to 64Kb.
  Since each worker uses 1024 bytes of data, this gives 64
  workers by default, that is enough for any default installation.
  If more then 64 workers is required (!?), JkShmSize can be used.
  
  Revision  ChangesPath
  1.17  +1 -1  jakarta-tomcat-connectors/jk/native/common/jk_shm.c
  
  Index: jk_shm.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- jk_shm.c  20 Feb 2005 18:31:21 -  1.16
  +++ jk_shm.c  28 Mar 2005 06:27:38 -  1.17
  @@ -17,7 +17,7 @@
   /***
* Description: Shared Memory support  *
* Author:  Mladen Turk [EMAIL PROTECTED]  
*
  - * Version: $Revision$   *
  + * Version: $Revision$  *
***/
   
   #include jk_global.h
  
  
  
  1.17  +4 -4  jakarta-tomcat-connectors/jk/native/common/jk_shm.h
  
  Index: jk_shm.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- jk_shm.h  21 Feb 2005 10:31:08 -  1.16
  +++ jk_shm.h  28 Mar 2005 06:27:38 -  1.17
  @@ -45,9 +45,9 @@
   #define JK_SHM_DYNAMIC  16
   #define JK_SHM_MAGIC'!', 'J', 'K', 'S', 'H', 'M', JK_SHM_MAJOR, 
JK_SHM_MINOR
   
  -/* Really huge numbers, but 512 workers should be enough */
  -#define JK_SHM_MAX_WORKERS  512
  -#define JK_SHM_DEF_SIZE (1024 * 1024)
  +/* Really huge numbers, but 64 workers should be enough */
  +#define JK_SHM_MAX_WORKERS  64
  +#define JK_SHM_DEF_SIZE (JK_SHM_MAX_WORKERS * 1024)
   #define JK_SHM_ALIGN(x) JK_ALIGN(x, 1024)
   
   /** jk shm worker record structure */
  
  
  

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



cvs commit: jakarta-tomcat-connectors/jk/native/common jk_uri_worker_map.c

2005-03-27 Thread mturk
mturk   2005/03/27 22:34:09

  Modified:jk/native/common jk_uri_worker_map.c
  Log:
  Major uri worker mapping simplification. Sice we have wildchar
  matching it can be used for any use case except exact matching.
  Also added option to use 'double' mappings
  'JkMount 'application|/*' will create two mappings at once:
  'JkMount /applicantion' and 'JkMount /application/*'.
  
  Revision  ChangesPath
  1.51  +60 -345   
jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
  
  Index: jk_uri_worker_map.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- jk_uri_worker_map.c   21 Feb 2005 11:18:48 -  1.50
  +++ jk_uri_worker_map.c   28 Mar 2005 06:34:09 -  1.51
  @@ -74,63 +74,15 @@
   return -1;
   }
   else if (exp[y] != '?') {
  -if (icase  tolower(str[x]) != tolower(exp[y]))
  +if (icase  (tolower(str[x]) != tolower(exp[y])))
   return 1;
   else if (!icase  str[x] != exp[y])
   return 1;
   }
   }
   return (str[x] != '\0');
  -} 
  -
  -/*
  - * We are now in a security nightmare, it maybe that somebody sent 
  - * us a uri that looks like /top-secret.jsp. and the web server will 
  - * fumble and return the jsp content. 
  - *
  - * To solve that we will check for path info following the suffix, we 
  - * will also check that the end of the uri is not .suffix.,
  - * .suffix/, or .suffix .
  - */
  -static int check_security_fraud(jk_uri_worker_map_t *uw_map, const char *uri)
  -{
  -unsigned i;
  -
  -for (i = 0; i  uw_map-size; i++) {
  -if (uw_map-maps[i]-match_type == MATCH_TYPE_SUFFIX) {
  -char *suffix_start;
  -for (suffix_start = strstr(uri, uw_map-maps[i]-suffix);
  - suffix_start;
  - suffix_start =
  - strstr(suffix_start + 1, uw_map-maps[i]-suffix)) {
  -
  -if ('.' != *(suffix_start - 1)) {
  -continue;
  -}
  -else {
  -char *after_suffix =
  -suffix_start + strlen(uw_map-maps[i]-suffix);
  -
  -if ((('.' == *after_suffix) || ('/' == *after_suffix)
  - || (' ' == *after_suffix))
  - (0 ==
  -JK_STRNCMP(uw_map-maps[i]-context, uri,
  -   uw_map-maps[i]-context_len))) {
  -/* 
  - * Security violation !!!
  - * this is a fraud.
  - */
  -return i;
  -}
  -}
  -}
  -}
  -}
  -
  -return -1;
   }
   
  -
   int uri_worker_map_alloc(jk_uri_worker_map_t **uw_map,
jk_map_t *init_data, jk_logger_t *l)
   {
  @@ -249,8 +201,8 @@
   match_type |= MATCH_TYPE_NO_MATCH;
   puri++;
   }
  -
  -/* Find if duplicate entry */
  +
  +/* Find if duplicate entry */
   for (i = 0; i  uw_map-size; i++) {
   uwr = uw_map-maps[i];
   if (strcmp(uwr-uri, puri) == 0) {
  @@ -289,7 +241,7 @@
   return JK_FALSE;
   }
   uwr-suffix = NULL;
  -
  +
   uri = jk_pool_strdup(uw_map-p, puri);
   if (!uri || !worker) {
   jk_log(l, JK_LOG_ERROR,
  @@ -298,99 +250,28 @@
   return JK_FALSE;
   }
   
  -if (uri[0] == '/') {
  -char *asterisk = strchr(uri, '*');
  -
  -if ((asterisk  strchr(asterisk + 1, '*')) ||
  +if (*uri == '/') {
  +if (strchr(uri, '*') ||
   strchr(uri, '?')) {
  -uwr-uri = uri;
  -/* Lets check if we have multiple
  - * asterixes in the uri like:
  +/* Something like
* /context/ * /user/ *
  + * /context/ *.suffix
*/
  -uwr-context = uri;
   match_type |= MATCH_TYPE_WILDCHAR_PATH;
   jk_log(l, JK_LOG_DEBUG,
  -wild chars path rule %s=%s was added,
  +wildchar rule %s=%s was added,
   uri, worker);
   
   }
  -else if (asterisk) {
  -uwr-uri = jk_pool_strdup(uw_map-p, uri);
  -
  -if (!uwr-uri) {
  -jk_log(l, JK_LOG_ERROR,
  -   can't alloc uri string);
  -JK_TRACE_EXIT(l);
  -return JK_FALSE;
  -}
  -/*
  - * Now, lets check that the pattern is /context/asterisk.suffix
  - * or /context/asterisk
  - * we need to have a 

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.c

2005-03-27 Thread mturk
mturk   2005/03/27 22:36:01

  Modified:jk/native/common jk_shm.c
  Log:
  Remove some extra trailing spaces. No functional change.
  
  Revision  ChangesPath
  1.18  +3 -3  jakarta-tomcat-connectors/jk/native/common/jk_shm.c
  
  Index: jk_shm.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- jk_shm.c  28 Mar 2005 06:27:38 -  1.17
  +++ jk_shm.c  28 Mar 2005 06:36:01 -  1.18
  @@ -214,8 +214,8 @@
  Using process memory as shared memory);
   JK_TRACE_EXIT(l);
   return 0;
  -}
  -
  +}
  +
   if (!attached)
   flags |= (O_CREAT|O_TRUNC);
   fd = open(fname, flags, 0666);
  
  
  

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



Re: [VOTE] PMC Chair

2005-03-27 Thread Henri Yandell
Just as an update, I've recorded 11 public/private votes from:

Keith Wannamaker (keith)
Mark Thomas (markt)
Larry Isaacs (larryi)
Filip Hanak (fhanak)
Tim Funk (funkman)
Kin-man Chung (kinman)
Henri Gomez (hgomez)  
Mladen Turk (mturk)
Costin Manolache (costin)
Jim Jagielski (jim)
Bill Barker (billbarker)

There are 70 committers, and it's a holiday weekend (4 day weekend in
some places, so not back til Tuesday) so I suspect it's best to keep
the vote open for some more time.

The above, plus Remy and Yoav, would represent the proposed PMC list,
and I'll report on additional votes on Tuesday night.

Hen

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



cvs commit: jakarta-tomcat-connectors/jk/native/iis isapi_redirect.rc isapi.dsp

2005-03-27 Thread mturk
mturk   2005/03/27 22:58:58

  Modified:jk/native/iis isapi.dsp
  Added:   jk/native/iis isapi_redirect.rc
  Log:
  Add .rc file to iis build for dll version information.
  
  Revision  ChangesPath
  1.14  +4 -0  jakarta-tomcat-connectors/jk/native/iis/isapi.dsp
  
  Index: isapi.dsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/isapi.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- isapi.dsp 15 Feb 2005 12:02:28 -  1.13
  +++ isapi.dsp 28 Mar 2005 06:58:58 -  1.14
  @@ -92,6 +92,10 @@
   # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat

   # Begin Source File

   

  +SOURCE=.\isapi_redirect.rc

  +# End Source File

  +# Begin Source File

  +

   SOURCE=..\common\jk_ajp12_worker.c

   # End Source File

   # Begin Source File

  
  
  
  1.1  jakarta-tomcat-connectors/jk/native/iis/isapi_redirect.rc
  
  Index: isapi_redirect.rc
  ===
  #define JK_COPYRIGHT Copyright 2000-2005 The Apache Software  \

   Foundation or its licensors, as applicable.

  

  #define JK_LICENSE Licensed under the Apache License, Version 2.0  \

  (the License); you may not use this file except  \

  in compliance with the License.  You may obtain a  \

  copy of the License at\r\n\r\n \

  http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n; \

  Unless required by applicable law or agreed to in  \

  writing, software distributed under the License is  \

  distributed on an AS IS BASIS, WITHOUT  \

  WARRANTIES OR CONDITIONS OF ANY KIND, either  \

  express or implied.  See the License for the  \

  specific language governing permissions and  \

  limitations under the License.

  

  #define JK_VERSION_STR  1.2.9

  #define JK_DLL_BASENAME isapi_redirect- JK_VERSION_STR

  

  

  1 VERSIONINFO

   FILEVERSION 1,2,9,0

   PRODUCTVERSION 1,2,9,0

   FILEFLAGSMASK 0x3fL

  #if defined(_DEBUG)

   FILEFLAGS 0x01L

  #else

   FILEFLAGS 0x00L

  #endif

   FILEOS 0x40004L

   FILETYPE 0x1L

   FILESUBTYPE 0x0L

  BEGIN

BLOCK StringFileInfo

BEGIN

  BLOCK 040904b0

  BEGIN

  VALUE Comments, JK_LICENSE \0

VALUE CompanyName, Apache Software Foundation\0

VALUE FileDescription, Apache Tomcat IIS Redirector\0

VALUE FileVersion, JK_VERSION_STR \0

VALUE InternalName, JK_DLL_BASENAME \0

VALUE LegalCopyright, JK_COPYRIGHT \0

VALUE OriginalFilename, JK_DLL_BASENAME .dll\0

VALUE ProductName, Apache Tomcat Connectors project\0

VALUE ProductVersion, JK_VERSION_STR \0

  END

END

BLOCK VarFileInfo

BEGIN

  VALUE Translation, 0x409, 1200

END

  END

  
  
  

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