You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2008/04/09 17:44:48 UTC
svn commit: r646411 - in /tomcat/connectors/trunk/jk:
native/common/jk_version.h native/iis/jk_isapi_plugin.c
native/netscape/jk_nsapi_plugin.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Wed Apr 9 08:44:48 2008
New Revision: 646411
URL: http://svn.apache.org/viewvc?rev=646411&view=rev
Log:
Use new defines JK_ISAPI and JK_NSAPI to set
plugin name in exposed version string.
Make startup message more consistent between plugins.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_version.h
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
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=646411&r1=646410&r2=646411&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_version.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_version.h Wed Apr 9 08:44:48 2008
@@ -40,7 +40,13 @@
/************** END OF AREA TO MODIFY BEFORE RELEASING *************/
#if !defined(PACKAGE)
+#if defined(JK_ISAPI)
+#define PACKAGE "isapi_redirector"
+#elif defined(JK_NSAPI)
+#define PACKAGE "nsapi_redirector"
+#else
#define PACKAGE "mod_jk"
+#endif
#endif
/* Build JK_EXPOSED_VERSION and JK_VERSION */
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=646411&r1=646410&r2=646411&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Wed Apr 9 08:44:48 2008
@@ -1799,7 +1799,7 @@
}
}
if (rc) {
- jk_log(logger, JK_LOG_INFO, "Initialized %s", (VERSION_STRING) );
+ jk_log(logger, JK_LOG_INFO, "%s initialized", (VERSION_STRING) );
}
return rc;
}
Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?rev=646411&r1=646410&r2=646411&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Wed Apr 9 08:44:48 2008
@@ -303,8 +303,7 @@
if (init_on_other_thread_is_done && init_on_other_thread_is_ok) {
magnus_atrestart(jk_term, NULL);
rc = REQ_PROCEED;
- jk_log(logger, JK_LOG_INFO, "nsapi_redirector/%s initialized",
- JK_VERSTRING);
+ jk_log(logger, JK_LOG_INFO, "%s initialized", JK_EXPOSED_VERSION);
}
/* if(wc_open(init_map, NULL, logger)) {
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=646411&r1=646410&r2=646411&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Apr 9 08:44:48 2008
@@ -43,6 +43,10 @@
<br />
<subsection name="Native">
<changelog>
+ <update>
+ Detect correct plugin name for various web servers via additional
+ preprocessor defines. (rjung)
+ </update>
<fix>
<bug>44738</bug>: Fix merging of JkOption ForwardURI* between virtual hosts.
Patch contributed by Toshihiro Sasajima. (rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org