Author: torsten
Date: Tue Feb 7 19:23:08 2012
New Revision: 1241560
URL: http://svn.apache.org/viewvc?rev=1241560&view=rev
Log:
Merged revisions 1241435 via svnmerge from
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........
r1241435 | torsten | 2012-02-07 13:00:45 +0100 (Tue, 07 Feb 2012) | 3 lines
Fix a small bug in a debugging message in modperl_module.c. It tried to
print a modperl_mgv_t* as %s.
........
Modified:
perl/modperl/branches/threading/ (props changed)
perl/modperl/branches/threading/src/modules/perl/modperl_module.c
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 7 19:23:08 2012
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448,1066644-1074122,1076733,1083541,1089349-1096565,1124132,1125476-1145161,1213838-1222775
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448,1066644-1074122,1076733,1083541,1089349-1096565,1124132,1125476-1145161,1213838-1222775,1241435
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 7 19:23:08 2012
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-1241385
+/perl/modperl/trunk:1-712967,712969-1241559
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_module.c
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_module.c?rev=1241560&r1=1241559&r2=1241560&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_module.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_module.c Tue Feb
7 19:23:08 2012
@@ -299,8 +299,8 @@ modperl_module_config_create_obj(pTHX_
}
MP_TRACE_c(MP_FUNC, "%s cfg=0x%lx for %s.%s",
- method, (unsigned long)cfg,
- mname, parms->cmd->name);
+ method ? modperl_mgv_last_name(method) : "NULL",
+ (unsigned long)cfg, mname, parms->cmd->name);
/* used by merge functions to get a Perl interp */
cfg->server = parms->server;
