svn commit: r571063 - in /tomcat/connectors/trunk/jk: native/ native/common/ native/iis/ native/iis/installer/ xdocs/miscellaneous/

[rjung]

Author: rjung
Date: Thu Aug 30 00:45:42 2007
New Revision: 571063

URL: http://svn.apache.org/viewvc?rev=571063&view=rev
Log:
Change JK version to 1.2.26-dev.

Modified:
tomcat/connectors/trunk/jk/native/STATUS.txt
tomcat/connectors/trunk/jk/native/common/jk_version.h
tomcat/connectors/trunk/jk/native/common/portable.h.sample
tomcat/connectors/trunk/jk/native/configure.in

tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/STATUS.txt?rev=571063&r1=571062&r2=571063&view=diff
==
--- tomcat/connectors/trunk/jk/native/STATUS.txt (original)
+++ tomcat/connectors/trunk/jk/native/STATUS.txt Thu Aug 30 00:45:42 2007
@@ -3,6 +3,7 @@
 
 Release:
 
+1.2.26  : in development
 1.2.25  : released August 7, 2007
 1.2.24  : released July 27, 2007, withdrawn August 2, 2007
 1.2.23  : released May 18, 2007

Modified: tomcat/connectors/trunk/jk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_version.h?rev=571063&r1=571062&r2=571063&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_version.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_version.h Thu Aug 30 00:45:42 
2007
@@ -26,14 +26,14 @@
 /** START OF AREA TO MODIFY BEFORE RELEASING */
 #define JK_VERMAJOR 1
 #define JK_VERMINOR 2
-#define JK_VERFIX   25
-#define JK_VERSTRING"1.2.25"
+#define JK_VERFIX   26
+#define JK_VERSTRING"1.2.26"
 
 /* Beta number */
 #define JK_VERBETA  0
 #define JK_BETASTRING   "0"
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 1
+#define JK_VERISRELEASE 0
 #define JK_VERRC0
 #define JK_RCSTRING "0"
 

Modified: tomcat/connectors/trunk/jk/native/common/portable.h.sample
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/portable.h.sample?rev=571063&r1=571062&r2=571063&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/portable.h.sample (original)
+++ tomcat/connectors/trunk/jk/native/common/portable.h.sample Thu Aug 30 
00:45:42 2007
@@ -96,4 +96,4 @@
 #define USE_SO_SNDTIMEO 1
 
 /* Version number of package */
-#define VERSION "1.2.25"
+#define VERSION "1.2.26"

Modified: tomcat/connectors/trunk/jk/native/configure.in
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?rev=571063&r1=571062&r2=571063&view=diff
==
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Thu Aug 30 00:45:42 2007
@@ -11,7 +11,7 @@
 
 dnl package and version. (synchronization with common/jk_version.h ?)
 PACKAGE=mod_jk
-VERSION=1.2.25
+VERSION=1.2.26
 
 AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
 

Modified: 
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism?rev=571063&r1=571062&r2=571063&view=diff
==
--- 
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism 
(original)
+++ 
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism 
Thu Aug 30 00:45:42 2007
@@ -3409,7 +3409,7 @@
ProductIDnone
ProductLanguage1033
ProductNameTomcat Isapi 
Redirector
-   ProductVersion1.2.25
+   ProductVersion1.2.26
ProgressType0install
ProgressType1Installing
ProgressType2installed

Modified: tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc?rev=571063&r1=571062&r2=571063&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc (original)
+++ tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc Thu Aug 30 00:45:42 
2007
@@ -14,13 +14,13 @@
 "specific language governing permissions and " \
 "limitations under the License."
 
-#define JK_VERSION_STR  "1.2.25"
+#define JK_VERSION_STR  "1.2.26"
 #define JK_DLL_BASENAME "isapi_redirect-" JK_VERSION_STR
 
 
 1 VERSIONINFO
- FILEVERSION 1,2,25,0
- PRODUCTVERSION 1,2,25,0
+ FILEVERSION 1,2,26,0
+ PRODUCTVERSION 1,2,26,0
  F

svn commit: r571064 - in /tomcat/connectors/trunk/jk: BUILD.txt native/README.txt native/netscape/README

[rjung]

Author: rjung
Date: Thu Aug 30 00:47:00 2007
New Revision: 571064

URL: http://svn.apache.org/viewvc?rev=571064&view=rev
Log:
Fix file name BUILDING -> BUILDING.txt in other
readme files.

Modified:
tomcat/connectors/trunk/jk/BUILD.txt
tomcat/connectors/trunk/jk/native/README.txt
tomcat/connectors/trunk/jk/native/netscape/README

Modified: tomcat/connectors/trunk/jk/BUILD.txt
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/BUILD.txt?rev=571064&r1=571063&r2=571064&view=diff
==
--- tomcat/connectors/trunk/jk/BUILD.txt (original)
+++ tomcat/connectors/trunk/jk/BUILD.txt Thu Aug 30 00:47:00 2007
@@ -3,7 +3,7 @@
 side of the connector is available with the normal Tomcat distribution.
 
 Documentation for how to build mod_jk 1.2 from source and configure
-it for your webserver is located in the native/BUILDING file in this
+it for your webserver is located in the native/BUILDING.txt file in this
 source distribution.
 
 For the impatient Apache admins:

Modified: tomcat/connectors/trunk/jk/native/README.txt
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/README.txt?rev=571064&r1=571063&r2=571064&view=diff
==
--- tomcat/connectors/trunk/jk/native/README.txt (original)
+++ tomcat/connectors/trunk/jk/native/README.txt Thu Aug 30 00:47:00 2007
@@ -27,4 +27,4 @@
 * Direct access to Tomcat 3.2/3.3/4.0/4.1 servlet engine via ajp13
   protocol. 
 
-* OK, then how do I build web-connector ? Just take a look at BUILDING
+* OK, then how do I build web-connector ? Just take a look at BUILDING.txt

Modified: tomcat/connectors/trunk/jk/native/netscape/README
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/README?rev=571064&r1=571063&r2=571064&view=diff
==
--- tomcat/connectors/trunk/jk/native/netscape/README (original)
+++ tomcat/connectors/trunk/jk/native/netscape/README Thu Aug 30 00:47:00 2007
@@ -7,7 +7,7 @@
 
 On Unix system, a Makefile.solaris and Makefile.linux are provided
 and should be adapted to tailor to your own configuration.
-Be sure to read the BUILDING file, one directory up.
+Be sure to read the BUILDING.txt file, one directory up.
 
 
 REQUIREMENT for Windows build



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

Re: svn commit: r571006 - /tomcat/connectors/trunk/ajp/

[Mark Thomas]

Mladen Turk wrote:
> [EMAIL PROTECTED] wrote:
>> Author: markt
>> Date: Wed Aug 29 18:14:11 2007
>> New Revision: 571006
>>
>> URL: http://svn.apache.org/viewvc?rev=571006&view=rev
>> Log:
>> Remove source for mod_proxy_ajp that moved to httpd some time ago.
>>
> 
> Why the hell did you do that?

Because it hadn't been touched for years, looked like a copy of what
moved to httpd and reverting the delete is trivial with no negative
impacts (history etc is retained).

> You could copy it to some sandbox or something, since there is
> lots of usable code in there like console mode httpd API client
> for testing modules, etc.

Connectors is where these sorts of tools have lived historically so
unless we want to start a wholesale re-organisation leaving it in
connectors is fine with me.

Are there useful things in both ajp/proxy and ajp/ajplib or just one
of them? It still makes sense to me to remove the stuff that moved to
httpd unless it is entwined with the useful stuff.

> In any case you should ask the community before doing something
> like that. Please revert.

Will do.

Mark

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

svn commit: r571126 - /tomcat/connectors/trunk/ajp/

[markt]

Author: markt
Date: Thu Aug 30 05:09:55 2007
New Revision: 571126

URL: http://svn.apache.org/viewvc?rev=571126&view=rev
Log:
Revert removal of ajp directory

Added:
tomcat/connectors/trunk/ajp/
  - copied from r571005, tomcat/connectors/trunk/ajp/


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

Re: svn commit: r571006 - /tomcat/connectors/trunk/ajp/

[Mark Thomas]

William A. Rowe, Jr. wrote:
> Mladen Turk wrote:
>> Right. Deleting entire trees from SVN should at least be
>> preceded by some note of intention.
> 
> +1.  A heads up is always a good idea ;-)

Noted. Sorry for the hassle. Will do in future.

Mark


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

svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Thu Aug 30 07:10:35 2007
New Revision: 571175

URL: http://svn.apache.org/viewvc?rev=571175&view=rev
Log:
Match header names exactly against pre defined constants. Avoid
possible confusion with custom header names using a standard header name
as a prefix.
Ported from a patch against mod_proxy_ajp proposed by Martin Kraemer.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=571175&r1=571174&r2=571175&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Thu Aug 30 
07:10:35 2007
@@ -246,7 +246,7 @@
 const char *p = header_name;
 int i = 0;
 
-/* ACCEPT-LANGUAGE is the longest headeer
+/* ACCEPT-LANGUAGE is the longest header
  * that is of interest.
  */
 if (len < 4 || len > 15)
@@ -267,11 +267,11 @@
 return SC_ACCEPT;
 else if (header[6] == '-') {
 p += 6;
-if (memcmp(p, "CHARSET", 7) == 0)
+if (strcmp(p, "CHARSET") == 0)
 return SC_ACCEPT_CHARSET;
-else if (memcmp(p,  "ENCODING", 8) == 0)
+else if (strcmp(p,  "ENCODING") == 0)
 return SC_ACCEPT_ENCODING;
-else if (memcmp(p, "LANGUAGE", 8) == 0)
+else if (strcmp(p, "LANGUAGE") == 0)
 return SC_ACCEPT_LANGUAGE;
 else
 return UNKNOWN_METHOD;
@@ -279,45 +279,45 @@
 else
 return UNKNOWN_METHOD;
 }
-else if (memcmp(p, "UTHORIZATION", 12) == 0)
+else if (strcmp(p, "UTHORIZATION") == 0)
 return SC_AUTHORIZATION;
 else
 return UNKNOWN_METHOD;
 break;
 case 'C':
-if(memcmp(p, "OOKIE2", 6) == 0)
+if(strcmp(p, "OOKIE2") == 0)
 return SC_COOKIE2;
-else if (memcmp(p, "OOKIE", 5) == 0)
+else if (strcmp(p, "OOKIE") == 0)
 return SC_COOKIE;
-else if(memcmp(p, "ONNECTION", 9) == 0)
+else if(strcmp(p, "ONNECTION") == 0)
 return SC_CONNECTION;
-else if(memcmp(p, "ONTENT-TYPE", 11) == 0)
+else if(strcmp(p, "ONTENT-TYPE") == 0)
 return SC_CONTENT_TYPE;
-else if(memcmp(p, "ONTENT-LENGTH", 13) == 0)
+else if(strcmp(p, "ONTENT-LENGTH") == 0)
 return SC_CONTENT_LENGTH;
 else
 return UNKNOWN_METHOD;
 break;
 case 'H':
-if(memcmp(p, "OST", 3) == 0)
+if(strcmp(p, "OST") == 0)
 return SC_HOST;
 else
 return UNKNOWN_METHOD;
 break;
 case 'P':
-if(memcmp(p, "RAGMA", 5) == 0)
+if(strcmp(p, "RAGMA") == 0)
 return SC_PRAGMA;
 else
 return UNKNOWN_METHOD;
 break;
 case 'R':
-if(memcmp(p, "EFERER", 6) == 0)
+if(strcmp(p, "EFERER") == 0)
 return SC_REFERER;
 else
 return UNKNOWN_METHOD;
 break;
 case 'U':
-if(memcmp(p, "SER-AGENT", 9) == 0)
+if(strcmp(p, "SER-AGENT") == 0)
 return SC_USER_AGENT;
 else
 return UNKNOWN_METHOD;

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=571175&r1=571174&r2=571175&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Thu Aug 30 
07:10:35 2007
@@ -27,6 +27,11 @@
   
   
 
+  
+AJP13: Match header names exactly against pre defined constants. Avoid
+possible confusion with custom header names using a standard header 
name
+as a prefix. (rjung)
+  
 
   
 



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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Mladen Turk]

[EMAIL PROTECTED] wrote:

Match header names exactly against pre defined constants.
 p += 6;
-if (memcmp(p, "CHARSET", 7) == 0)
+if (strcmp(p, "CHARSET") == 0)


Someone would say that this is over engineering :)
memcmp *is always* faster then strcmp

I don't get it, what's the point?

Regards,
Mladen

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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Mladen Turk]

Mladen Turk wrote:

[EMAIL PROTECTED] wrote:

Match header names exactly against pre defined constants.
 p += 6;
-if (memcmp(p, "CHARSET", 7) == 0)
+if (strcmp(p, "CHARSET") == 0)


Someone would say that this is over engineering :)
memcmp *is always* faster then strcmp

I don't get it, what's the point?


Oops. It makes sense for things like HTTP_CHARSET_FOO
I should think twice before sending reply :)

Regards,
Mladen.

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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Rainer Jung]

No problem, better safe than sorry.

In fact there are a couple of memcmp in the same file (decoding http 
method), that are OK, because we already know that the string length is 
OK. For the headers the parsing strategy is slightly different and there 
is now prevention for matching longer custom headers with a standard 
header name as a string prefix.


I'll write to Henri about AS400 compatibility (replacing memcmp by 
strcmp interference with EBCDIC).


Regards,

Rainer

Mladen Turk wrote:

Mladen Turk wrote:

[EMAIL PROTECTED] wrote:

Match header names exactly against pre defined constants.
 p += 6;
-if (memcmp(p, "CHARSET", 7) == 0)
+if (strcmp(p, "CHARSET") == 0)


Someone would say that this is over engineering :)
memcmp *is always* faster then strcmp

I don't get it, what's the point?


Oops. It makes sense for things like HTTP_CHARSET_FOO
I should think twice before sending reply :)

Regards,
Mladen.


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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Mladen Turk]

Rainer Jung wrote:

No problem, better safe than sorry.



Right. It seems I always forget the ingenuity of the users
that wish to extent the http spec :)

However, I think that we can still use the memcmp
with "xxx\0". That would still be faster then figuring out the EOL with strcmp?

Regards,
Mladen

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

Tomcat 6 fails to start on Terminal Server

[jhayden]

Have installed Tomcat onto MS Terminal Server.
However when attempting to start Tomcat it fails.
Have tried version 5.5 and 6.0 and both give the same failure.
Here are the logs below -

[2007-08-30 15:34:10] [info] Running Service...
[2007-08-30 15:34:10] [info] Starting service...
[2007-08-30 15:34:10] [174  javajni.c] [error] The specified module could
not be found.
[2007-08-30 15:34:10] [947  prunsrv.c] [error] Failed creating java
C:\Program Files\Java\jre1.6.0_02\bin\client\jvm.dll
[2007-08-30 15:34:10] [1202 prunsrv.c] [error] ServiceStart returned 1
[2007-08-30 15:34:10] [info] Run service finished.
[2007-08-30 15:34:10] [info] Procrun finished.
[2007-08-30 15:34:26] [info] Running Service...
[2007-08-30 15:34:26] [info] Starting service...
[2007-08-30 15:34:26] [174  javajni.c] [error] The specified module could
not be found.
[2007-08-30 15:34:26] [947  prunsrv.c] [error] Failed creating java
C:\Program Files\Java\jre1.6.0_02\bin\client\jvm.dll
[2007-08-30 15:34:26] [1202 prunsrv.c] [error] ServiceStart returned 1
[2007-08-30 15:34:26] [info] Run service finished.
[2007-08-30 15:34:26] [info] Procrun finished.

-- 
View this message in context: 
http://www.nabble.com/Tomcat-6-fails-to-start-on-Terminal-Server-tf4354782.html#a12408955
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


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

re: TC6 source file licensing - last few files

[Jeanfrancois Arcand]

Hi Mark,

sorry for the delay...vacation time :-)


Subject: TC6 source file licensing - last few files
Date: Sun, 05 Aug 2007 00:25:50 -0400
From: Mark Thomas <[EMAIL PROTECTED]>
Reply-To: Tomcat Developers List 
To: Tomcat Developers List 

All,

Sorry about the deluge of commit mails this evening. The bulk of the
TC6 source now passes the checks in the insert_licence.pl script.

There are, however, a few remaining files that require further
checking. These are ones that are currently dual or non-AL2 licensed.
They are:

1.
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet/package.html
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet/http/package.html
These originated with this commit:
http://svn.apache.org/viewvc?view=rev&revision=267116

Jean-Francois - if these were committed with Sun's knowledge and
consent then they fall under your CLA and should be AL2 licensed. If
not, we need to remove them and write our own - shouldn't be too
difficult.


Agree they fall under the AL2 license. The Sun license can be removed 
(I've try but it seems my commits privilege are gone...)


Thanks

-- Jeanfrancois



2.
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
These originated with this commit:
http://svn.apache.org/viewvc?view=rev&revision=481296

Remy - was the source of these such that the Sun license notice can be
removed? If not, we can use the CDDL ones and add the necessary
entries in NOTICE file.

Finally, if anyone knows of / spots any other TC6 files that appear to
have license issues, now would be a good time to speak up.

Next stop, 5.5.x ...

Cheers,

Mark




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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Rainer Jung]

Mladen Turk wrote:

Rainer Jung wrote:

No problem, better safe than sorry.



Right. It seems I always forget the ingenuity of the users
that wish to extent the http spec :)

However, I think that we can still use the memcmp
with "xxx\0". That would still be faster then figuring out the EOL with 
strcmp?


If we knew, that the variable header name we compare, is at least of the 
same size, than the constant string, we could keep memcmp and simply 
increase the number of bytes to compare by 1, because the variable 
header and the string constant are already both 0-terminated.


But the header could be shorter than the constant string. So there was a 
second problem with the old code, we eventually compared potentially 
uninitialized memory to string constants. Strictly speaking the result 
was not defined.


Of course now we could use the string length of the header in the same 
more advanced way, as we do for parsing the method names, but I thought 
the actual outcome would be much more difficult code for most likely 
only little performance improvement.



Regards,
Mladen


Regards,

Rainer

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

Default to index.html over index.jsp in ROOT

[jhayden]

After changing port to 80 attmpting to use Tomcat as a HTTP server as well as
a container.
When entering http:\\localhost I am getting the standard Tomcat display.
However its being drawn from the index.jsp rather than the index.html due
the message on the page detailing 
"$CATALINA_HOME/webapps/ROOT/index.jsp"

What I have attempted to do is place my own static html files in the
C:\Program Files\Apache Software Foundation\Tomcat 6.0\webapps\ROOT
directory.
Basically expecting my index.html to be displayed. However it only attempts
to display the index.jsp page.

I have tried commenting out the - index.jsp 
from the web.xml but this does not make any difference.
I want to use the ROOT directory and force the index.html to be used.
Can anyone help me please?



-- 
View this message in context: 
http://www.nabble.com/Default-to-index.html-over-index.jsp-in-ROOT-tf4354841.html#a12409154
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Mladen Turk]

Rainer Jung wrote:


But the header could be shorter than the constant string. So there was a 
second problem with the old code, we eventually compared potentially 
uninitialized memory to string constants. Strictly speaking the result 
was not defined.




Sorry, but you get that wrong. At the beginning we have

size_t len = strlen(header_name);

So, we know in advance what the length is.
The double check with strcmp is overhead.

Regards,
Mladen

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

svn commit: r571202 - in /tomcat/container/tc5.5.x: modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java webapps/docs/changelog.xml

[pero]

Author: pero
Date: Thu Aug 30 08:14:48 2007
New Revision: 571202

URL: http://svn.apache.org/viewvc?rev=571202&view=rev
Log:
DeltaManager sessionCounter must be also increment at relicated sessions.

Modified:

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=571202&r1=571201&r2=571202&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
 Thu Aug 30 08:14:48 2007
@@ -1655,6 +1655,7 @@
 "deltaManager.receiveMessage.createNewSession",
 getName(), msg.getSessionID()));
 DeltaSession session = (DeltaSession) createEmptySession();
+sessionCounter++;
 session.setManager(this);
 session.setValid(true);
 session.setPrimarySession(false);

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=571202&r1=571201&r2=571202&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Aug 30 08:14:48 2007
@@ -39,6 +39,13 @@
   
 
   
+  
+
+  
+DeltaManager sessionCounter must be also increment at relicated 
sessions. (pero)
+  
+
+  
 
  
 



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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Rainer Jung]

Mladen Turk wrote:

Rainer Jung wrote:


But the header could be shorter than the constant string. So there was 
a second problem with the old code, we eventually compared potentially 
uninitialized memory to string constants. Strictly speaking the result 
was not defined.




Sorry, but you get that wrong. At the beginning we have

size_t len = strlen(header_name);


Yes Mladen, I know. But we never really use len :) I know, that we can 
do it with memcmp, but then you, me or someone else has to add a couple 
of if(len>=...) before each memcmp(). Go ahead if you like to.


What I'm still convinced is, that the code before the patch was not 
formally correct. I'm not saying, that strcmp is the best possible patch 
with respect to performance. Concerning code structure I didn't try it 
with adding all the ifs concerning len, so I can't yet judge.



So, we know in advance what the length is.
The double check with strcmp is overhead.


There is no double check, because before we actually doidn't check. 
That's what I tried to explain: we do check when decoding HTTP method, 
we do not check, when decoding header names. The patch concerns the 
header names part.



Regards,
Mladen


Regards,

Rainer

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

svn commit: r571204 - in /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp: DataSender.java LocalStrings.properties mbeans-descriptors.xml

[pero]

Author: pero
Date: Thu Aug 30 08:25:46 2007
New Revision: 571204

URL: http://svn.apache.org/viewvc?rev=571204&view=rev
Log:
Made attribute createTime accessible for all DataSenders.

Modified:

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java?rev=571204&r1=571203&r2=571204&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
 Thu Aug 30 08:25:46 2007
@@ -24,6 +24,7 @@
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.SocketException;
+import java.util.Date;
 
 import org.apache.catalina.cluster.ClusterMessage;
 import org.apache.catalina.cluster.io.XByteBuffer;
@@ -104,6 +105,11 @@
 private int soTrafficClass = 0x04 | 0x08 | 0x010;
  
 /**
+ * createTime
+ */
+protected long createTime ;
+
+/**
  * number of requests
  */
 protected long nrOfRequests = 0;
@@ -229,8 +235,9 @@
 this.address = host;
 this.port = port;
 this.domain = domain;
+this.createTime = System.currentTimeMillis() ;
 if (log.isDebugEnabled())
-log.debug(sm.getString("IDataSender.create",address, new 
Integer(port)));
+log.debug(sm.getString("IDataSender.create",address, new 
Integer(port), new Date(createTime)));
 }
 
 public DataSender(String domain,InetAddress host, int port, SenderState 
state) {
@@ -248,6 +255,13 @@
 
 return (info);
 
+}
+
+/**
+ * @return the createTime
+ */
+public long getCreateTime() {
+return createTime;
 }
 
 /**

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties?rev=571204&r1=571203&r2=571204&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties
 Thu Aug 30 08:25:46 2007
@@ -30,7 +30,7 @@
 IDataSender.ack.wrong=Missing correct ACK after 10 bytes read at local port 
[{0}:{1,number,integer}]
 IDataSender.closeSocket=Sender close socket to [{0}:{1,number,integer}] (close 
count {2,number,integer})
 IDataSender.connect=Sender connect to [{0}:{1,number,integer}] (connect count 
{2,number,integer})
-IDataSender.create=Create sender [{0}:{1,number,integer}]
+IDataSender.create=Create sender [{0}:{1,number,integer}] at [{2,date}]
 IDataSender.disconnect=Sender disconnect from [{0}:{1,number,integer}] 
(disconnect count {2,number,integer})
 IDataSender.message.disconnect=Message transfered: Sender can't disconnect 
from [{0}:{1,number,integer}]
 IDataSender.message.create=Message transfered: Sender can't create current 
socket [{0}:{1,number,integer}]

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml?rev=571204&r1=571203&r2=571204&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
 Thu Aug 30 08:25:46 2007
@@ -625,6 +625,10 @@
   description="counts all successfully sended messages"
  type="long"
  writeable="false"/>
+

+

+

 
+

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Mladen Turk]

Rainer Jung wrote:


Yes Mladen, I know. But we never really use len :) I know, that we can 
do it with memcmp, but then you, me or someone else has to add a couple 
of if(len>=...) before each memcmp(). Go ahead if you like to.




Look, we have a local header[16] on which we copy toupper, and there is no
chance for overflow. Like said, we can test for "xxx\0" and that'll be fine.

Regards,
Mladen

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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Rainer Jung]

Mladen Turk wrote:

Rainer Jung wrote:


Yes Mladen, I know. But we never really use len :) I know, that we can 
do it with memcmp, but then you, me or someone else has to add a 
couple of if(len>=...) before each memcmp(). Go ahead if you like to.




Look, we have a local header[16] on which we copy toupper, and there is no
chance for overflow. Like said, we can test for "xxx\0" and that'll be 
fine.


Good, I didn't notice, that the header names are actually in a constant 
size array.



OK, but then why don't we simply add 1 to all sizes used in the memcmp? 
I think we don't need to add "\0" to the constant values, because the 
string constants are automatically null terminated. Am I correct?


So the realy patch would be simply:

@@ -260,18 +260,20 @@
 header[i] = '\0';
 p = &header[1];

+/* Always do memcmp including the final \0-termination character.
+ */
 switch (header[0]) {
 case 'A':
-if (memcmp(p, "CCEPT", 5) == 0) {
+if (memcmp(p, "CCEPT", 6) == 0) {
 if (!header[6])
 return SC_ACCEPT;
 else if (header[6] == '-') {
 p += 6;
-if (memcmp(p, "CHARSET", 7) == 0)
+if (memcmp(p, "CHARSET", 8) == 0)
 return SC_ACCEPT_CHARSET;
-else if (memcmp(p,  "ENCODING", 8) == 0)
+else if (memcmp(p,  "ENCODING", 9) == 0)
 return SC_ACCEPT_ENCODING;
-else if (memcmp(p, "LANGUAGE", 8) == 0)
+else if (memcmp(p, "LANGUAGE", 9) == 0)
 return SC_ACCEPT_LANGUAGE;
 else
 return UNKNOWN_METHOD;
...

OK?

Regards,

Rainer

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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Mladen Turk]

Rainer Jung wrote:


+/* Always do memcmp including the final \0-termination character.
+ */
 switch (header[0]) {
 case 'A':
-if (memcmp(p, "CCEPT", 5) == 0) {
+if (memcmp(p, "CCEPT", 6) == 0) {


Right, but like said this should be a
>if (memcmp(p, "CCEPT\0", 6) == 0) {

memcmp compares bytes.

Regards,
Mladen

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

Re: Tomcat 6 fails to start on Terminal Server

[Pid]

Try submitting this question to the Tomcat Users list.

This list is for the developers of the server itself.

p



jhayden wrote:

Have installed Tomcat onto MS Terminal Server.
However when attempting to start Tomcat it fails.
Have tried version 5.5 and 6.0 and both give the same failure.
Here are the logs below -

[2007-08-30 15:34:10] [info] Running Service...
[2007-08-30 15:34:10] [info] Starting service...
[2007-08-30 15:34:10] [174  javajni.c] [error] The specified module could
not be found.
[2007-08-30 15:34:10] [947  prunsrv.c] [error] Failed creating java
C:\Program Files\Java\jre1.6.0_02\bin\client\jvm.dll
[2007-08-30 15:34:10] [1202 prunsrv.c] [error] ServiceStart returned 1
[2007-08-30 15:34:10] [info] Run service finished.
[2007-08-30 15:34:10] [info] Procrun finished.
[2007-08-30 15:34:26] [info] Running Service...
[2007-08-30 15:34:26] [info] Starting service...
[2007-08-30 15:34:26] [174  javajni.c] [error] The specified module could
not be found.
[2007-08-30 15:34:26] [947  prunsrv.c] [error] Failed creating java
C:\Program Files\Java\jre1.6.0_02\bin\client\jvm.dll
[2007-08-30 15:34:26] [1202 prunsrv.c] [error] ServiceStart returned 1
[2007-08-30 15:34:26] [info] Run service finished.
[2007-08-30 15:34:26] [info] Procrun finished.






smime.p7s
Description: S/MIME Cryptographic Signature

Re: Default to index.html over index.jsp in ROOT

[Pid]

Try submitting this question to the Tomcat Users list.

This list is for the developers of the server itself.

p


jhayden wrote:

After changing port to 80 attmpting to use Tomcat as a HTTP server as well as
a container.
When entering http:\\localhost I am getting the standard Tomcat display.
However its being drawn from the index.jsp rather than the index.html due
the message on the page detailing 
"$CATALINA_HOME/webapps/ROOT/index.jsp"


What I have attempted to do is place my own static html files in the
C:\Program Files\Apache Software Foundation\Tomcat 6.0\webapps\ROOT
directory.
Basically expecting my index.html to be displayed. However it only attempts
to display the index.jsp page.

I have tried commenting out the - index.jsp 
from the web.xml but this does not make any difference.

I want to use the ROOT directory and force the index.html to be used.
Can anyone help me please?







smime.p7s
Description: S/MIME Cryptographic Signature

svn commit: r571222 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

[rjung]

Author: rjung
Date: Thu Aug 30 09:04:19 2007
New Revision: 571222

URL: http://svn.apache.org/viewvc?rev=571222&view=rev
Log:
Rollback patch in r571175.
A slightly better patch will be coming next.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=571222&r1=571221&r2=571222&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Thu Aug 30 
09:04:19 2007
@@ -246,7 +246,7 @@
 const char *p = header_name;
 int i = 0;
 
-/* ACCEPT-LANGUAGE is the longest header
+/* ACCEPT-LANGUAGE is the longest headeer
  * that is of interest.
  */
 if (len < 4 || len > 15)
@@ -267,11 +267,11 @@
 return SC_ACCEPT;
 else if (header[6] == '-') {
 p += 6;
-if (strcmp(p, "CHARSET") == 0)
+if (memcmp(p, "CHARSET", 7) == 0)
 return SC_ACCEPT_CHARSET;
-else if (strcmp(p,  "ENCODING") == 0)
+else if (memcmp(p,  "ENCODING", 8) == 0)
 return SC_ACCEPT_ENCODING;
-else if (strcmp(p, "LANGUAGE") == 0)
+else if (memcmp(p, "LANGUAGE", 8) == 0)
 return SC_ACCEPT_LANGUAGE;
 else
 return UNKNOWN_METHOD;
@@ -279,45 +279,45 @@
 else
 return UNKNOWN_METHOD;
 }
-else if (strcmp(p, "UTHORIZATION") == 0)
+else if (memcmp(p, "UTHORIZATION", 12) == 0)
 return SC_AUTHORIZATION;
 else
 return UNKNOWN_METHOD;
 break;
 case 'C':
-if(strcmp(p, "OOKIE2") == 0)
+if(memcmp(p, "OOKIE2", 6) == 0)
 return SC_COOKIE2;
-else if (strcmp(p, "OOKIE") == 0)
+else if (memcmp(p, "OOKIE", 5) == 0)
 return SC_COOKIE;
-else if(strcmp(p, "ONNECTION") == 0)
+else if(memcmp(p, "ONNECTION", 9) == 0)
 return SC_CONNECTION;
-else if(strcmp(p, "ONTENT-TYPE") == 0)
+else if(memcmp(p, "ONTENT-TYPE", 11) == 0)
 return SC_CONTENT_TYPE;
-else if(strcmp(p, "ONTENT-LENGTH") == 0)
+else if(memcmp(p, "ONTENT-LENGTH", 13) == 0)
 return SC_CONTENT_LENGTH;
 else
 return UNKNOWN_METHOD;
 break;
 case 'H':
-if(strcmp(p, "OST") == 0)
+if(memcmp(p, "OST", 3) == 0)
 return SC_HOST;
 else
 return UNKNOWN_METHOD;
 break;
 case 'P':
-if(strcmp(p, "RAGMA") == 0)
+if(memcmp(p, "RAGMA", 5) == 0)
 return SC_PRAGMA;
 else
 return UNKNOWN_METHOD;
 break;
 case 'R':
-if(strcmp(p, "EFERER") == 0)
+if(memcmp(p, "EFERER", 6) == 0)
 return SC_REFERER;
 else
 return UNKNOWN_METHOD;
 break;
 case 'U':
-if(strcmp(p, "SER-AGENT") == 0)
+if(memcmp(p, "SER-AGENT", 9) == 0)
 return SC_USER_AGENT;
 else
 return UNKNOWN_METHOD;



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

svn commit: r571226 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

[rjung]

Author: rjung
Date: Thu Aug 30 09:15:39 2007
New Revision: 571226

URL: http://svn.apache.org/viewvc?rev=571226&view=rev
Log:
Redo the patch from r571175 (exact comparison of header names).
Keep using memcmp, but add \0-termination byte to comparison.
This works, because we know the header variable array is long enough
and already \0-terminated.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=571226&r1=571225&r2=571226&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Thu Aug 30 
09:15:39 2007
@@ -246,7 +246,7 @@
 const char *p = header_name;
 int i = 0;
 
-/* ACCEPT-LANGUAGE is the longest headeer
+/* ACCEPT-LANGUAGE is the longest header
  * that is of interest.
  */
 if (len < 4 || len > 15)
@@ -260,18 +260,20 @@
 header[i] = '\0';
 p = &header[1];
 
+/* Always do memcmp including the final \0-termination character.
+ */ 
 switch (header[0]) {
 case 'A':
-if (memcmp(p, "CCEPT", 5) == 0) {
+if (memcmp(p, "CCEPT", 6) == 0) {
 if (!header[6])
 return SC_ACCEPT;
 else if (header[6] == '-') {
 p += 6;
-if (memcmp(p, "CHARSET", 7) == 0)
+if (memcmp(p, "CHARSET", 8) == 0)
 return SC_ACCEPT_CHARSET;
-else if (memcmp(p,  "ENCODING", 8) == 0)
+else if (memcmp(p,  "ENCODING", 9) == 0)
 return SC_ACCEPT_ENCODING;
-else if (memcmp(p, "LANGUAGE", 8) == 0)
+else if (memcmp(p, "LANGUAGE", 9) == 0)
 return SC_ACCEPT_LANGUAGE;
 else
 return UNKNOWN_METHOD;
@@ -279,45 +281,45 @@
 else
 return UNKNOWN_METHOD;
 }
-else if (memcmp(p, "UTHORIZATION", 12) == 0)
+else if (memcmp(p, "UTHORIZATION", 13) == 0)
 return SC_AUTHORIZATION;
 else
 return UNKNOWN_METHOD;
 break;
 case 'C':
-if(memcmp(p, "OOKIE2", 6) == 0)
+if(memcmp(p, "OOKIE2", 7) == 0)
 return SC_COOKIE2;
-else if (memcmp(p, "OOKIE", 5) == 0)
+else if (memcmp(p, "OOKIE", 6) == 0)
 return SC_COOKIE;
-else if(memcmp(p, "ONNECTION", 9) == 0)
+else if(memcmp(p, "ONNECTION", 10) == 0)
 return SC_CONNECTION;
-else if(memcmp(p, "ONTENT-TYPE", 11) == 0)
+else if(memcmp(p, "ONTENT-TYPE", 12) == 0)
 return SC_CONTENT_TYPE;
-else if(memcmp(p, "ONTENT-LENGTH", 13) == 0)
+else if(memcmp(p, "ONTENT-LENGTH", 14) == 0)
 return SC_CONTENT_LENGTH;
 else
 return UNKNOWN_METHOD;
 break;
 case 'H':
-if(memcmp(p, "OST", 3) == 0)
+if(memcmp(p, "OST", 4) == 0)
 return SC_HOST;
 else
 return UNKNOWN_METHOD;
 break;
 case 'P':
-if(memcmp(p, "RAGMA", 5) == 0)
+if(memcmp(p, "RAGMA", 6) == 0)
 return SC_PRAGMA;
 else
 return UNKNOWN_METHOD;
 break;
 case 'R':
-if(memcmp(p, "EFERER", 6) == 0)
+if(memcmp(p, "EFERER", 7) == 0)
 return SC_REFERER;
 else
 return UNKNOWN_METHOD;
 break;
 case 'U':
-if(memcmp(p, "SER-AGENT", 9) == 0)
+if(memcmp(p, "SER-AGENT", 10) == 0)
 return SC_USER_AGENT;
 else
 return UNKNOWN_METHOD;



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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Jim Jagielski]

On Aug 30, 2007, at 11:45 AM, Mladen Turk wrote:


Rainer Jung wrote:
+/* Always do memcmp including the final \0-termination  
character.

+ */
 switch (header[0]) {
 case 'A':
-if (memcmp(p, "CCEPT", 5) == 0) {
+if (memcmp(p, "CCEPT", 6) == 0) {


Right, but like said this should be a
>if (memcmp(p, "CCEPT\0", 6) == 0) {

memcmp compares bytes.



"CCEPT" contains 6 bytes. It's len is 5, but it contains
6 bytes.


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

Re: svn commit: r571175 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

[Rainer Jung]

Jim Jagielski wrote:


On Aug 30, 2007, at 11:45 AM, Mladen Turk wrote:


Rainer Jung wrote:

+/* Always do memcmp including the final \0-termination character.
+ */
 switch (header[0]) {
 case 'A':
-if (memcmp(p, "CCEPT", 5) == 0) {
+if (memcmp(p, "CCEPT", 6) == 0) {


Right, but like said this should be a
>if (memcmp(p, "CCEPT\0", 6) == 0) {

memcmp compares bytes.



"CCEPT" contains 6 bytes. It's len is 5, but it contains
6 bytes.


We finally also agreed on that and I did the corresponding simple patch. 
See also my seperate mail to httpd-dev.


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

svn commit: r571276 - in /tomcat/trunk: java/org/apache/catalina/session/StandardManager.java java/org/apache/catalina/startup/NamingRuleSet.java webapps/docs/config/cluster-manager.xml webapps/docs/c

[fhanik]

Author: fhanik
Date: Thu Aug 30 12:14:43 2007
New Revision: 571276

URL: http://svn.apache.org/viewvc?rev=571276&view=rev
Log:
forward port of bugfixes from 6.0

Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
tomcat/trunk/webapps/docs/config/cluster-manager.xml
tomcat/trunk/webapps/docs/config/cluster.xml

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=571276&r1=571275&r2=571276&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Thu Aug 
30 12:14:43 2007
@@ -395,7 +395,6 @@
 session.setManager(this);
 sessions.put(session.getIdInternal(), session);
 session.activate();
-session.endAccess();
 }
 } catch (ClassNotFoundException e) {
   log.error(sm.getString("standardManager.loading.cnfe", e), e);

Modified: tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java?rev=571276&r1=571275&r2=571276&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java Thu Aug 30 
12:14:43 2007
@@ -124,7 +124,7 @@
 
"org.apache.catalina.deploy.ContextResourceEnvRef"));
 
 digester.addObjectCreate(prefix + "ServiceRef",
-"org.apache.catalina.deploy.Contextservice");
+"org.apache.catalina.deploy.ContextService");
 digester.addRule(prefix + "ServiceRef", new SetAllPropertiesRule());
 digester.addRule(prefix + "ServiceRef",
 new SetNextNamingRule("addService",

Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=571276&r1=571275&r2=571276&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Thu Aug 30 12:14:43 
2007
@@ -87,7 +87,7 @@
 
  
The backup manager uses a replicated map, this map is sending and 
receiving messages.
-   You can setup the flag for how this map is sending messages, the 
default value is 8(asynchronous).
+   You can setup the flag for how this map is sending messages, the 
default value is 6(asynchronous).
  
  
The timeout in seconds for doing a state transfer of all sessions when 
a node is started up. 

Modified: tomcat/trunk/webapps/docs/config/cluster.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster.xml?rev=571276&r1=571275&r2=571276&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster.xml Thu Aug 30 12:14:43 2007
@@ -92,7 +92,7 @@
   
 
 
-  The Tribes channel send options, default is 11.
+  The Tribes channel send options, default is 8.
  This option is used to set the flag that all messages sent through 
the 
  SimpleTcpCluster uses. The flag decides how the messages are sent, 
and is a simple logical OR.
  



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

DO NOT REPLY [Bug 43228] - StandardWrapper#countAllocated isn't thread-safe

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





--- Additional Comments From [EMAIL PROTECTED]  2007-08-30 16:17 ---
Yes, HelloWorldExample does a number of expensive operations.

OTOH, the shutdown strategy is not optimal at all, and has a lot of ways to go
wrong. It should use the time where the connectors (or the webapp) were
shutdown, rather that an individual per servlet time.

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

Re: TC6 source file licensing - last few files

[Mark Thomas]

Jeanfrancois Arcand wrote:
> Hi Mark,
> 
> sorry for the delay...vacation time :-)

No problem.

>> 1.
>> http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet/package.html
>> http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet/http/package.html
>>
>> Jean-Francois - if these were committed with Sun's knowledge and
>> consent then they fall under your CLA and should be AL2 licensed. If
>> not, we need to remove them and write our own - shouldn't be too
>> difficult.
> 
> Agree they fall under the AL2 license. The Sun license can be removed

OK. I'll do this.

> (I've try but it seems my commits privilege are gone...)

Odd. I can't think of any reason why you shouldn't be able to.

Mark



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

svn commit: r571364 - in /tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet: http/package.html package.html

[markt]

Author: markt
Date: Thu Aug 30 21:06:12 2007
New Revision: 571364

URL: http://svn.apache.org/viewvc?rev=571364&view=rev
Log:
As per http://marc.info/?l=tomcat-dev&m=118848624422496&w=2, correct the 
license text for these files.

Modified:

tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/package.html

tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/package.html

Modified: 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/package.html?rev=571364&r1=571363&r2=571364&view=diff
==
--- 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/package.html
 (original)
+++ 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/package.html
 Thu Aug 30 21:06:12 2007
@@ -2,14 +2,21 @@
 
 
 
-
 
 
 

Modified: 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/package.html?rev=571364&r1=571363&r2=571364&view=diff
==
--- 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/package.html
 (original)
+++ 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/package.html
 Thu Aug 30 21:06:12 2007
@@ -1,15 +1,22 @@
 
 
-
 
-
+
 
 
 



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

svn commit: r571365 - in /tomcat/tc6.0.x/trunk/java/javax/servlet: http/package.html package.html

[markt]

Author: markt
Date: Thu Aug 30 21:08:41 2007
New Revision: 571365

URL: http://svn.apache.org/viewvc?rev=571365&view=rev
Log:
As per http://marc.info/?l=tomcat-dev&m=118848624422496&w=2, correct the 
license text for these files.

Modified:
tomcat/tc6.0.x/trunk/java/javax/servlet/http/package.html
tomcat/tc6.0.x/trunk/java/javax/servlet/package.html

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/http/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/http/package.html?rev=571365&r1=571364&r2=571365&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/http/package.html (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/http/package.html Thu Aug 30 
21:08:41 2007
@@ -2,14 +2,21 @@
 
 
 
-
 
 
 

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/package.html?rev=571365&r1=571364&r2=571365&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/package.html (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/package.html Thu Aug 30 21:08:41 
2007
@@ -1,15 +1,22 @@
 
 
-
 
-
+
 
 
 



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

Test cases/document for TC 6

[Santosh [ಸಂತೋಷ ]]

Hi,

We are porting the TC 6 on HP's NonStop servers (Currently TC 5.0 is
ported). For porting on our NonStop server, we modified the connector, juli
etc of TC according to the underlying layer of our server. Also we are
developing the admin webapp for TC 6(which is around 90%) complete. Now we
are in testing phase where we are testing whole product (TC 6 with our
changes). I want to know, is there any test cases or test documents
available for Tomcat 6.0.x (or any other TC release) which tests the TC.

Regards,
Santosh