You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@hyperreal.org on 1998/08/08 15:26:08 UTC
cvs commit: apache-1.3/src/main http_core.c http_request.c
jim 98/08/08 06:26:07
Modified: src CHANGES
src/main http_core.c http_request.c
Log:
Knowing that a process is in DNS or logging
"mode" is good information and the performance hit is minimal since
these are "expensive" operations anyway, so enable these even without
STATUS
Revision Changes Path
1.1011 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1010
retrieving revision 1.1011
diff -u -r1.1010 -r1.1011
--- CHANGES 1998/08/07 15:35:45 1.1010
+++ CHANGES 1998/08/08 13:26:04 1.1011
@@ -1,5 +1,8 @@
Changes with Apache 1.3.2
+ *) Make status module aware of DNS and logging states, even if
+ STATUS not defined. [Jim Jagielski]
+
*) Fix a problem with the new OS/2 mutexes. [Brian Havard]
*) Enhance mod_spelling so that CheckSpelling can be used in
1.218 +0 -6 apache-1.3/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- http_core.c 1998/08/06 19:23:46 1.217
+++ http_core.c 1998/08/08 13:26:06 1.218
@@ -555,9 +555,7 @@
struct in_addr *iaddr;
struct hostent *hptr;
int hostname_lookups;
-#ifdef STATUS
int old_stat = SERVER_DEAD; /* we shouldn't ever be in this state */
-#endif
/* If we haven't checked the host name, and we want to */
if (dir_config) {
@@ -577,10 +575,8 @@
&& conn->remote_host == NULL
&& (type == REMOTE_DOUBLE_REV
|| hostname_lookups != HOSTNAME_LOOKUP_OFF)) {
-#ifdef STATUS
old_stat = ap_update_child_status(conn->child_num, SERVER_BUSY_DNS,
(request_rec*)NULL);
-#endif /* STATUS */
iaddr = &(conn->remote_addr.sin_addr);
hptr = gethostbyaddr((char *)iaddr, sizeof(struct in_addr), AF_INET);
if (hptr != NULL) {
@@ -605,12 +601,10 @@
return NULL;
}
}
-#ifdef STATUS
if (old_stat != SERVER_DEAD) {
(void)ap_update_child_status(conn->child_num, old_stat,
(request_rec*)NULL);
}
-#endif /* STATUS */
/*
* Return the desired information; either the remote DNS name, if found,
1.128 +2 -4 apache-1.3/src/main/http_request.c
Index: http_request.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- http_request.c 1998/08/06 17:30:31 1.127
+++ http_request.c 1998/08/08 13:26:06 1.128
@@ -1180,18 +1180,16 @@
void ap_process_request(request_rec *r)
{
-#ifdef STATUS
int old_stat;
+#ifdef STATUS
ap_time_process_request(r->connection->child_num, START_PREQUEST);
#endif
process_request_internal(r);
-#ifdef STATUS
old_stat = ap_update_child_status(r->connection->child_num,
SERVER_BUSY_LOG, r);
-#endif
/*
* We want to flush the last packet if this isn't a pipelining connection
@@ -1203,8 +1201,8 @@
ap_bhalfduplex(r->connection->client);
ap_log_transaction(r);
-#ifdef STATUS
(void) ap_update_child_status(r->connection->child_num, old_stat, r);
+#ifdef STATUS
ap_time_process_request(r->connection->child_num, STOP_PREQUEST);
#endif
}