svn commit: r704548 - in /tomcat/connectors/trunk/jk: native/common/jk_shm.c native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

2008-10-14 Thread rjung
Author: rjung
Date: Tue Oct 14 07:19:56 2008
New Revision: 704548

URL: http://svn.apache.org/viewvc?rev=704548&view=rev
Log:
Prevent IIS memory corruption due to multiple concurrent
initializations.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.c
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.c?rev=704548&r1=704547&r2=704548&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Tue Oct 14 07:19:56 2008
@@ -242,7 +242,7 @@
 if (jk_shmem.hdr->h.data.childs > 1) {
 if (JK_IS_DEBUG_LEVEL(l)) {
 jk_log(l, JK_LOG_DEBUG,
-   "Reseting the shared memory for child %d",
+   "Resetting the shared memory for child %d",
jk_shmem.hdr->h.data.childs);
 }
 }
@@ -562,7 +562,7 @@
 if (nchild > 1) {
 if (JK_IS_DEBUG_LEVEL(l)) {
 jk_log(l, JK_LOG_DEBUG,
-   "Reseting the shared memory for child %d",
+   "Resetting the shared memory for child %d",
nchild);
 }
 }

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=704548&r1=704547&r2=704548&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Tue Oct 14 07:19:56 
2008
@@ -474,6 +474,7 @@
 static char dll_file_path[MAX_PATH];
 static char ini_file_name[MAX_PATH];
 static int using_ini_file = JK_FALSE;
+static JK_CRIT_SEC init_cs;
 static int is_inited = JK_FALSE;
 static int is_mapread = JK_FALSE;
 
@@ -1405,6 +1406,7 @@
 
 BOOL WINAPI GetFilterVersion(PHTTP_FILTER_VERSION pVer)
 {
+int rc;
 BOOL rv = TRUE;
 ULONG http_filter_revision = HTTP_FILTER_REVISION;
 
@@ -1413,9 +1415,11 @@
 if (pVer->dwFilterVersion > http_filter_revision) {
 pVer->dwFilterVersion = http_filter_revision;
 }
+JK_ENTER_CS(&(init_cs), rc);
 if (!is_inited) {
 rv = initialize_extension();
 }
+JK_LEAVE_CS(&(init_cs), rc);
 pVer->dwFlags = SF_NOTIFY_ORDER_HIGH |
 SF_NOTIFY_SECURE_PORT |
 SF_NOTIFY_NONSECURE_PORT |
@@ -1752,11 +1756,11 @@
 return 0;
 }
 
-static int init_error = 0;
-
 DWORD WINAPI HttpFilterProc(PHTTP_FILTER_CONTEXT pfc,
 DWORD dwNotificationType, LPVOID pvNotification)
 {
+int rc;
+
 /* Initialise jk */
 if (is_inited && !is_mapread) {
 char serverName[MAX_SERVERNAME] = "";
@@ -1775,8 +1779,10 @@
 }
 }
 }
-if (init_jk(serverName))
+JK_ENTER_CS(&(init_cs), rc);
+if (!is_mapread && init_jk(serverName))
 is_mapread = JK_TRUE;
+JK_LEAVE_CS(&(init_cs), rc);
 }
 /* If we can't read the map we become dormant */
 if (!is_mapread)
@@ -2081,20 +2087,25 @@
 
 BOOL WINAPI GetExtensionVersion(HSE_VERSION_INFO * pVer)
 {
+int rc;
+
 pVer->dwExtensionVersion = MAKELONG(HSE_VERSION_MINOR, HSE_VERSION_MAJOR);
 
 StringCbCopy(pVer->lpszExtensionDesc, HSE_MAX_EXT_DLL_NAME_LEN, 
(VERSION_STRING));
 
 
+JK_ENTER_CS(&(init_cs), rc);
 if (!is_inited) {
 return initialize_extension();
 }
+JK_LEAVE_CS(&(init_cs), rc);
 
 return TRUE;
 }
 
 DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpEcb)
 {
+int rv;
 DWORD rc = HSE_STATUS_ERROR;
 
 lpEcb->dwHttpStatusCode = HTTP_STATUS_SERVER_ERROR;
@@ -2121,8 +2132,10 @@
 }
 }
 }
-if (init_jk(serverName))
+JK_ENTER_CS(&(init_cs), rv);
+if (!is_mapread && init_jk(serverName))
 is_mapread = JK_TRUE;
+JK_LEAVE_CS(&(init_cs), rv);
 }
 if (!is_mapread)
 is_inited = JK_FALSE;
@@ -2227,9 +2240,13 @@
 
 BOOL WINAPI TerminateFilter(DWORD dwFlags)
 {
+int rc;
+
 UNREFERENCED_PARAMETER(dwFlags);
 
+JK_ENTER_CS(&(init_cs), rc);
 if (is_inited) {
+jk_log(logger, JK_LOG_INFO, "%s stopping", (VERSION_STRING));
 is_inited = JK_FALSE;
 watchdog_interval = 0;
 if (watchdog_handle) {
@@ -2264,6 +2281,7 @@
 jk_close_file_logger(&logger);
 }
 }
+JK_LEAVE_CS(&(init_cs), rc);
 
 return TRUE;
 }
@@ -2273,6 +2291,7 @@
 ULONG ulReason

Re: JK 1.2.27-dev snapshot

2008-10-14 Thread Rainer Jung
Mladen Turk schrieb:
> I'd like to tag and release 1.2.27 pretty soon (this week)
> Here is the release snapshot for testing.
> 
> http://people.apache.org/~mturk/jk-1.2.27-dev/
> 
> The binaries provided are for win32 for tester
> convenience. Please test, and if nothing bad found
> I'll tag the 1.2.27 in cca. 36 hours.

I justed committed a critical fix. If multiple requests trigger
initialization of the isapi redirector in parallel, then memory
corruption can arise. This has been observed in real production.

The problem comes from the fact, thatt the initialization is not an
atomic operation, but we don't do any synchronization on the threads.

I just now added a critical section (already committed), which fixes the
problem and will not influence performance, once the initialization is done.

Concerning multi process iis instances (i.e. web gardens), it looks like
there's more work to do, but that should be part of a later release.

Since there are so many changes in 1.2.27 and some of them are quite
tricky, I would suggest to do a longer testing than only three days. I
plan to write to the users list tomorrow, giving also a list of the new
features to increase interest in testing.

I like the idea of thoroughly testing snapshots before tagging, because
although version numbers are cheap (in subversion), user confusion also
easily arises from "missing" (i.e. non-released) versions.

Regards,

Rainer

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



DO NOT REPLY [Bug 41538] Unable to run Tomcat as a Windows service under JDK 1.6

2008-10-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=41538


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]




--- Comment #33 from Mark Thomas <[EMAIL PROTECTED]>  2008-10-14 09:55:52 PST 
---
*** Bug 45999 has been marked as a duplicate of this bug. ***


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 45999] Tomcat 5.5.17 won't start service with Java 1.6_5+ installed

2008-10-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45999


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE




--- Comment #3 from Mark Thomas <[EMAIL PROTECTED]>  2008-10-14 09:55:52 PST ---


*** This bug has been marked as a duplicate of bug 41538 ***


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 45285] RESOURCES DECLARED IN PARENT CLASSES ARE NOT INJECTED

2008-10-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45285





--- Comment #6 from Florent BENOIT <[EMAIL PROTECTED]>  2008-10-14 09:56:40 PST 
---
Created an attachment (id=22728)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=22728)
postConstruct/preDestroy in super classes

Here is a patch that is fixing this issue for postConstruct/preDestroy methods
in super classes (private)


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



Re: JK 1.2.27-dev snapshot

2008-10-14 Thread Mladen Turk

Rainer Jung wrote:


I justed committed a critical fix. If multiple requests trigger
initialization of the isapi redirector in parallel, then memory
corruption can arise. This has been observed in real production.



OK. Cool.



I like the idea of thoroughly testing snapshots before tagging, because
although version numbers are cheap (in subversion), user confusion also
easily arises from "missing" (i.e. non-released) versions.



Sounds reasonable. I'll prepare the new snapshot with full set
of binaries by tomorrow. I have nothing to commit, so lets
push for testing.
Think we could put it inside tomcat.apache.org/dev/dist
instead some /~user/


Regards
--
^(TM)

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



Re: JK 1.2.27-dev snapshot

2008-10-14 Thread Mladen Turk

Rainer Jung wrote:

Mladen Turk schrieb:

Rainer Jung wrote:

I like the idea of thoroughly testing snapshots before tagging, because
although version numbers are cheap (in subversion), user confusion also
easily arises from "missing" (i.e. non-released) versions.


Sounds reasonable. I'll prepare the new snapshot with full set
of binaries by tomorrow. I have nothing to commit, so lets
push for testing.
Think we could put it inside tomcat.apache.org/dev/dist
instead some /~user/


That's OK as long as the file names indicate it's a snapshot. The
jkrelease.sh lets you do a release type tarball from trunk and it will
contain automatically the subversion revision in the tarball name.

If you are short on time, I can prepare the snapshot this evening, but
would prefer you to build the win binaries, because I don't have an old
MS compiler. If you want me to do the snapshot, send a short message,
otherwise I'll wait for you and work on something else.



I'll do the full SR.

Cheers
--
^(TM)

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



DO NOT REPLY [Bug 45999] Tomcat 5.5.17 won't start service with Java 1.6_5+ installed

2008-10-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45999





--- Comment #2 from Preston L. Bannister <[EMAIL PROTECTED]>  2008-10-14 
03:27:48 PST ---
Looks like this is a duplicate of Bug 41538. 

Upshot is Sun added a JVM dependency on msvcr71.dll, which is NOT guaranteed to
be in the PATH. Sun has a bug listed as "Closed, not a defect" for this general
issue (which is wrong in my opinion.)

http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6509291




-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 45285] RESOURCES DECLARED IN PARENT CLASSES ARE NOT INJECTED

2008-10-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45285





--- Comment #7 from Firstname Lastname <[EMAIL PROTECTED]>  2008-10-14 11:57:27 
PST ---
Thanks for the patch.  I don't have the compile environment, so will just close
verify the bug in the next build.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



svn commit: r704579 - in /tomcat/site/trunk: docs/security-4.html docs/security-5.html xdocs/security-4.xml xdocs/security-5.xml

2008-10-14 Thread markt
Author: markt
Date: Tue Oct 14 09:50:16 2008
New Revision: 704579

URL: http://svn.apache.org/viewvc?rev=704579&view=rev
Log:
Correct base class name (thanks to Kazu Nambo) and correct a typo.

Modified:
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/xdocs/security-4.xml
tomcat/site/trunk/xdocs/security-5.xml

Modified: tomcat/site/trunk/docs/security-4.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=704579&r1=704578&r2=704579&view=diff
==
--- tomcat/site/trunk/docs/security-4.html (original)
+++ tomcat/site/trunk/docs/security-4.html Tue Oct 14 09:50:16 2008
@@ -627,8 +627,8 @@
 https://issues.apache.org/bugzilla/show_bug.cgi?id=25835";>
 Bug 25835 can, in rare circumstances - this has only been reproduced
 using a debugger to force a particular processing sequence for two threads 
-
-allow a user from a non-premitted IP address to gain access to a context
-that is protected with a valve that extends RemoteFilterValve. This 
includes
+allow a user from a non-permitted IP address to gain access to a context
+that is protected with a valve that extends RequestFilterValve. This 
includes
 the standard RemoteAddrValve and RemoteHostValve implementations.
 
 Affects: 4.1.0-4.1.31

Modified: tomcat/site/trunk/docs/security-5.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=704579&r1=704578&r2=704579&view=diff
==
--- tomcat/site/trunk/docs/security-5.html (original)
+++ tomcat/site/trunk/docs/security-5.html Tue Oct 14 09:50:16 2008
@@ -919,8 +919,8 @@
 https://issues.apache.org/bugzilla/show_bug.cgi?id=25835";>
 Bug 25835 can, in rare circumstances - this has only been reproduced
 using a debugger to force a particular processing sequence for two threads 
-
-allow a user from a non-premitted IP address to gain access to a context
-that is protected with a valve that extends RemoteFilterValve. This 
includes
+allow a user from a non-permitted IP address to gain access to a context
+that is protected with a valve that extends RequestFilterValve. This 
includes
 the standard RemoteAddrValve and RemoteHostValve implementations.
 
 Affects: 5.5.0 (5.0.x unknown)

Modified: tomcat/site/trunk/xdocs/security-4.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-4.xml?rev=704579&r1=704578&r2=704579&view=diff
==
--- tomcat/site/trunk/xdocs/security-4.xml (original)
+++ tomcat/site/trunk/xdocs/security-4.xml Tue Oct 14 09:50:16 2008
@@ -303,8 +303,8 @@
 https://issues.apache.org/bugzilla/show_bug.cgi?id=25835";>
 Bug 25835 can, in rare circumstances - this has only been reproduced
 using a debugger to force a particular processing sequence for two threads 
-
-allow a user from a non-premitted IP address to gain access to a context
-that is protected with a valve that extends RemoteFilterValve. This 
includes
+allow a user from a non-permitted IP address to gain access to a context
+that is protected with a valve that extends RequestFilterValve. This 
includes
 the standard RemoteAddrValve and RemoteHostValve implementations.
 
 Affects: 4.1.0-4.1.31

Modified: tomcat/site/trunk/xdocs/security-5.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=704579&r1=704578&r2=704579&view=diff
==
--- tomcat/site/trunk/xdocs/security-5.xml (original)
+++ tomcat/site/trunk/xdocs/security-5.xml Tue Oct 14 09:50:16 2008
@@ -393,8 +393,8 @@
 https://issues.apache.org/bugzilla/show_bug.cgi?id=25835";>
 Bug 25835 can, in rare circumstances - this has only been reproduced
 using a debugger to force a particular processing sequence for two threads 
-
-allow a user from a non-premitted IP address to gain access to a context
-that is protected with a valve that extends RemoteFilterValve. This 
includes
+allow a user from a non-permitted IP address to gain access to a context
+that is protected with a valve that extends RequestFilterValve. This 
includes
 the standard RemoteAddrValve and RemoteHostValve implementations.
 
 Affects: 5.5.0 (5.0.x unknown)



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



svn commit: r704639 - /tomcat/connectors/trunk/jk/native/common/jk_version.h

2008-10-14 Thread rjung
Author: rjung
Date: Tue Oct 14 12:39:42 2008
New Revision: 704639

URL: http://svn.apache.org/viewvc?rev=704639&view=rev
Log:
Clean up version string determination and
adding an optional revision suffix for
dev versions to the exposed version string.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_version.h

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=704639&r1=704638&r2=704639&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_version.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_version.h Tue Oct 14 12:39:42 
2008
@@ -29,13 +29,16 @@
 #define JK_VERFIX   27
 #define JK_VERSTRING"1.2.27"
 
+/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
+#define JK_VERISRELEASE 0
 /* 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 0
+/* Release candidate */
 #define JK_VERRC0
 #define JK_RCSTRING "0"
+/* Source Control Revision as a suffix, e.g. "-r12345" */
+#define JK_REVISION ""
 
 /** END OF AREA TO MODIFY BEFORE RELEASING */
 
@@ -52,23 +55,18 @@
 /* Build JK_EXPOSED_VERSION and JK_VERSION */
 #define JK_EXPOSED_VERSION_INT PACKAGE "/" JK_VERSTRING
 
-#if ( JK_VERISRELEASE == 1 )
-#define JK_RELEASE_STR  JK_EXPOSED_VERSION_INT
+#if (JK_VERBETA != 0)
+#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-beta-" JK_BETASTRING
 #else
-#define JK_RELEASE_STR  JK_EXPOSED_VERSION_INT "-dev"
-#endif
-
-#if ( JK_VERBETA == 0 )
-#define JK_EXPOSED_VERSION JK_RELEASE_STR
 #undef JK_VERBETA
 #define JK_VERBETA 255
+#if (JK_VERRC != 0)
+#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-rc-" JK_RCSTRING
+#elif (JK_VERISRELEASE == 1)
+#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT
 #else
-#define JK_EXPOSED_VERSION JK_RELEASE_STR "-beta-" JK_BETASTRING
+#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-dev" JK_REVISION
 #endif
-
-#if (JK_VERRC != 0)
-#undef JK_EXPOSED_VERSION
-#define JK_EXPOSED_VERSION JK_RELEASE_STR "-rc-" JK_RCSTRING
 #endif
 
 #define JK_MAKEVERSION(major, minor, fix, beta) (((major) << 24) + ((minor) << 
16) + ((fix) << 8) + (beta))



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



svn commit: r704644 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh

2008-10-14 Thread rjung
Author: rjung
Date: Tue Oct 14 12:47:39 2008
New Revision: 704644

URL: http://svn.apache.org/viewvc?rev=704644&view=rev
Log:
JK release script now adds revision to exposed
versions of dev snapshots (those get logged
during startup).

Modified:
tomcat/connectors/trunk/jk/tools/jkrelease.sh

Modified: tomcat/connectors/trunk/jk/tools/jkrelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/tools/jkrelease.sh?rev=704644&r1=704643&r2=704644&view=diff
==
--- tomcat/connectors/trunk/jk/tools/jkrelease.sh (original)
+++ tomcat/connectors/trunk/jk/tools/jkrelease.sh Tue Oct 14 12:47:39 2008
@@ -137,7 +137,8 @@
echo "No Revision found at '$JK_SVN_URL'"
exit 3
 fi
-JK_DIST=${JK_CVST}-${tag}-dev-${JK_REV}-src
+JK_SUFFIX=${JK_REV}
+JK_DIST=${JK_CVST}-${tag}-dev-${JK_SUFFIX}-src
 elif [ -n "$branch" ]
 then
 JK_BRANCH=`echo $branch | sed -e 's#/#__#g'`
@@ -148,7 +149,8 @@
echo "No Revision found at '$JK_SVN_URL'"
exit 3
 fi
-JK_DIST=${JK_CVST}-${tag}-dev-${JK_BRANCH}-${JK_REV}-src
+JK_SUFFIX=${JK_BRANCH}-${JK_REV}
+JK_DIST=${JK_CVST}-${tag}-dev-${JK_SUFFIX}-src
 elif [ -n "$local_dir" ]
 then
 JK_SVN_URL="$local_dir"
@@ -158,12 +160,14 @@
echo "No Revision found at '$JK_SVN_URL'"
exit 3
 fi
-JK_DIST=${JK_CVST}-${tag}-dev-local-`date +%Y%m%d%H%M%S`-${JK_REV}-src
+JK_SUFFIX=local-`date +%Y%m%d%H%M%S`-${JK_REV}
+JK_DIST=${JK_CVST}-${tag}-dev-${JK_SUFFIX}-src
 else
 JK_VER=$tag
 JK_TAG=`echo $tag | sed -e 's#^#JK_#' -e 's#\.#_#g'`
 JK_BRANCH=`echo $tag | sed -e 's#^#jk#' -e 's#\.[0-9][0-9]*$##' -e 
's#$#.x#'`
 JK_SVN_URL="${SVNROOT}/${SVNPROJ}/tags/${JK_BRANCH}/${JK_TAG}"
+JK_SUFFIX=''
 JK_DIST=${JK_CVST}-${JK_VER}-src
 fi
 
@@ -189,6 +193,13 @@
 ant
 cd ../../..
 
+# Update version information
+file=${JK_DIST}.tmp/jk/native/common/jk_version.h
+cp -p $file $file.orig
+sed -e 's/^#define JK_REVISION .*/#define JK_REVISION "-'$JK_SUFFIX'"/' \
+  $file.orig > $file
+rm $file.orig
+
 # Copying things into the source distribution
 copy_files ${JK_DIST}.tmp $JK_DIST "$COPY_TOP"
 copy_files ${JK_DIST}.tmp/jk $JK_DIST "$COPY_JK"



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



svn commit: r704677 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

2008-10-14 Thread rjung
Author: rjung
Date: Tue Oct 14 13:48:20 2008
New Revision: 704677

URL: http://svn.apache.org/viewvc?rev=704677&view=rev
Log:
Update changelog with optional isapi redirector features:
- chunked encoding
- use of raw headers instead of CGI headers
- automatic event detection

Modified:
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=704677&r1=704676&r2=704677&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Tue Oct 14 
13:48:20 2008
@@ -43,6 +43,19 @@
   
   
 
+  IIS: Optionally allow chunked encoding for responses.
+At the moment only usable, if build with ISAPI_ALLOW_CHUNKING
+defined. Based on patch by Tim Whittington. (rjung)
+  
+  IIS: Optionally use raw headers instead of CGI
+headers. Fixes problem "underscore=dash" problem in
+header names. At the moment only available, if build with 
USE_RAW_HEADERS
+defined. (rjung)
+  
+  IIS: Optionally improve IIS 5.1 compatibility.
+At the moment only available, if build with AUTOMATIC_AUTH_NOTIFICATION
+defined. Based on patch by Tim Whittington. (rjung)
+  
   IIS: Fix memory corruption due to parallel initialization
 by multiple threads. (rjung)
   



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



Re: JK 1.2.27-dev snapshot

2008-10-14 Thread Rainer Jung
Mladen Turk schrieb:
>> If you are short on time, I can prepare the snapshot this evening, but
>> would prefer you to build the win binaries, because I don't have an old
>> MS compiler. If you want me to do the snapshot, send a short message,
>> otherwise I'll wait for you and work on something else.
>>
> 
> I'll do the full SR.

Great. I added the optional IIS stuff to the changelog and the svn
revision to the exposed version in any dev build based on an archive
produced with the jkrelease.sh script. So at least the startup log
contains the info, which code revision was precisely used (in the case
it's not a tagged version). Done with that.

Regards,

Rainer

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



Re: JK 1.2.27-dev snapshot

2008-10-14 Thread Rainer Jung
Mladen Turk schrieb:
> Rainer Jung wrote:
>> I like the idea of thoroughly testing snapshots before tagging, because
>> although version numbers are cheap (in subversion), user confusion also
>> easily arises from "missing" (i.e. non-released) versions.
>
> 
> Sounds reasonable. I'll prepare the new snapshot with full set
> of binaries by tomorrow. I have nothing to commit, so lets
> push for testing.
> Think we could put it inside tomcat.apache.org/dev/dist
> instead some /~user/

That's OK as long as the file names indicate it's a snapshot. The
jkrelease.sh lets you do a release type tarball from trunk and it will
contain automatically the subversion revision in the tarball name.

If you are short on time, I can prepare the snapshot this evening, but
would prefer you to build the win binaries, because I don't have an old
MS compiler. If you want me to do the snapshot, send a short message,
otherwise I'll wait for you and work on something else.

Regards,

Rainer

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



svn commit: r704722 [2/2] - in /tomcat/container/branches/tc4.1.x: LICENSE NOTICE build.xml tomcat.nsi

2008-10-14 Thread markt
Modified: tomcat/container/branches/tc4.1.x/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/tomcat.nsi?rev=704722&r1=704721&r2=704722&view=diff
==
--- tomcat/container/branches/tc4.1.x/tomcat.nsi (original)
+++ tomcat/container/branches/tc4.1.x/tomcat.nsi Tue Oct 14 15:25:01 2008
@@ -57,6 +57,7 @@
 SetOutPath $INSTDIR
 File tomcat.ico
 File LICENSE
+File NOTICE
 File /r /x *.exe bin
 File /r common
 File /r conf
@@ -516,6 +517,7 @@
   RMDir /r "$SMPROGRAMS\Apache Tomcat 4.1"
   Delete "$INSTDIR\tomcat.ico"
   Delete "$INSTDIR\LICENSE"
+  Delete "$INSTDIR\NOTICE"
   RMDir /r "$INSTDIR\bin"
   RMDir /r "$INSTDIR\common"
   Delete "$INSTDIR\conf\*.dtd"



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



svn commit: r704723 - /tomcat/current/tc4.1.x/STATUS.txt

2008-10-14 Thread markt
Author: markt
Date: Tue Oct 14 15:25:46 2008
New Revision: 704723

URL: http://svn.apache.org/viewvc?rev=704723&view=rev
Log:
Patch applied

Modified:
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=704723&r1=704722&r2=704723&view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Tue Oct 14 15:25:46 2008
@@ -25,10 +25,3 @@
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Add a NOTICE file to the TC4 distribution
-  http://people.apache.org/~markt/patches/2008-09-25-tc4-notice.patch
-  +1: markt, rjung, fhanik
-  -1: 
-  rjung: I didn't do a detailed check on the contents of the added licenses.
-  But technically everything looks fine and of course there's no
-  new component added in this release.



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



[Tomcat Wiki] Update of "PoweredBy" by John Eichelsdorfer

2008-10-14 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The following page has been changed by John Eichelsdorfer:
http://wiki.apache.org/tomcat/PoweredBy

--
  [http://www.jboss.com JBoss]
  
  = jobbank.com =
- http://www.jobbank.com//images/jbank.jpg
+ http://jobbank.com//images/jobbank-logo.jpg
- [http://www.jobbank.com jobbank.com] is an employment site for job searches, 
posting jobs, posting resumes, and career tools. This MVC site uses Struts and 
Velocity on Tomcat to render its view.
+ [http://jobbank.com jobbank.com] is an employment site for job searches, 
posting jobs, posting resumes, and career tools. This MVC site uses Struts and 
Velocity on Tomcat to render its view.
  
  = Kenwood Kitchen Store =
  http://www.kenwoodmajor.com/img/logo.jpg

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



[Tomcat Wiki] Trivial Update of "PoweredBy" by John Eichelsdorfer

2008-10-14 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The following page has been changed by John Eichelsdorfer:
http://wiki.apache.org/tomcat/PoweredBy

--
  [http://www.jboss.com JBoss]
  
  = jobbank.com =
- http://jobbank.com//images/jobbank-logo.jpg
+ http://jobbank.com/images/jobbank-logo.jpg
- [http://jobbank.com jobbank.com] is an employment site for job searches, 
posting jobs, posting resumes, and career tools. This MVC site uses Struts and 
Velocity on Tomcat to render its view.
+ [http://jobbank.com/ jobbank.com] is an employment site for job searches, 
posting jobs, posting resumes, and career tools. This MVC site uses Struts and 
Velocity on Tomcat to render its view.
  
  = Kenwood Kitchen Store =
  http://www.kenwoodmajor.com/img/logo.jpg

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