Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 94186 invoked from network); 29 May 2002 07:17:15 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 29 May 2002 07:17:15 -0000 Received: (qmail 26183 invoked by uid 97); 29 May 2002 07:17:16 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 26132 invoked by uid 97); 29 May 2002 07:17:15 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 26119 invoked by uid 97); 29 May 2002 07:17:14 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) From: "Mladen Turk" To: Cc: Subject: [PATCH] Apache2 mod_jk2 Date: Wed, 29 May 2002 09:17:03 +0200 Organization: Mappingsoft Message-ID: <003701c206e0$d7dad900$5c00000a@GISDATA.ZG> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0038_01C206F1.9B63A900" X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook, Build 10.0.2627 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 Importance: Normal X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - ns.promo-grupa.com X-AntiAbuse: Original Domain - apache.org X-AntiAbuse: Originator/Caller UID/GID - [0 0] / [0 0] X-AntiAbuse: Sender Address Domain - mappingsoft.com X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N ------=_NextPart_000_0038_01C206F1.9B63A900 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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. ------=_NextPart_000_0038_01C206F1.9B63A900 Content-Type: text/plain; name="apache2.txt" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="apache2.txt" 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_j= k2.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 @@ =20 if( env->soName =3D=3D NULL ){ env->l->jkLog(env, env->l, JK_LOG_ERROR, "Error creating = env->soName\n"); - return env; + return; } strcpy(env->soName,file_name); #else=20 @@ -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; } =20 ------=_NextPart_000_0038_01C206F1.9B63A900 Content-Type: text/plain; charset=us-ascii -- To unsubscribe, e-mail: For additional commands, e-mail: ------=_NextPart_000_0038_01C206F1.9B63A900--