Last change
on this file since 2136 was
2134,
checked in by achernya, 13 years ago
|
Patch httpd against some security vulnerabilities.
|
File size:
936 bytes
|
Rev | Line | |
---|
[2134] | 1 | --- httpd/httpd/branches/2.2.x/server/scoreboard.c 2012/01/13 13:27:19 1231057 |
---|
| 2 | +++ httpd/httpd/branches/2.2.x/server/scoreboard.c 2012/01/13 13:27:46 1231058 |
---|
| 3 | @@ -42,6 +42,8 @@ |
---|
| 4 | AP_DECLARE_DATA int ap_extended_status = 0; |
---|
| 5 | AP_DECLARE_DATA int ap_mod_status_reqtail = 0; |
---|
| 6 | |
---|
| 7 | +static ap_scoreboard_e scoreboard_type; |
---|
| 8 | + |
---|
| 9 | #if APR_HAS_SHARED_MEMORY |
---|
| 10 | |
---|
| 11 | #include "apr_shm.h" |
---|
| 12 | @@ -250,7 +252,7 @@ |
---|
| 13 | if (ap_scoreboard_image == NULL) { |
---|
| 14 | return APR_SUCCESS; |
---|
| 15 | } |
---|
| 16 | - if (ap_scoreboard_image->global->sb_type == SB_SHARED) { |
---|
| 17 | + if (scoreboard_type == SB_SHARED) { |
---|
| 18 | ap_cleanup_shared_mem(NULL); |
---|
| 19 | } |
---|
| 20 | else { |
---|
| 21 | @@ -312,7 +314,7 @@ |
---|
| 22 | ap_init_scoreboard(sb_mem); |
---|
| 23 | } |
---|
| 24 | |
---|
| 25 | - ap_scoreboard_image->global->sb_type = sb_type; |
---|
| 26 | + ap_scoreboard_image->global->sb_type = scoreboard_type = sb_type; |
---|
| 27 | ap_scoreboard_image->global->running_generation = 0; |
---|
| 28 | ap_scoreboard_image->global->restart_time = apr_time_now(); |
---|
| 29 | |
---|
Note: See
TracBrowser
for help on using the repository browser.