[PATCH] Apache2 mod_jk2

[Mladen Turk]

Hi,

Introducing native WIN32 logger breaks the Apache2 mod_jk2.
Either implement the logger factory func in mod_jk2 (I'm personally
against it),
or ifdef it out from jk_registry.

Here is the patch...

MT.

RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c,v
retrieving revision 1.25
diff -u -r1.25 jk_registry.c
--- jk_registry.c       29 May 2002 00:10:17 -0000      1.25
+++ jk_registry.c       29 May 2002 07:07:09 -0000
@@ -110,7 +110,11 @@
    * error, I'm casting the function pointers to (void *) - mmanders
    */
   env->registerFactory( env, "logger.file",   jk2_logger_file_factory );
+/* This switch should be more descriptive like JK2_HAS_WIN32_LOGGER
+ */
+#ifndef HAS_APR
   env->registerFactory( env, "logger.win32",   jk2_logger_win32_factory );
+#endif
   env->registerFactory( env, "workerEnv", jk2_workerEnv_factory );
   env->registerFactory( env, "uriMap", jk2_uriMap_factory );
   env->registerFactory( env, "uriEnv", jk2_uriEnv_factory );


RCS file: 
/home/cvspublic/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.26
diff -u -r1.26 mod_jk2.c
--- mod_jk2.c   29 May 2002 00:13:00 -0000      1.26
+++ mod_jk2.c   29 May 2002 07:06:21 -0000
@@ -293,7 +293,7 @@
     
     if( env->soName == NULL ){
         env->l->jkLog(env, env->l, JK_LOG_ERROR, "Error creating env->soName\n");
-        return env;
+        return;
     }
     strcpy(env->soName,file_name);
 #else 
@@ -729,7 +729,7 @@
                     ULONG ulReason,         // Reason why NT called this DLL
                     LPVOID lpReserved)      // Reserved parameter for future use
 {
-    GetModuleFileName( hInst, file_name, sizeof(file_name)));
+    GetModuleFileName( hInst, file_name, sizeof(file_name));
     return TRUE;
 }
 


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