[svn:modperl-modules] rev 136 - Apache-Scoreboard-1.0/trunk

Author: stas
Date: Fri Feb  4 19:27:31 2005
New Revision: 136

Modified:
   Apache-Scoreboard-1.0/trunk/Changes
   Apache-Scoreboard-1.0/trunk/Scoreboard.xs
Log:
fix another segfault introduced by 0.12: don't try to resolve vhostrec
for Apache::DummyScoreboard, since it can only be resolved inside the
running Apache server (i.e. in the mod_perl script/handler).


Modified: Apache-Scoreboard-1.0/trunk/Changes
==============================================================================
--- Apache-Scoreboard-1.0/trunk/Changes	(original)
+++ Apache-Scoreboard-1.0/trunk/Changes	Fri Feb  4 19:27:31 2005
@@ -2,10 +2,15 @@
 
 added a live test suite
 
+fix another segfault introduced by 0.12: don't try to resolve vhostrec
+for Apache::DummyScoreboard, since it can only be resolved inside the
+running Apache server (i.e. in the mod_perl script/handler).
+
 
 0.13 - Fri Jan 21 21:00:23 EST 2005
 
-fix a segfault introduced by 0.12
+fix a segfault introduced by 0.12: check whether vhostrec pointer is
+not NULL, before resolving it.
 
 
 

Modified: Apache-Scoreboard-1.0/trunk/Scoreboard.xs
==============================================================================
--- Apache-Scoreboard-1.0/trunk/Scoreboard.xs	(original)
+++ Apache-Scoreboard-1.0/trunk/Scoreboard.xs	Fri Feb  4 19:27:31 2005
@@ -32,8 +32,10 @@
 #define server_score_client(s)          s->record.client
 #define server_score_request(s)         s->record.request
 
-#define server_score_vhost(s) \
-    s->record.vhostrec ? s->record.vhostrec->server_hostname : ""
+#define server_score_vhost(s)                           \
+    s->record.vhostrec && ap_scoreboard_image           \
+        ? s->record.vhostrec->server_hostname           \
+        : ""
 
 #define parent_score_pid(s) s->record.pid