jfclere 2004/07/06 08:56:42
Modified:jk/native2/common jk_endpoint.c jk_logger_win32.c
jk_requtil.c
jk/native2/server/apache2 mod_jk2.c
Log:
Use apr equivalent routine for snprintf, usleep and vsnprintf.
Revision ChangesPath
1.29
yoavs 2004/06/16 07:38:56
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Bugzilla 26231 done.
Revision ChangesPath
1.83 +20 -5 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
keith 2004/06/16 08:42:03
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
The patch that was just applied for a bug was against an older
version and referred to a nonexistant variable.
Revision ChangesPath
1.84 +2 -2
commit: jakarta-tomcat-connectors/jk/native2/server/apache2
mod_jk2.c
jfclere 2004/03/31 06:22:04
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Fix handling of id added in jk2_create_dir_config().
I do not see why we need this id... May because jk2_merge_dir_config()
was buggy
this is a lot closer to theory than in the past.
Thanks Jean.
Norm
- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Thursday, April 01, 2004 12:22 AM
Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2
mod_jk2.c
jfclere 2004/03/31 06:22:04
jfclere 2004/03/31 06:22:04
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Fix handling of id added in jk2_create_dir_config().
I do not see why we need this id... May because jk2_merge_dir_config()
was buggy.
That fixes PR 18472 and 28916.
Revision ChangesPath
[EMAIL PROTECTED] wrote:
jfclere 2004/03/31 06:22:04
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Fix handling of id added in jk2_create_dir_config().
Please review I spent time to find why we added the id to path and uri but
now I do not understand why we added it.
I do
spec was in both
files, but in any case this is a lot closer to theory than in the past.
Thanks Jean.
Norm
- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Thursday, April 01, 2004 12:22 AM
Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2
NormW wrote:
Good morning All.
Just tried Jean's recent change to mod_jk2.c and _pleased_ to say JkUriSet
now registers correctly the same as a [uri] section, and can access /admin
with only a Location in the httpd.conf. I did note there were duplicate
uri objects created (based on their name)
hgomez 2004/03/17 08:47:48
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Remove unused vars (thanks gcc -wall)
Revision ChangesPath
1.80 +1 -8 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
mturk 2004/03/15 03:59:01
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Removed the childGeneration checking.
Since the childId uses pid instead scoreboard slot that cored the server.
Revision ChangesPath
1.78 +5 -21
jfclere 2004/03/15 06:16:24
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
It _is_ done in post config!
Revision ChangesPath
1.79 +1 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
mturk 2004/03/13 00:49:26
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Use the maxDaemon from workerEnv, and query the mpm on jk2_init.
Also on single child mpm's use the pid for a child id.
Revision ChangesPath
1.77 +10 -7
jfclere 2004/03/12 05:47:20
Modified:jk/native2/server/apache13 mod_jk2.c
jk/native2/server/apache2 mod_jk2.c
Log:
Fix PR 27627: It was possible to core the httpd process.
Note only Apache has been fixed but jk_dsapi_plugin.c and jk_isapi_plugin.c
probably have
[EMAIL PROTECTED] wrote:
jfclere 2004/03/12 05:47:20
Modified:jk/native2/server/apache13 mod_jk2.c
jk/native2/server/apache2 mod_jk2.c
Log:
Fix PR 27627: It was possible to core the httpd process.
Henri fixes the core... But I think we should return 400 otherwise jsp
-Original Message-
From: jean-frederic clere
Henri fixes the core... But I think we should return 400
otherwise jsp code could be displayed as text.
Someone should take care of jk_dsapi_plugin.c and
jk_isapi_plugin.c and do the same.
jk_isapi_plugin uses
Mladen Turk wrote:
-Original Message-
From: jean-frederic clere
Henri fixes the core... But I think we should return 400
otherwise jsp code could be displayed as text.
Someone should take care of jk_dsapi_plugin.c and
jk_isapi_plugin.c and do the same.
jk_isapi_plugin uses
hgomez 2004/03/10 01:39:30
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Correct name, we should have mod_jk2 and not mod_jk :-)
Thanks Guenter
Revision ChangesPath
1.75 +19 -19jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index:
jfclere 2004/03/04 04:01:48
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Now that is nearly ok. (need testing!).
jk2_translate is needed for the JkUriSet directives. So I have put it back.
Revision ChangesPath
1.73 +10 -56
jfclere 2004/03/04 06:08:49
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Don't call mapUri if translate has already filled uriEnv.
Revision ChangesPath
1.74 +6 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
hgomez 2004/03/03 01:15:48
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
revert to use APR_HOOK_MIDDLE, as does jk.
Revision ChangesPath
1.71 +2 -5 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
jfclere 2004/03/03 09:55:32
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Remove jk2_translate... It is still not 100% OK:
- LocationMatch does not work.
- Some _not_found ends in Tomcat when using mod_dav.
Revision ChangesPath
1.72 +27 -30
[EMAIL PROTECTED] wrote:
jfclere 2004/03/03 09:55:32
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Remove jk2_translate... It is still not 100% OK:
- LocationMatch does not work.
- Some _not_found ends in Tomcat when using mod_dav.
That is still not OK. I will go on
hgomez 2004/03/02 07:11:31
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
jk2 should came in FIRST pos but came after mod_rewrite
Revision ChangesPath
1.70 +3 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
hgomez 2004/02/27 06:24:57
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Move translate to APR_HOOK_MIDDLE and make sure mod_rewrite will be
before us
Revision ChangesPath
1.69 +8 -4 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
hgomez 2004/02/09 04:01:22
Modified:jk/native2/server/apache2 mod_jk2.c jk_service_apache2.c
Log:
Remove obsolete linefeeds from the logs, see the ap_log_* functions
dont need trailing linefeeds.
Thanks to Gunter Knauf
Revision ChangesPath
1.65 +9 -9
costin 2003/03/03 23:19:31
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Reduce verbosity.
Revision ChangesPath
1.59 +3 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
mturk 2003/02/03 23:41:42
Modified:jk/native2/server/apache2 mod_jk2.c jk_service_apache2.c
jk_map_aprtable.c jk_logger_apache2.c jk_apache2.h
Log:
Update license to 2003.
Revision ChangesPath
1.58 +2 -2
mturk 2003/01/23 04:11:54
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Report sucesfull scoreboard child id status as INFO instead of ERROR.
Revision ChangesPath
1.57 +10 -10jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index:
mturk 2002/10/26 05:38:45
Modified:jk/native2/server/apache2 mod_jk2.c jk_service_apache2.c
Log:
Move the scoreboard and childId detection from service_apache2 to the
mod_jk2. Also set the child_init hook as last, so that mpm has
a chance to create the scoreboard.
mturk 2002/10/26 07:47:33
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Some cleanup of the previous patch, skipping some debug code.
Revision ChangesPath
1.56 +2 -19 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
mturk 2002/10/09 10:10:52
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Skip the checking of default hostname and port. Using
that scheme the same behaviour is on all web servers.
Revision ChangesPath
1.54 +3 -7
mturk 2002/09/23 10:40:17
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Supply the hostname if not virtual and port if not default to the uriMap
Revision ChangesPath
1.53 +10 -5 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index:
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Sunday, September 22, 2002 4:51 AM
/* As per Servlet spec, do exact match first */
match=jk2_uriMap_exactMap( env, uriMap,
ctxEnv-exactMatch, uri, uriLen, reverse );
-if( match !=
mturk 2002/09/22 02:35:46
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Cannot use the hostname:server_port cause the port is 0 for all
host:80 requests. Also is_virtual is used for separating default and
virtual hosts. In case of default server host the hostname provided
.. ;)
Saludos ,
Ignacio J. Ortega
-Mensaje original-
De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Enviado el: 22 de septiembre de 2002 11:36
Para: [EMAIL PROTECTED]
Asunto: cvs commit:
jakarta-tomcat-connectors/jk/native2/server/apache2
mod_jk2.c
mturk 2002/09/22 02:35:46
-Original Message-
From: Ignacio J. Ortega [mailto:[EMAIL PROTECTED]]
I agree that my patch is buggy in the case of a request
coming from 80 or 443, but if we want to support port bases V
hosting, we need to pass it down, if not
[uri:www.something.com:8080/somecontext]
mturk 2002/09/21 02:45:27
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Fix the uriMap for VirtualHost, providing server name for virtual
hosts. Thx. to Dimitry Letin for that.
Revision ChangesPath
1.50 +4 -2
De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Enviado el: 21 de septiembre de 2002 11:45
+uriEnv = workerEnv-uriMap-mapUri(env, workerEnv-uriMap,
+r-server-is_virtual ?
r-server-server_hostname : NULL,
+r-uri );
I think this should use
nacho 2002/09/21 19:50:42
Modified:jk/native2/common jk_uriEnv.c jk_uriMap.c
jk/native2/server/apache2 mod_jk2.c
Log:
Bug#11364 - jk2 appears to forward all virtual host requests to Tomcat
Reported by Simon Stewart
Revision ChangesPath
1.26 +0 -1
mturk 2002/08/15 02:27:18
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
After succesfull call to the mapUri call the mapUri again with the reverse flag set.
This will decline the 'reverse' mappings.
Revision ChangesPath
1.48 +9 -3
mturk 2002/08/15 04:23:04
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Remove the reverse flag from uriMap call.
All the positive/negative mappings is now done inside the uriMap
function itself.
Revision ChangesPath
1.49 +1 -8
costin 2002/08/09 10:45:50
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Few cosmetic fixes. Remove old code ( uriEnv can't be null ).
The uriEnv==null case was used to support SetHandler directive -
which only sets jakarta-servlet handler but doesn't set any
bojan 2002/07/23 17:44:20
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Kick out DIR_MAGIC_TYPE from jk2_handler() since it is never given to it
anyway. This will have to be resolved later for mod_jk2.
Make sure main request gets the appropriate info when the
bojan 2002/07/22 16:18:38
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Initial, most likely *BROKEN* code to handle default directory files. The
code in jk2_map_to_storage() should be OK.
Most critical stuff is in jk2_handler() function, the part of code that
Quoting [EMAIL PROTECTED]:
On 22 Jul 2002, Bojan Smojver wrote:
If there is no physical file, then nothing will get done by the patch
at
all (since r-finfo.filetype is 0). It won't affect mod_dir's old
behaviour at all. I'm not sure how that changes things...
My question was: if you
Quoting [EMAIL PROTECTED]:
You don't need to ask tomcat - jk should have all the mappings, and
it can already map any URI. All it has to do is:
- for each index:
-- concatenate with the current uri
-- do the jk mapping ( or internal redirect if you use Location
instead of the
Quoting [EMAIL PROTECTED]:
Are you referring here to mod_jk2 only or both mod_jk 1.2.0 and
mod_jk2?
I think it could be done for jk2 ( but not easy ). I'm not sure
about 1.2 - just forwarding and letting tomcat handle
it is not the worse thing.
How about I try to fix it properly in
Quoting [EMAIL PROTECTED]:
You don't need to ask tomcat - jk should have all the mappings, and
it can already map any URI. All it has to do is:
- for each index:
-- concatenate with the current uri
-- do the jk mapping ( or internal redirect if you use Location
instead of the
- Original Message -
From: Bojan Smojver [EMAIL PROTECTED]
To: Tomcat Developers List [EMAIL PROTECTED]
Sent: Sunday, July 21, 2002 9:19 PM
Subject: RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2
mod_jk2.c
Quoting [EMAIL PROTECTED]:
You don't need to ask tomcat
Quoting [EMAIL PROTECTED]:
DirectoryIndex index.jsp index.vm
The order of events would be:
1. mod_dir does a sub request for index.jsp
2. jk_map_to_storage() receives the request
3. jk_map_to_storage() engages map_uri_to_worker() -- this would be
new code
4.
Quoting Bill Barker [EMAIL PROTECTED]:
I *really* don't like the idea of passing DIR_MAGIC_TYPE requests to
Tomcat, since I tend to set up directories with only static content that only
Apache knows about. Sending them to Tomcat just gives me very many 404
errors, so I'd be forced to use a
My apologies everyone... Just ignore the part of my previous e-mail marked here
with between the stars. It just plain stupid :-(
**
Quoting Bojan Smojver [EMAIL PROTECTED]:
Quoting [EMAIL PROTECTED]:
DirectoryIndex
mturk 2002/07/18 08:15:00
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Fix the bug 10789 caused by hook order.
Revision ChangesPath
1.42 +3 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
I've looked through Mark's excellent analysis of the problem
(http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10789) and I also played with
changing the hook order for mod_jk 1.2.0. Are you sure this actually fixes the
thing?
My experience from 1.2.0 is similar to Mark's with 2.x - the handler
On Fri, 19 Jul 2002 13:57:22 +1000 (EST), Bojan Smojver wrote:
: My experience from 1.2.0 is similar to Mark's with 2.x - the handler never gets
: called because the r-handler is DIR_MAGIC_TYPE, not JK_HANDLER. So, I think
: Mark's code would be the real fix for both - giving Apache a hint that
Quoting Mark Miesfeld [EMAIL PROTECTED]:
I was just getting ready to post something saying the fix seems to
break mod_jk2 altogether for me.
Interesting. I haven't actually checked explicit calls to pages with reversed
order and mod_jk 1.2.0, so I don't really know if that breaks it or not.
bojan 2002/07/17 15:43:59
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Revert the fix for default pages - it seems jk2 does things differently then jk1
(surprise). User confirms the fix does not work.
Revision ChangesPath
1.41 +2 -3
bojan 2002/07/16 22:58:34
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Fix picking up default pages from Apache 2.x
Revision ChangesPath
1.40 +3 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
mturk 2002/07/08 06:31:23
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
no message
Revision ChangesPath
1.39 +5 -5 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
mturk 2002/07/01 08:46:20
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Register child_init pool cleanup function jk2_shutdown
Revision ChangesPath
1.38 +13 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
nacho 2002/06/08 18:56:14
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
* Fixing the build in win32
* Cosmetic changes
Revision ChangesPath
1.35 +2 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
hgomez 2002/06/03 04:24:25
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Others apache 2.0 modules use ap_add_version_component in
post config phase (ie DAV2).
Having it done in child init make it appears too late to
be present in error.log.
Revision Changes
costin 2002/06/01 08:40:09
Modified:jk/native2/common jk_vm_default.c
jk/native2/server/apache2 mod_jk2.c
Log:
2 fixes from Mladen Turk: eliminate double version and add support for
another JVM layout style.
Thanks.
Revision ChangesPath
1.16
costin 2002/05/31 15:27:17
Modified:jk/native2/common jk_worker_status.c
jk/native2/include jk_uriEnv.h
jk/native2/server/apache2 mod_jk2.c
Log:
Remove debug.
Fix a bug in merging the uriEnvs ( if Location is used ) and avoid
duplicating the
nacho 02/05/29 07:30:07
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
* fixing the build for win32..
Thanks to Mladen Turk
Revision ChangesPath
1.27 +3 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
costin 02/05/29 10:51:23
Modified:jk/native2 build.xml
jk/native2/common jk_channel_un.c jk_config.c jk_env.c
jk_shm.c jk_worker_status.c
jk/native2/include jk_env.h
jk/native2/jni jk_jni_aprImpl.c
nacho 02/05/28 17:13:00
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
* Getting soName for mod_jk2, now it's possible to log to native win32 logger from
apache
Revision ChangesPath
1.26 +28 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
costin 02/05/22 16:44:23
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Remove printfs.
I tested apache2 with
Location
JkSet group lb
/Location,
seem to work fine ( with Apache doing the mapping ). No time for ab tests
now.
Revision ChangesPath
costin 02/05/16 13:54:18
Modified:jk/native2/server/apache2 mod_jk2.c jk_service_apache2.c
Log:
We can't call find_by_pid in init() because the scoreboard may not be initialized
or the process may not be registered.
We can't call it in service() because linux will return
costin 02/05/14 09:57:37
Modified:jk/native2/common jk_workerEnv.c
jk/native2/include jk_workerEnv.h
jk/native2/server/apache2 mod_jk2.c
Log:
Add a 'childId' in workerEnv. This will be used as an index in the jk scoreboard.
Also added a mechanism
hgomez 02/05/13 03:22:00
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
mod_jk2 wasn't (no more) reporting itself in list of module loaded
Revision ChangesPath
1.19 +3 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
costin 02/05/03 11:44:03
Modified:jk/native2/common jk_channel_apr_socket.c jk_requtil.c
jk/native2/include jk_service.h
jk/native2/server/apache13 mod_jk2.c
jk/native2/server/apache2 mod_jk2.c
Log:
Even less debugging.
Replace
costin 02/04/19 15:30:46
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
uriEnv may be null ( and we have workerEnv in a static variable ).
Thanks Nacho:-)
Revision ChangesPath
1.12 +2 -4 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
costin 02/04/18 15:56:13
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Call init in child_init, post config is not the right point.
Revision ChangesPath
1.11 +27 -22jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
costin 02/04/15 16:57:42
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Fix stupid error - now the 2 config phases are corectly detected.
The first step we call the setters - that would allow validation and
warnings for invalid settings.
The second step we call the
costin 02/04/11 12:35:48
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Set server root. Fix stupid {} problem.
Revision ChangesPath
1.9 +6 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
costin 02/04/05 11:13:56
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Added a pre-defined serverRoot variable, to resolve paths.
Right now the best way is to not use relative paths, but ${serverRoot}/logs/...
or ${serverRoot}/conf/jk2.properties.
Revision Changes
costin 02/03/18 20:55:57
Modified:jk/native2/server/apache13 jk_service_apache13.c mod_jk2.c
jk/native2/server/apache2 mod_jk2.c
Log:
Finally got the apache1.3 to start ( still has few problems, but it's close ).
Cleaned up the code, removed all the tricks and
costin 02/02/28 16:45:58
Modified:jk/native2/common jk_registry.h jk_uriMap.c
jk_worker_status.c
jk/native2/include jk_uriEnv.h
jk/native2/server/apache13 mod_jk2.c
jk/native2/server/apache2 mod_jk2.c
Added:
hgomez 02/02/22 02:04:34
Added: jk/native2/server/apache2 mod_jk2.c
Log:
Renaming mod_jk.c to mod_jk2.c to allow Apache directive
IfModule mod_jk2.c
/IfModule
Revision ChangesPath
1.1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
81 matches
Mail list logo
