You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Dean Gaudet <dg...@hyperreal.com> on 1997/06/24 02:32:35 UTC
cvs commit: apache/src CHANGES http_main.c mod_status.c scoreboard.h
dgaudet 97/06/23 17:32:35
Modified: src CHANGES http_main.c mod_status.c scoreboard.h
Log:
PR#566: mod_status dumps core in inetd mode
Submitted by: Marc Slemko and Roy Fielding
Reviewed by: Marc Slemko, Roy Fielding, Alexei Kosut
Revision Changes Path
1.290 +3 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.289
retrieving revision 1.290
diff -C3 -r1.289 -r1.290
*** CHANGES 1997/06/23 23:56:15 1.289
--- CHANGES 1997/06/24 00:32:30 1.290
***************
*** 8,13 ****
--- 8,16 ----
Changes with Apache 1.2.1
+ *) PR#566: mod_status dumps core in inetd mode.
+ [Marc Slemko and Roy Fielding]
+
*) Attempt to work around problems with third party libraries that do not
handle high numbered descriptors (examples include bind, and
solaris libc). On all systems apache attempts to keep all permanent
1.159 +5 -0 apache/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -C3 -r1.158 -r1.159
*** http_main.c 1997/06/23 23:56:17 1.158
--- http_main.c 1997/06/24 00:32:31 1.159
***************
*** 1058,1063 ****
--- 1058,1068 ----
#endif /* MULTITHREAD */
+ int exists_scoreboard_image ()
+ {
+ return (scoreboard_image ? 1 : 0);
+ }
+
int update_child_status (int child_num, int status, request_rec *r)
{
int old_status;
1.48 +9 -1 apache/src/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_status.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C3 -r1.47 -r1.48
*** mod_status.c 1997/05/08 08:23:31 1.47
--- mod_status.c 1997/06/24 00:32:31 1.48
***************
*** 95,100 ****
--- 95,101 ----
#include "util_script.h"
#include <time.h>
#include "scoreboard.h"
+ #include "http_log.h"
#ifdef NEXT
#include <machine/param.h>
***************
*** 229,235 ****
status[SERVER_BUSY_DNS]='D';
status[SERVER_GRACEFUL]='G';
! if (r->method_number != M_GET) return NOT_IMPLEMENTED;
r->content_type = "text/html";
/*
--- 230,243 ----
status[SERVER_BUSY_DNS]='D';
status[SERVER_GRACEFUL]='G';
! if (!exists_scoreboard_image()) {
! log_printf(r->server, "Server status unavailable in inetd mode");
! return HTTP_NOT_IMPLEMENTED;
! }
! r->allowed = (1 << M_GET) | (1 << M_TRACE);
! if (r->method_number != M_GET) return HTTP_METHOD_NOT_ALLOWED;
! if (!exists_scoreboard_image()) return HTTP_NOT_IMPLEMENTED;
!
r->content_type = "text/html";
/*
1.23 +1 -1 apache/src/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /export/home/cvs/apache/src/scoreboard.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C3 -r1.22 -r1.23
*** scoreboard.h 1997/06/15 19:22:34 1.22
--- scoreboard.h 1997/06/24 00:32:32 1.23
***************
*** 109,112 ****
extern void sync_scoreboard_image(void);
short_score get_scoreboard_info(int x);
!
--- 109,112 ----
extern void sync_scoreboard_image(void);
short_score get_scoreboard_info(int x);
! int exists_scoreboard_image ();
Re: cvs commit: apache/src CHANGES http_main.c mod_status.c scoreboard.h
Posted by Dean Gaudet <dg...@arctic.org>.
Oh btw, with these commits I'm doing on HEAD, I'm noting the CHANGES under
1.2.1 in anticipation of actually merging them into 1.2.1. I'll clean up
later if that isn't the case.
Dean