ben 97/11/25 12:43:34
Modified: src CHANGES
src/main http_main.c
Log:
Fix scoreboard allocation size.
Submitted by: Dean Gaudet
Revision Changes Path
1.520 +3 -0 apachen/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- CHANGES 1997/11/23 18:10:02 1.519
+++ CHANGES 1997/11/25 20:43:30 1.520
@@ -1,5 +1,8 @@
Changes with Apache 1.3b4
+ *) WIN32: Allocate the correct amount of memory for the scoreboard.
+ [Dean Gaudet]
+
*) WIN32: Only lowercase the part of the path that is real. [Ben Laurie]
*) Fix problems with timeouts in inetd mode and -X mode. [Dean Gaudet]
1.255 +2 -1 apachen/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- http_main.c 1997/11/25 04:07:11 1.254
+++ http_main.c 1997/11/25 20:43:32 1.255
@@ -1248,7 +1248,8 @@
void reinit_scoreboard(pool *p)
{
ap_assert(!scoreboard_image);
- scoreboard_image = (scoreboard *) calloc(HARD_SERVER_LIMIT,
sizeof(short_score));
+ scoreboard_image = (scoreboard *) malloc(SCOREBOARD_SIZE);
+ memset(scoreboard_image, 0, SCOREBOARD_SIZE);
}
void cleanup_scoreboard()
