You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2009/12/02 23:13:57 UTC
svn commit: r886324 - /httpd/httpd/trunk/server/scoreboard.c
Author: rpluem
Date: Wed Dec 2 22:13:54 2009
New Revision: 886324
URL: http://svn.apache.org/viewvc?rev=886324&view=rev
Log:
* server/scoreboard.c::ap_create_scoreboard
Reset the pointer to ap_logio_get_last_bytes each time we create or reinit an
existing scoreboard to avoid using an invalid pointer in case mod_logio got
reloaded to a different address.
Reviewed by: rjung, trawick
Modified:
httpd/httpd/trunk/server/scoreboard.c
Modified: httpd/httpd/trunk/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=886324&r1=886323&r2=886324&view=diff
==============================================================================
--- httpd/httpd/trunk/server/scoreboard.c (original)
+++ httpd/httpd/trunk/server/scoreboard.c Wed Dec 2 22:13:54 2009
@@ -284,6 +284,8 @@
apr_status_t rv;
#endif
+ pfn_ap_logio_get_last_bytes = APR_RETRIEVE_OPTIONAL_FN(ap_logio_get_last_bytes);
+
if (ap_scoreboard_image) {
running_gen = ap_scoreboard_image->global->running_generation;
ap_scoreboard_image->global->restart_time = apr_time_now();