Author: rjung Date: Wed Mar 11 21:48:41 2009 New Revision: 752641 URL: http://svn.apache.org/viewvc?rev=752641&view=rev Log: Since the JK request log isn't really useful any more (using log notes in the standard access log is much better), and the log format is only parsed during startup/restart (not performance critical), lets get rid of the default array size "15". Start with 0, and let it get resized on demand.
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=752641&r1=752640&r2=752641&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Wed Mar 11 21:48:41 2009 @@ -86,7 +86,6 @@ #define JK_MAGIC_TYPE ("application/x-jakarta-servlet") #define NULL_FOR_EMPTY(x) ((x && !strlen(x)) ? NULL : x) #define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)") -#define INITIAL_LOG_FORMAT_ARRAY_SZ (15) /* * If you are not using SSL, comment out the following line. It will make @@ -1629,7 +1628,7 @@ static array_header *parse_request_log_string(pool * p, const char *s, const char **err) { - array_header *a = ap_make_array(p, INITIAL_LOG_FORMAT_ARRAY_SZ, sizeof(request_log_format_item)); + array_header *a = ap_make_array(p, 0, sizeof(request_log_format_item)); char *res; while (*s) { Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=752641&r1=752640&r2=752641&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Mar 11 21:48:41 2009 @@ -129,7 +129,6 @@ #define NULL_FOR_EMPTY(x) ((x && !strlen(x)) ? NULL : x) #define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)") #define JK_LOG_LOCK_KEY ("jk_log_lock_key") -#define INITIAL_LOG_FORMAT_ARRAY_SZ (15) /* * If you are not using SSL, comment out the following line. It will make * apache run faster. @@ -1714,7 +1713,7 @@ const char **err) { apr_array_header_t *a = - apr_array_make(p, INITIAL_LOG_FORMAT_ARRAY_SZ, sizeof(request_log_format_item)); + apr_array_make(p, 0, sizeof(request_log_format_item)); char *res; while (*s) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org