svn commit: r747415 - /tomcat/connectors/trunk/jk/native/common/portable.h.sample
Author: mturk Date: Tue Feb 24 16:24:53 2009 New Revision: 747415 URL: http://svn.apache.org/viewvc?rev=747415&view=rev Log: Update portable sample to the current version Modified: tomcat/connectors/trunk/jk/native/common/portable.h.sample 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=747415&r1=747414&r2=747415&view=diff == --- tomcat/connectors/trunk/jk/native/common/portable.h.sample (original) +++ tomcat/connectors/trunk/jk/native/common/portable.h.sample Tue Feb 24 16:24:53 2009 @@ -112,4 +112,4 @@ #define USE_SO_SNDTIMEO 1 /* Version number of package */ -#define VERSION "1.2.27" +#define VERSION "1.2.28" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r747431 - /tomcat/connectors/trunk/jk/native/common/jk_shm.h
Author: mturk
Date: Tue Feb 24 17:00:41 2009
New Revision: 747431
URL: http://svn.apache.org/viewvc?rev=747431&view=rev
Log:
Use int instead unsigned for port
Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.h
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.h?rev=747431&r1=747430&r2=747431&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.h Tue Feb 24 17:00:41 2009
@@ -79,7 +79,7 @@
{
jk_shm_worker_header_t h;
char hostname[JK_SHM_STR_SIZ+1];
-unsigned int port;
+int port;
volatile int addr_sequence;
/* Configuration data mirrored from ajp_worker */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r747438 - /tomcat/connectors/trunk/jk/native/iis/isapi_redirect.reg
Author: mturk Date: Tue Feb 24 17:05:29 2009 New Revision: 747438 URL: http://svn.apache.org/viewvc?rev=747438&view=rev Log: This is something from stone age. Remove the obsolete directives Modified: tomcat/connectors/trunk/jk/native/iis/isapi_redirect.reg Modified: tomcat/connectors/trunk/jk/native/iis/isapi_redirect.reg URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi_redirect.reg?rev=747438&r1=747437&r2=747438&view=diff == --- tomcat/connectors/trunk/jk/native/iis/isapi_redirect.reg (original) +++ tomcat/connectors/trunk/jk/native/iis/isapi_redirect.reg Tue Feb 24 17:05:29 2009 @@ -5,5 +5,3 @@ "log_level"="debug" "worker_file"="C:\\tomcat\\conf\\workers.properties" "worker_mount_file"="C:\\tomcat\\conf\\uriworkermap.properties" -"tomcat_start"="C:\\tomcat\\bin\\tomcat.bat start" -"tomcat_stop"="C:\\tomcat\\bin\\tomcat.bat stop" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46763] New: Improve treatment of jk_log_lock.
https://issues.apache.org/bugzilla/show_bug.cgi?id=46763 Summary: Improve treatment of jk_log_lock. Product: Tomcat Connectors Version: unspecified Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P2 Component: mod_jk AssignedTo: dev@tomcat.apache.org ReportedBy: mashm...@gmail.com Created an attachment (id=23305) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23305) patch for apache-2.0/mod_jk.c Hi, folks. If the graceful restart occurs, jk_log_lock that an old child process has is deleted by the parent process and the new one is made. When an old child process writes the request log after the parent process restarted, the following logs are written in error_log because old jk_log_lock has already been deleted. # An old child process doesn't stop until the reply is returned. [Mon Feb 16 14:38:57 2009] [error] (22)Invalid argument: apr_global_mutex_lock(jk_log_lock) failed [Mon Feb 16 14:38:57 2009] [error] (43)Identifier removed: apr_global_mutex_unlock(jk_log_lock) failed To avoid output logs, I modified the code to reuse jk_log_lock by using apr_pool_userdata_set/get() ( just like other modules. for instance, mod_ssl etc. ). regards. -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r747694 - in /tomcat/connectors/trunk/jk: native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml
Author: mturk
Date: Wed Feb 25 07:31:45 2009
New Revision: 747694
URL: http://svn.apache.org/viewvc?rev=747694&view=rev
Log:
Fix #46763. Survive the log mutex during restart.
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=747694&r1=747693&r2=747694&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Feb 25 07:31:45
2009
@@ -128,6 +128,7 @@
#define JK_MAGIC_TYPE ("application/x-jakarta-servlet")
#define NULL_FOR_EMPTY(x) ((x && !strlen(x)) ? NULL : x)
#define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)")
+#define JK_LOG_LOCK_KEY ("jk_log_lock_key")
/*
* If you are not using SSL, comment out the following line. It will make
* apache run faster.
@@ -3200,29 +3201,37 @@
jk_server_conf_t *conf;
server_rec *srv = s;
const char *err_string = NULL;
+void *data = NULL;
-/* create the jk log lockfiles in the parent */
-if ((rv = apr_global_mutex_create(&jk_log_lock, NULL,
- APR_LOCK_DEFAULT,
- pconf)) != APR_SUCCESS) {
-ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
- "mod_jk: could not create jk_log_lock");
-return HTTP_INTERNAL_SERVER_ERROR;
-}
+apr_pool_userdata_get(&data, JK_LOG_LOCK_KEY, s->process->pool);
+if (data == NULL) {
+/* create the jk log lockfiles in the parent */
+if ((rv = apr_global_mutex_create(&jk_log_lock, NULL,
+ APR_LOCK_DEFAULT,
+ s->process->pool)) != APR_SUCCESS) {
+ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
+ "mod_jk: could not create jk_log_lock");
+return HTTP_INTERNAL_SERVER_ERROR;
+}
#if JK_NEED_SET_MUTEX_PERMS
#if (MODULE_MAGIC_NUMBER_MAJOR >= 20090208)
-rv = ap_unixd_set_global_mutex_perms(jk_log_lock);
+rv = ap_unixd_set_global_mutex_perms(jk_log_lock);
#else
-rv = unixd_set_global_mutex_perms(jk_log_lock);
+rv = unixd_set_global_mutex_perms(jk_log_lock);
#endif
-if (rv != APR_SUCCESS) {
-ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
- "mod_jk: Could not set permissions on "
- "jk_log_lock; check User and Group directives");
-return HTTP_INTERNAL_SERVER_ERROR;
-}
+if (rv != APR_SUCCESS) {
+ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
+ "mod_jk: Could not set permissions on "
+ "jk_log_lock; check User and Group directives");
+return HTTP_INTERNAL_SERVER_ERROR;
+}
#endif
+apr_pool_userdata_set((const void *)jk_log_lock, JK_LOG_LOCK_KEY,
+ apr_pool_cleanup_null, s->process->pool);
+} else {
+jk_log_lock = (apr_global_mutex_t *)data;
+}
main_server = s;
jk_log_fps = apr_hash_make(pconf);
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=747694&r1=747693&r2=747694&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Feb 25
07:31:45 2009
@@ -43,6 +43,10 @@
+
+46763: Survive the log mutex during graceful
+restart. Patch provide by Eiji Takahashi. (mturk)
+
IIS: Update uriworkermap.properies file on
a regular interval. This requires both worker_mount_reload
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46763] Improve treatment of jk_log_lock.
https://issues.apache.org/bugzilla/show_bug.cgi?id=46763 --- Comment #1 from Mladen Turk 2009-02-24 23:32:19 PST --- Applied to the trunk. Thanks! -- 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r747695 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Author: mturk Date: Wed Feb 25 07:33:32 2009 New Revision: 747695 URL: http://svn.apache.org/viewvc?rev=747695&view=rev Log: Fix spelling 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=747695&r1=747694&r2=747695&view=diff == --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Feb 25 07:33:32 2009 @@ -45,7 +45,7 @@ 46763: Survive the log mutex during graceful -restart. Patch provide by Eiji Takahashi. (mturk) +restart. Patch provided by Eiji Takahashi. (mturk) IIS: Update uriworkermap.properies file on - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
