svn commit: r777247 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java

2009-05-21 Thread rjung
Author: rjung Date: Thu May 21 20:35:36 2009 New Revision: 777247 URL: http://svn.apache.org/viewvc?rev=777247&view=rev Log: Missing svn properties keywords and eol-style. Found while checking the 6.0.20 release candidate. Guys fix your svn configuration. ;) Modified: tomcat/tc6.0.x/t

svn commit: r777251 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java

2009-05-21 Thread rjung
Author: rjung Date: Thu May 21 20:38:53 2009 New Revision: 777251 URL: http://svn.apache.org/viewvc?rev=777251&view=rev Log: Add missing keywords svn property. Already applied to tc6. Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java (p

svn commit: r777307 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-05-21 Thread rjung
Author: rjung Date: Thu May 21 23:01:03 2009 New Revision: 777307 URL: http://svn.apache.org/viewvc?rev=777307&view=rev Log: Propose subversion property fixes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/t

svn commit: r777319 - in /tomcat/trunk: java/org/apache/catalina/ha/backend/ modules/bayeux/ modules/bayeux/webapps/cometd/examples/simplechat/ modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ modu

2009-05-21 Thread rjung
Author: rjung Date: Thu May 21 23:29:02 2009 New Revision: 777319 URL: http://svn.apache.org/viewvc?rev=777319&view=rev Log: More missing svn properties. Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java (props changed) tomcat/trunk/java/org/apache/cata

svn commit: r580793 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-09-30 Thread rjung
Author: rjung Date: Sun Sep 30 14:30:49 2007 New Revision: 580793 URL: http://svn.apache.org/viewvc?rev=580793&view=rev Log: Remove worker_properties and worker_file from per server config. They are global. Do not allow multiple JkWorkerFile directives. Modified: tomcat/connectors/trun

svn commit: r580798 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-09-30 Thread rjung
Author: rjung Date: Sun Sep 30 14:51:29 2007 New Revision: 580798 URL: http://svn.apache.org/viewvc?rev=580798&view=rev Log: Don't double init or destroy per server config. Use was_initialized in a consistent way for apache httpd 1.3 and 2.x. Move logger open inside the double i

svn commit: r580799 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-09-30 Thread rjung
Author: rjung Date: Sun Sep 30 14:54:31 2007 New Revision: 580799 URL: http://svn.apache.org/viewvc?rev=580799&view=rev Log: Correct indentation. Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c URL:

svn commit: r580800 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-09-30 Thread rjung
Author: rjung Date: Sun Sep 30 15:17:48 2007 New Revision: 580800 URL: http://svn.apache.org/viewvc?rev=580800&view=rev Log: Clone server config in case a servers share their config. Because by default we (unfortunately) don't inherit mounts between servers, a vhost with no JK directive

svn commit: r580808 - in /tomcat/connectors/trunk/jk/xdocs: miscellaneous/changelog.xml reference/apache.xml

2007-09-30 Thread rjung
Author: rjung Date: Sun Sep 30 16:11:59 2007 New Revision: 580808 URL: http://svn.apache.org/viewvc?rev=580808&view=rev Log: Small additions to JkShmFile documentation. Contributed by Gerhardus Geldenhuis. Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml to

svn commit: r580809 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml xdocs/reference/apache.xml

2007-09-30 Thread rjung
Author: rjung Date: Sun Sep 30 16:22:33 2007 New Revision: 580809 URL: http://svn.apache.org/viewvc?rev=580809&view=rev Log: Add new value "All" for JkMountCopy directive. This will switch the default of JkMountCopy from Off to On for all virtual servers. For mass histing this

svn commit: r586293 - /tomcat/tc6.0.x/trunk/STATUS

2007-10-19 Thread rjung
Author: rjung Date: Fri Oct 19 00:28:50 2007 New Revision: 586293 URL: http://svn.apache.org/viewvc?rev=586293&view=rev Log: Cast a vote. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=58629

svn commit: r586292 - /tomcat/current/tc5.5.x/STATUS

2007-10-19 Thread rjung
Author: rjung Date: Fri Oct 19 00:28:01 2007 New Revision: 586292 URL: http://svn.apache.org/viewvc?rev=586292&view=rev Log: Add svn properties for substitution. Modified: tomcat/current/tc5.5.x/STATUS (contents, props changed) Modified: tomcat/current/tc5.5.x/STATUS URL:

svn commit: r586291 - /tomcat/current/tc4.1.x/STATUS

2007-10-19 Thread rjung
Author: rjung Date: Fri Oct 19 00:27:15 2007 New Revision: 586291 URL: http://svn.apache.org/viewvc?rev=586291&view=rev Log: Fix EOL and set svn properties. No content change. Modified: tomcat/current/tc4.1.x/STATUS (contents, props changed) Modified: tomcat/current/tc4.1.x/STATUS

svn commit: r587013 - /tomcat/current/tc4.1.x/STATUS

2007-10-22 Thread rjung
Author: rjung Date: Sun Oct 21 23:59:47 2007 New Revision: 587013 URL: http://svn.apache.org/viewvc?rev=587013&view=rev Log: Propose patch to expand system properties in server.xml. Modified: tomcat/current/tc4.1.x/STATUS Modified: tomcat/current/tc4.1.x/STATUS URL: http://svn.apache

svn commit: r589091 - in /tomcat/connectors/trunk/jk/xdocs: miscellaneous/changelog.xml reference/uriworkermap.xml

2007-10-27 Thread rjung
Author: rjung Date: Sat Oct 27 06:15:51 2007 New Revision: 589091 URL: http://svn.apache.org/viewvc?rev=589091&view=rev Log: Fix bugzilla 43684, JkMountFile -> JkMountFileReload in uriworkermap.properties docs page. Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/change

svn commit: r591502 - in /tomcat/connectors/trunk/jk/native/common: jk_map.c jk_map.h

2007-11-02 Thread rjung
Author: rjung Date: Fri Nov 2 15:55:58 2007 New Revision: 591502 URL: http://svn.apache.org/viewvc?rev=591502&view=rev Log: Adding jk_map_copy(). Such a function existed in mod_jk.c. Since it's general purpose we move it to jk_map. Modified: tomcat/connectors/trunk/jk/native/common

svn commit: r591504 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-02 Thread rjung
Author: rjung Date: Fri Nov 2 16:00:52 2007 New Revision: 591504 URL: http://svn.apache.org/viewvc?rev=591504&view=rev Log: Use new general purpose function jk_map_copy() instead of httpd private copy_jk_map(). Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c to

svn commit: r591507 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-02 Thread rjung
Author: rjung Date: Fri Nov 2 16:09:52 2007 New Revision: 591507 URL: http://svn.apache.org/viewvc?rev=591507&view=rev Log: Add utility function to mod_jk.c for merging two tables. Copy an entry from src to dst, if there is no entry for the same key in dst. Modified: tomcat/connectors/t

svn commit: r591510 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-02 Thread rjung
Author: rjung Date: Fri Nov 2 16:19:11 2007 New Revision: 591510 URL: http://svn.apache.org/viewvc?rev=591510&view=rev Log: Fix configuration initialization behaviour for virtual hosts, which contain no JK directive. HTTPD does not call create_jk_config or merge_jk_config for those hosts

svn commit: r591512 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml

2007-11-02 Thread rjung
Author: rjung Date: Fri Nov 2 16:26:28 2007 New Revision: 591512 URL: http://svn.apache.org/viewvc?rev=591512&view=rev Log: Apache: Allow JkMount and JkUnMount patterns to start with '*' and '?' in addition to '/'. Modified: tomcat/connectors/trunk/jk/nat

svn commit: r591514 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-02 Thread rjung
Author: rjung Date: Fri Nov 2 16:36:49 2007 New Revision: 591514 URL: http://svn.apache.org/viewvc?rev=591514&view=rev Log: Fix porting error from httpd 2.0/2.2 module to 1.3 module. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Modified: tomcat/connectors/trunk/jk/na

svn commit: r591522 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

2007-11-02 Thread rjung
Author: rjung Date: Fri Nov 2 17:27:55 2007 New Revision: 591522 URL: http://svn.apache.org/viewvc?rev=591522&view=rev Log: Complete allowing mount patterns beginning with "*" or "?" in addition to "/". Modified: tomcat/connectors/trunk/jk/native/common/jk_

svn commit: r591524 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-02 Thread rjung
Author: rjung Date: Fri Nov 2 17:38:35 2007 New Revision: 591524 URL: http://svn.apache.org/viewvc?rev=591524&view=rev Log: We created a new server config structure, but we didn't use it :( Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c tomcat/connectors/trunk/

svn commit: r591629 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c native/common/jk_uri_worker_map.c xdocs/miscellaneous/changelog.xml

2007-11-03 Thread rjung
Author: rjung Date: Sat Nov 3 08:09:58 2007 New Revision: 591629 URL: http://svn.apache.org/viewvc?rev=591629&view=rev Log: Revert changes from r591512 and r591522. (was: Allow JkMount and JkUnMount patterns to start with '*' and '?' in addition to '/') Modifi

svn commit: r591640 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh

2007-11-03 Thread rjung
Author: rjung Date: Sat Nov 3 09:07:39 2007 New Revision: 591640 URL: http://svn.apache.org/viewvc?rev=591640&view=rev Log: Add ability to package from an svn revision to jk release script. Works for trunk, branch and directory packaging, useful for the production of pre release testing tarb

svn commit: r591660 - /tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml

2007-11-03 Thread rjung
Author: rjung Date: Sat Nov 3 11:44:08 2007 New Revision: 591660 URL: http://svn.apache.org/viewvc?rev=591660&view=rev Log: Clarify docs. Modified: tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml Modified: tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml URL:

svn commit: r591694 - /tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

2007-11-03 Thread rjung
Author: rjung Date: Sat Nov 3 14:30:40 2007 New Revision: 591694 URL: http://svn.apache.org/viewvc?rev=591694&view=rev Log: Fix some log message typos for isapi. Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Modified: tomcat/connectors/trunk/jk/native

svn commit: r591792 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c native/common/jk_uri_worker_map.c native/common/jk_uri_worker_map.h native/iis/jk_isapi_plug

2007-11-04 Thread rjung
Author: rjung Date: Sun Nov 4 07:53:44 2007 New Revision: 591792 URL: http://svn.apache.org/viewvc?rev=591792&view=rev Log: Fix BZ 42038: Correct overlay of mounts and unmounts for IIS. For IIS we check for mounts using two passes, once with the URL with the vhost name prepended, and i

svn commit: r591796 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

2007-11-04 Thread rjung
Author: rjung Date: Sun Nov 4 08:11:04 2007 New Revision: 591796 URL: http://svn.apache.org/viewvc?rev=591796&view=rev Log: Cleanup logic flow and don't log NULL value ... Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Modified: tomcat/connectors/trunk/

svn commit: r591804 - in /tomcat/connectors/trunk/jk: native/common/jk_uri_worker_map.c xdocs/miscellaneous/changelog.xml xdocs/reference/apache.xml xdocs/reference/uriworkermap.xml

2007-11-04 Thread rjung
Author: rjung Date: Sun Nov 4 09:18:13 2007 New Revision: 591804 URL: http://svn.apache.org/viewvc?rev=591804&view=rev Log: Make exclusion rules/JkUnMount easier. Until now the worker name of the exclusion rule needs to reflect the worker name of a mapping rule. In order to be able to exc

svn commit: r591810 - /tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc

2007-11-04 Thread rjung
Author: rjung Date: Sun Nov 4 10:11:04 2007 New Revision: 591810 URL: http://svn.apache.org/viewvc?rev=591810&view=rev Log: Fix compilation. Properly escape line ending. Modified: tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc Modified: tomcat/connectors/trunk/jk/native

svn commit: r593915 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 07:55:20 2007 New Revision: 593915 URL: http://svn.apache.org/viewvc?rev=593915&view=rev Log: Rename envvars_in_use to envvars_has_own reflecting better it's new use. It indicates, if the envvars are completely inherited from another vhost, or if the vho

svn commit: r593916 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 08:00:07 2007 New Revision: 593916 URL: http://svn.apache.org/viewvc?rev=593916&view=rev Log: Add two comments, how me merge. Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

svn commit: r593917 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 08:02:09 2007 New Revision: 593917 URL: http://svn.apache.org/viewvc?rev=593917&view=rev Log: We have this check already in two of three places, where we use uw_map. Adding it to the third place. Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_

svn commit: r593918 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 08:06:27 2007 New Revision: 593918 URL: http://svn.apache.org/viewvc?rev=593918&view=rev Log: We should always have a non-NULL mapping table in the main server. Otherwise e.g. we get a core dump, when using the mount attribute in workers.properties. Modi

svn commit: r593921 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 08:28:51 2007 New Revision: 593921 URL: http://svn.apache.org/viewvc?rev=593921&view=rev Log: Merge is always done before post_config, so we can use jk_mount_copy_all to set mountcopy during merge, which simplifies mount copy logic. JkMountCopy All should be we

svn commit: r593922 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 08:33:11 2007 New Revision: 593922 URL: http://svn.apache.org/viewvc?rev=593922&view=rev Log: Even if a vhost has private JkMounts, it should not always inherit the mounts from the global server. Only inherit if JkMountCopy indicates it. Modified: to

svn commit: r593926 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 08:49:09 2007 New Revision: 593926 URL: http://svn.apache.org/viewvc?rev=593926&view=rev Log: Correct typo from revision 593921. Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

svn commit: r593927 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 08:50:46 2007 New Revision: 593927 URL: http://svn.apache.org/viewvc?rev=593927&view=rev Log: We don't use uri_to_context after post_config, so we can clean it up early. Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modifie

svn commit: r593930 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 08:58:05 2007 New Revision: 593930 URL: http://svn.apache.org/viewvc?rev=593930&view=rev Log: Prevent crash, if worker_name is still NULL. Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modified: tomcat/connectors/trunk/jk/native/apache

svn commit: r593943 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 11:22:23 2007 New Revision: 593943 URL: http://svn.apache.org/viewvc?rev=593943&view=rev Log: Undo revision 593927. This produced a mem leak for vhosts with private JkMounts. No idea why. Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modi

svn commit: r593952 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2007-11-11 Thread rjung
Author: rjung Date: Sun Nov 11 12:46:36 2007 New Revision: 593952 URL: http://svn.apache.org/viewvc?rev=593952&view=rev Log: Add a missing free for a map used in the status worker. Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c Modified: tomcat/connectors/trunk/jk/na

svn commit: r596406 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 11:30:29 2007 New Revision: 596406 URL: http://svn.apache.org/viewvc?rev=596406&view=rev Log: Return DECLINED for NULL uw_map. This allows to have configured vhosts that have no mappings without need to initialize an empty uw_map. Ported from r591962 of apache

svn commit: r596407 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 11:44:47 2007 New Revision: 596407 URL: http://svn.apache.org/viewvc?rev=596407&view=rev Log: Make envvar tables created on demand. Only non virtual hosts have pre-allocated tables, other are allocated if JkEnvVar is specified inside vhost. Ported from r59198

svn commit: r596408 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 11:47:23 2007 New Revision: 596408 URL: http://svn.apache.org/viewvc?rev=596408&view=rev Log: Allocate temporary mount maps on first directive. Port from r591990 of apache-2.0/mod_jk.c. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Modi

svn commit: r596409 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 11:49:11 2007 New Revision: 596409 URL: http://svn.apache.org/viewvc?rev=596409&view=rev Log: Do not allocate envvar maps on create. They are allocated on first use. Port from r591995 of apache-2.0/mod_jk.c. Modified: tomcat/connectors/trunk/jk/native/ap

svn commit: r596410 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 11:50:23 2007 New Revision: 596410 URL: http://svn.apache.org/viewvc?rev=596410&view=rev Log: Remove trailing spaces, no functional change. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c tomcat/connectors/trunk/jk/native/apache-2.0/mod_

svn commit: r596417 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 12:00:09 2007 New Revision: 596417 URL: http://svn.apache.org/viewvc?rev=596417&view=rev Log: Initialize and allocate uw_map on first directive. Do not allocate on JkMountCopy if no additional maps are present. Port from r593462 of apache-2.0/mod_jk.c. Modi

svn commit: r596419 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 12:03:11 2007 New Revision: 596419 URL: http://svn.apache.org/viewvc?rev=596419&view=rev Log: Not sure why we set to NULL or zero something that was already set to zero. Port form r593493 of apache-2.0/mod_jk.c. Modified: tomcat/connectors/trunk/jk/na

svn commit: r596421 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 12:13:18 2007 New Revision: 596421 URL: http://svn.apache.org/viewvc?rev=596421&view=rev Log: Enhance r593497: debug log if no match was found, even if we do strip session. Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modified: to

svn commit: r596422 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 12:15:04 2007 New Revision: 596422 URL: http://svn.apache.org/viewvc?rev=596422&view=rev Log: Log no match case. Port from r593497 and r596421 of apache-2.0/mod_jk.c. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Modified: tomcat/connec

svn commit: r596423 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 12:16:47 2007 New Revision: 596423 URL: http://svn.apache.org/viewvc?rev=596423&view=rev Log: Rename envvars_in_use to envvars_has_own reflecting better it's new use. It indicates, if the envvars are completely inherited from another vhost, or if the vho

svn commit: r596426 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 12:18:55 2007 New Revision: 596426 URL: http://svn.apache.org/viewvc?rev=596426&view=rev Log: Add two comments, how me merge. Port from r593916 of apache-2.0/mod_jk.c. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Modified: tomcat/connec

svn commit: r596429 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 12:22:49 2007 New Revision: 596429 URL: http://svn.apache.org/viewvc?rev=596429&view=rev Log: We should always have a non-NULL mapping table in the main server. Otherwise e.g. we get a core dump, when using the mount attribute in workers.properties. Port

svn commit: r596433 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 12:26:02 2007 New Revision: 596433 URL: http://svn.apache.org/viewvc?rev=596433&view=rev Log: Merge is always done before post_config, so we can use jk_mount_copy_all to set mountcopy during merge, which simplifies mount copy logic. JkMountCopy All should be we

svn commit: r596435 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

2007-11-19 Thread rjung
Author: rjung Date: Mon Nov 19 12:28:13 2007 New Revision: 596435 URL: http://svn.apache.org/viewvc?rev=596435&view=rev Log: Even if a vhost has private JkMounts, it should not always inherit the mounts from the global server. Only inherit if JkMountCopy indicates it. Port from r593922 of ap

svn commit: r596746 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c native/common/jk_util.c native/common/jk_util.h xdocs/miscellaneous/changelog.xml

2007-11-20 Thread rjung
Author: rjung Date: Tue Nov 20 09:23:39 2007 New Revision: 596746 URL: http://svn.apache.org/viewvc?rev=596746&view=rev Log: bugzilla 43873: Fix small memory leak occuring during httpd restart. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c tomcat/connectors/trun

svn commit: r596747 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

2007-11-20 Thread rjung
Author: rjung Date: Tue Nov 20 09:29:26 2007 New Revision: 596747 URL: http://svn.apache.org/viewvc?rev=596747&view=rev Log: Add comments to explain timestamp formatting for sub seconds resolution. Furthermore increased the accepted format length a bit. Before we accepted JK_TIME_MAX_SIZ

svn commit: r596813 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_logger.h common/jk_util.c common/jk_util.h

2007-11-20 Thread rjung
Author: rjung Date: Tue Nov 20 12:29:28 2007 New Revision: 596813 URL: http://svn.apache.org/viewvc?rev=596813&view=rev Log: Because of some changed indentations, this one is easier to read in full text, not as a diff :( 1) Still use static length format string for subsecond resolution

svn commit: r597017 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2007-11-21 Thread rjung
Author: rjung Date: Wed Nov 21 02:08:10 2007 New Revision: 597017 URL: http://svn.apache.org/viewvc?rev=597017&view=rev Log: Use correct number of bytes written for statistics. The message length is supposed to get written, so in most cases this was OK, but the function returns the numbe

svn commit: r597848 - in /tomcat/connectors/trunk/jk/native/common: jk_uri_worker_map.c jk_uri_worker_map.h

2007-11-24 Thread rjung
Author: rjung Date: Sat Nov 24 05:57:04 2007 New Revision: 597848 URL: http://svn.apache.org/viewvc?rev=597848&view=rev Log: Provide a forced mode of checking uriworkermap.properties file. Will be used in status worker soon. Modified: tomcat/connectors/trunk/jk/native/co

svn commit: r597849 - in /tomcat/connectors/trunk/jk/native/common: jk_service.h jk_util.c

2007-11-24 Thread rjung
Author: rjung Date: Sat Nov 24 06:05:11 2007 New Revision: 597849 URL: http://svn.apache.org/viewvc?rev=597849&view=rev Log: Provide service callback to web server to - iterate through vhosts - get atextual representation of a vhost - get the uri_worker_map of a vhost. Will be used in st

svn commit: r597850 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2007-11-24 Thread rjung
Author: rjung Date: Sat Nov 24 06:24:52 2007 New Revision: 597850 URL: http://svn.apache.org/viewvc?rev=597850&view=rev Log: Rearrange uri_worker_map display in status worker: - add exclusion and disabled flags to displayed uri - list uri before type and source Modified: tomcat/connec

svn commit: r597864 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2007-11-24 Thread rjung
Author: rjung Date: Sat Nov 24 07:44:27 2007 New Revision: 597864 URL: http://svn.apache.org/viewvc?rev=597864&view=rev Log: Status worker: move display of uri_worker_map details into separate function. Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c Modified: to

svn commit: r597867 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2007-11-24 Thread rjung
Author: rjung Date: Sat Nov 24 07:56:20 2007 New Revision: 597867 URL: http://svn.apache.org/viewvc?rev=597867&view=rev Log: Status worker: allow display of uri worker maps for all vhosts, not only the vhost the status worker runs in. This depends on implementation of the new vhost iter

svn commit: r597869 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-24 Thread rjung
Author: rjung Date: Sat Nov 24 08:03:11 2007 New Revision: 597869 URL: http://svn.apache.org/viewvc?rev=597869&view=rev Log: Fix indentation. No functional change. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c tomcat/connectors/trunk/jk/native/apache-2.0/mod_

svn commit: r597870 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-24 Thread rjung
Author: rjung Date: Sat Nov 24 08:08:14 2007 New Revision: 597870 URL: http://svn.apache.org/viewvc?rev=597870&view=rev Log: Add late alloc of uri_to_context in case we want to inherit from base vhost, we have a private conf in the new vhost, but no private mounts. Modified: to

svn commit: r597872 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-24 Thread rjung
Author: rjung Date: Sat Nov 24 08:21:53 2007 New Revision: 597872 URL: http://svn.apache.org/viewvc?rev=597872&view=rev Log: Implement the new vhost iterator for Apache httpd. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c tomcat/connectors/trunk/jk/native/apache

svn commit: r597880 - in /tomcat/connectors/trunk/jk/xdocs: miscellaneous/changelog.xml reference/apache.xml reference/status.xml reference/uriworkermap.xml

2007-11-24 Thread rjung
Author: rjung Date: Sat Nov 24 08:50:39 2007 New Revision: 597880 URL: http://svn.apache.org/viewvc?rev=597880&view=rev Log: Document recent changes to status worker uri map listing and JkMountCopy All. Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml to

svn commit: r597877 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2007-11-24 Thread rjung
Author: rjung Date: Sat Nov 24 08:40:54 2007 New Revision: 597877 URL: http://svn.apache.org/viewvc?rev=597877&view=rev Log: Status worker: we don't need to prefix uri_worker_map display with '-' and '!', bacsue we have this information already in the textual typ

svn commit: r597974 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-25 Thread rjung
Author: rjung Date: Sun Nov 25 04:15:31 2007 New Revision: 597974 URL: http://svn.apache.org/viewvc?rev=597974&view=rev Log: Revert r597870: we alraedy handle this case by sharing the same uw_map in post_config. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c to

svn commit: r598338 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml

2007-11-26 Thread rjung
Author: rjung Date: Mon Nov 26 08:35:46 2007 New Revision: 598338 URL: http://svn.apache.org/viewvc?rev=598338&view=rev Log: Apache: Create JK_WORKER_ROUTE and JK_REQUEST_DURATION notes for access log even if no JkRequestLogFormat is set. Modified: tomcat/connectors/trunk/jk/native/ap

svn commit: r598405 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-26 Thread rjung
Author: rjung Date: Mon Nov 26 12:01:28 2007 New Revision: 598405 URL: http://svn.apache.org/viewvc?rev=598405&view=rev Log: Fix missing init of jk_worker_properties. Bug introduced in r580793. Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c tomcat/connectors/trun

svn commit: r598406 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-11-26 Thread rjung
Author: rjung Date: Mon Nov 26 12:05:13 2007 New Revision: 598406 URL: http://svn.apache.org/viewvc?rev=598406&view=rev Log: Second part of r598338: Create JK_WORKER_ROUTE and JK_REQUEST_DURATION notes for access log even if no JkRequestLogFormat is set. Also needed to produce start

svn commit: r598407 - /tomcat/connectors/trunk/jk/xdocs/reference/apache.xml

2007-11-26 Thread rjung
Author: rjung Date: Mon Nov 26 12:10:00 2007 New Revision: 598407 URL: http://svn.apache.org/viewvc?rev=598407&view=rev Log: Clarify version dependency of logging note feature (duration and route). Modified: tomcat/connectors/trunk/jk/xdocs/reference/apache.xml Modified: tomcat/connec

svn commit: r599743 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml

2007-11-30 Thread rjung
Author: rjung Date: Fri Nov 30 00:52:17 2007 New Revision: 599743 URL: http://svn.apache.org/viewvc?rev=599743&view=rev Log: Maintain idle connections in decreasing (LRU) slot order. Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c tomcat/connectors/trunk/jk/x

svn commit: r599767 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2007-11-30 Thread rjung
Author: rjung Date: Fri Nov 30 02:26:42 2007 New Revision: 599767 URL: http://svn.apache.org/viewvc?rev=599767&view=rev Log: Complete half-baked r599743. Care about signedness and apply reverse order to the relevant loop to. Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_comm

svn commit: r603320 - in /tomcat/connectors/trunk/jk/native: common/jk_ajp12_worker.c common/jk_ajp_common.c common/jk_connect.c common/jk_connect.h nt_service/jk_nt_service.c

2007-12-11 Thread rjung
Author: rjung Date: Tue Dec 11 10:24:31 2007 New Revision: 603320 URL: http://svn.apache.org/viewvc?rev=603320&view=rev Log: Add logger to all jk_connect socket functions. Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c tomcat/connectors/trunk/jk/native/co

svn commit: r603324 - in /tomcat/connectors/trunk/jk/native: common/jk_ajp12_worker.c nt_service/jk_nt_service.c

2007-12-11 Thread rjung
Author: rjung Date: Tue Dec 11 10:32:16 2007 New Revision: 603324 URL: http://svn.apache.org/viewvc?rev=603324&view=rev Log: jk_open_socket() arguments timeout and buf do not differentiate between ==0 and <0. So let's make the usage consistent. Modified: tomcat/connectors/tru

svn commit: r603352 - in /tomcat/connectors/trunk/jk: native/configure.in xdocs/miscellaneous/changelog.xml xdocs/webserver_howto/apache.xml

2007-12-11 Thread rjung
Author: rjung Date: Tue Dec 11 12:37:16 2007 New Revision: 603352 URL: http://svn.apache.org/viewvc?rev=603352&view=rev Log: Make the existing JK_PRODUCTION define available via configure. If set, it replaces JK_TRACE_ENTER() and JK_TRACE_EXIT() with nops. Document the new configure sw

svn commit: r603360 - /tomcat/connectors/trunk/jk/native/configure.in

2007-12-11 Thread rjung
Author: rjung Date: Tue Dec 11 13:14:33 2007 New Revision: 603360 URL: http://svn.apache.org/viewvc?rev=603360&view=rev Log: Reactivate broken --with-apxs feature for configure: using the switch without giving a file name lets configure search apxs in the PATH. Modified: tomcat/connec

svn commit: r603368 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c

2007-12-11 Thread rjung
Author: rjung Date: Tue Dec 11 13:27:36 2007 New Revision: 603368 URL: http://svn.apache.org/viewvc?rev=603368&view=rev Log: Use JK_UNSET instead of magical -1. Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Modified: tomcat/connectors/trunk/jk/native/co

svn commit: r603364 - /tomcat/connectors/trunk/jk/native/configure.in

2007-12-11 Thread rjung
Author: rjung Date: Tue Dec 11 13:19:02 2007 New Revision: 603364 URL: http://svn.apache.org/viewvc?rev=603364&view=rev Log: Use AS_HELP_STRING to format help messages of configure in columns. Modified: tomcat/connectors/trunk/jk/native/configure.in Modified: tomcat/connectors/trun

svn commit: r603400 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c

2007-12-11 Thread rjung
Author: rjung Date: Tue Dec 11 14:57:59 2007 New Revision: 603400 URL: http://svn.apache.org/viewvc?rev=603400&view=rev Log: Add function description comments and switch return values of jk_is_socket_connected() from 0/1 to JK_FALSE/JK_TRUE. Modified: tomcat/connectors/trunk/jk/native/co

svn commit: r603414 - /tomcat/connectors/trunk/jk/native/common/jk_connect.h

2007-12-11 Thread rjung
Author: rjung Date: Tue Dec 11 15:35:54 2007 New Revision: 603414 URL: http://svn.apache.org/viewvc?rev=603414&view=rev Log: JK_SOCKET_ERROR is not used any more. Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.h Modified: tomcat/connectors/trunk/jk/native/common/jk_conne

svn commit: r603500 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c

2007-12-11 Thread rjung
Author: rjung Date: Tue Dec 11 23:41:35 2007 New Revision: 603500 URL: http://svn.apache.org/viewvc?rev=603500&view=rev Log: Fix for r603400: Use JK_FALSE instead of 0 only where appropriate. Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c Modified: tomcat/connectors/t

svn commit: r603507 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 00:07:02 2007 New Revision: 603507 URL: http://svn.apache.org/viewvc?rev=603507&view=rev Log: Use the existing macros JK_IS_SOCKET_ERROR(x) and JK_GET_SOCKET_ERRNO() were appropriate. Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c Modi

svn commit: r603519 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 01:23:21 2007 New Revision: 603519 URL: http://svn.apache.org/viewvc?rev=603519&view=rev Log: Introduce TRACE to jk_connect.c. Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c

svn commit: r603547 - in /tomcat/connectors/trunk/jk/native/common: jk_connect.c jk_connect.h

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 02:42:01 2007 New Revision: 603547 URL: http://svn.apache.org/viewvc?rev=603547&view=rev Log: Use consistent variable names for the socket. Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c tomcat/connectors/trunk/jk/native/common/jk_conne

svn commit: r603556 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp_common.c jk_connect.c jk_connect.h

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 03:03:47 2007 New Revision: 603556 URL: http://svn.apache.org/viewvc?rev=603556&view=rev Log: Move ajp_is_input_event() to jk_connect and rename to jk_is_input_event(). Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c tomcat/connec

svn commit: r603566 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 03:23:51 2007 New Revision: 603566 URL: http://svn.apache.org/viewvc?rev=603566&view=rev Log: Undo revision r603561, because forgot to commit analogous jk_connect.c changes. Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Modified: to

svn commit: r603561 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 03:12:55 2007 New Revision: 603561 URL: http://svn.apache.org/viewvc?rev=603561&view=rev Log: Cleanup usage of jk_shutdown_socket() and setting a socket to JK_INVALID_SOCKET. Always try to do it early, because in most situations we already know we've got

svn commit: r603573 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp_common.c jk_connect.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 03:35:05 2007 New Revision: 603573 URL: http://svn.apache.org/viewvc?rev=603573&view=rev Log: Cleanup usage of jk_shutdown_socket() and setting a socket to JK_INVALID_SOCKET. Always try to do it early, because in most situations we already know we've got

svn commit: r603606 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 04:57:04 2007 New Revision: 603606 URL: http://svn.apache.org/viewvc?rev=603606&view=rev Log: Reorganize ajp_connect_to_endpoint() a bit, shutdown connecion in case of error and add/move logging. The diff looks much easier, when ignoring whitespace. Modi

svn commit: r603635 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 07:08:30 2007 New Revision: 603635 URL: http://svn.apache.org/viewvc?rev=603635&view=rev Log: Remove double space from log message. Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c Modified: tomcat/connectors/trunk/jk/native/common/jk_conne

svn commit: r603637 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 07:10:32 2007 New Revision: 603637 URL: http://svn.apache.org/viewvc?rev=603637&view=rev Log: Slightly rearange ajp_next_connection(). Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Modified: tomcat/connectors/trunk/jk/native/co

svn commit: r603650 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 07:57:54 2007 New Revision: 603650 URL: http://svn.apache.org/viewvc?rev=603650&view=rev Log: Formatting and unified last_errno handling. Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Modified: tomcat/connectors/trunk/jk/native/co

svn commit: r603677 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp_common.c jk_connect.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 09:20:09 2007 New Revision: 603677 URL: http://svn.apache.org/viewvc?rev=603677&view=rev Log: Clarify behaviour of jk_tcp_socket_recvfull() and jk_tcp_socket_sendfull(). Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c tomcat/connec

svn commit: r603675 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 09:11:02 2007 New Revision: 603675 URL: http://svn.apache.org/viewvc?rev=603675&view=rev Log: errno cleanup and comments in jk_connect. Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c Modified: tomcat/connectors/trunk/jk/native/co

svn commit: r603775 - in /tomcat/connectors/trunk/jk: native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml

2007-12-12 Thread rjung
Author: rjung Date: Wed Dec 12 15:16:10 2007 New Revision: 603775 URL: http://svn.apache.org/viewvc?rev=603775&view=rev Log: Use ap_get_server_description() for httpd 2.2.4+ for display of httpd version in the status worker. Until now we used the MODULE_MAGIC from httpd trunk. Modi

<    5   6   7   8   9   10   11   12   13   14   >