Author: rjung
Date: Mon Feb 6 07:37:50 2012
New Revision: 1240904
URL: http://svn.apache.org/viewvc?rev=1240904&view=rev
Log:
BZ 52564: Fix building with format checking gcc security
hardening cflags. Contributed by Tony Mancill.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1240904&r1=1240903&r2=1240904&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Mon Feb 6 07:37:50 2012
@@ -620,9 +620,9 @@ static void jk_error_exit(const char *fi
ch++;
}
- ap_log_error(file, line, level, s, res);
+ ap_log_error(file, line, level, s, "%s", res);
if ( s ) {
- ap_log_error(file, line, level, NULL, res);
+ ap_log_error(file, line, level, NULL, "%s", res);
}
/* Exit process */
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1240904&r1=1240903&r2=1240904&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Feb 6 07:37:50 2012
@@ -689,15 +689,15 @@ static void jk_error_exit(const char *fi
}
#if (MODULE_MAGIC_NUMBER_MAJOR >= 20100606)
- ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, s, res);
+ ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, s, "%s", res);
#else
- ap_log_error(file, line, level, 0, s, res);
+ ap_log_error(file, line, level, 0, s, "%s", res);
#endif
if ( s ) {
#if (MODULE_MAGIC_NUMBER_MAJOR >= 20100606)
- ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, NULL, res);
+ ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, NULL, "%s",
res);
#else
- ap_log_error(file, line, level, 0, NULL, res);
+ ap_log_error(file, line, level, 0, NULL, "%s", res);
#endif
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1240904&r1=1240903&r2=1240904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Feb 6 07:37:50 2012
@@ -45,6 +45,10 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>52564</bug>: Fix building with format checking gcc security
+ hardening cflags. Contributed by Tony Mancill. (rjung)
+ </fix>
+ <fix>
<bug>52567</bug>: Balancer member in recovery state can switch
back into error state if it is idle. (rjung)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
