tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r562127 - /tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
Date Thu, 02 Aug 2007 14:39:04 GMT
Author: rjung
Date: Thu Aug  2 07:39:04 2007
New Revision: 562127

URL: http://svn.apache.org/viewvc?view=rev&rev=562127
Log:
Allow missing shm_file attribute for nsapi plugin
on WIN32 and Netware platforms.

Modified:
    tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c

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?view=diff&rev=562127&r1=562126&r2=562127
==============================================================================
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Thu Aug  2 07:39:04 2007
@@ -231,6 +231,7 @@
     char *log_level_str = pblock_findval(JK_LOG_LEVEL_TAG, pb);
     char *log_file = pblock_findval(JK_LOG_FILE_TAG, pb);
     char *shm_file = pblock_findval(JK_SHM_FILE_TAG, pb);
+    char *shm_file_safe = "";
     char *reject_unsafe = pblock_findval(REJECT_UNSAFE_TAG, pb);
 
     int rc = REQ_ABORTED;
@@ -249,11 +250,16 @@
         return rc;
     }
 
-    if (!shm_file) {
+    if (shm_file) {
+        shm_file_safe = shm_file;
+    }
+#if !defined(WIN32) && !defined(NETWARE)
+    else {
         fprintf(stderr,
                 "Missing attribute %s in magnus.conf (jk_init) - aborting!\n", JK_SHM_FILE_TAG);
         return rc;
     }
+#endif
 
     fprintf(stderr,
             "In jk_init.\n   Worker file = %s.\n   Log level = %s.\n   Log File = %s\n  
SHM File = %s\n",



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message