Author: stevehay
Date: Thu Feb 6 08:56:29 2014
New Revision: 1565123
URL: http://svn.apache.org/r1565123
Log:
The extended printf format %pt in apr_vformatter() requires a apr_os_thread_t*,
not a (void*)apr_os_thread_t. This fixes a crash in conv_os_thread_t when
starting up httpd+mod_perl on Windows with "PerlTrace all" set
Modified:
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_common_log.c
Modified:
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_common_log.c
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_common_log.c?rev=1565123&r1=1565122&r2=1565123&view=diff
==============================================================================
---
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_common_log.c
(original)
+++
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_common_log.c
Thu Feb 6 08:56:29 2014
@@ -57,9 +57,9 @@ void modperl_trace(const char *func, con
* created. Hence the modperl_is_running() question. */
if (modperl_threaded_mpm()) {
if (modperl_threads_started()) {
+ apr_os_thread_t tid = apr_os_thread_current();
apr_file_printf(logfile, "[pid=%lu, tid=%pt, perl=%pp] ",
- (unsigned long)getpid(),
- (void*)apr_os_thread_current(),
+ (unsigned long)getpid(), &tid,
modperl_is_running() ? PERL_GET_CONTEXT : NULL);
}
else {
