Only in src/: .apaci.install.conf
Binary files ../apache_1.3.2-orig/src/ap/libap.a and src/ap/libap.a differ
Binary files ../apache_1.3.2-orig/src/buildmark.o and src/buildmark.o differ
Binary files ../apache_1.3.2-orig/src/httpd and src/httpd differ
diff -rC 3 ../apache_1.3.2-orig/src/include/httpd.h src/include/httpd.h
*** ../apache_1.3.2-orig/src/include/httpd.h Mon Sep 21 21:12:17 1998
--- src/include/httpd.h Mon Oct 5 10:19:54 1998
***************
*** 818,823 ****
--- 818,824 ----
char *server_admin;
char *server_hostname;
+ int server_hostnumber;
unsigned short port; /* for redirects, etc. */
/* Log files --- note that transfer log is now in the modules... */
diff -rC 3 ../apache_1.3.2-orig/src/include/scoreboard.h src/include/scoreboard.h
*** ../apache_1.3.2-orig/src/include/scoreboard.h Tue Aug 11 02:09:43 1998
--- src/include/scoreboard.h Mon Oct 5 11:57:22 1998
***************
*** 130,136 ****
#endif
char client[32]; /* Keep 'em small... */
char request[64]; /* We just want an idea... */
! char vhost[32]; /* What virtual host is being accessed? */
} short_score;
typedef struct {
--- 130,136 ----
#endif
char client[32]; /* Keep 'em small... */
char request[64]; /* We just want an idea... */
! int vhostNr; /* What virtual host is being accessed? */
} short_score;
typedef struct {
diff -rC 3 ../apache_1.3.2-orig/src/main/http_config.c src/main/http_config.c
*** ../apache_1.3.2-orig/src/main/http_config.c Sat Sep 19 23:54:57 1998
--- src/main/http_config.c Mon Oct 5 10:25:29 1998
***************
*** 1294,1299 ****
--- 1294,1300 ----
s->server_admin = NULL;
s->server_hostname = NULL;
+ s->server_hostnumber = 0;
s->error_fname = NULL;
s->srm_confname = NULL;
s->access_confname = NULL;
***************
*** 1409,1414 ****
--- 1410,1416 ----
s->port = 0;
s->server_admin = DEFAULT_ADMIN;
s->server_hostname = NULL;
+ s->server_hostnumber = 0;
s->error_fname = DEFAULT_ERRORLOG;
s->error_log = stderr;
s->loglevel = DEFAULT_LOGLEVEL;
Binary files ../apache_1.3.2-orig/src/main/http_config.o and src/main/http_config.o differ
Binary files ../apache_1.3.2-orig/src/main/http_core.o and src/main/http_core.o differ
Binary files ../apache_1.3.2-orig/src/main/http_log.o and src/main/http_log.o differ
diff -rC 3 ../apache_1.3.2-orig/src/main/http_main.c src/main/http_main.c
*** ../apache_1.3.2-orig/src/main/http_main.c Mon Sep 21 12:16:11 1998
--- src/main/http_main.c Mon Oct 5 11:57:38 1998
***************
*** 2051,2057 ****
r->assbackwards ? NULL : " ", r->protocol, NULL),
sizeof(ss->request));
}
! ap_cpystrn(ss->vhost, r->server->server_hostname, sizeof(ss->vhost));
}
}
put_scoreboard_info(child_num, ss);
--- 2051,2057 ----
r->assbackwards ? NULL : " ", r->protocol, NULL),
sizeof(ss->request));
}
! ss->vhostNr = r->server->server_hostnumber;
}
}
put_scoreboard_info(child_num, ss);
Binary files ../apache_1.3.2-orig/src/main/http_main.o and src/main/http_main.o differ
Binary files ../apache_1.3.2-orig/src/main/http_protocol.o and src/main/http_protocol.o differ
Binary files ../apache_1.3.2-orig/src/main/http_request.o and src/main/http_request.o differ
diff -rC 3 ../apache_1.3.2-orig/src/main/http_vhost.c src/main/http_vhost.c
*** ../apache_1.3.2-orig/src/main/http_vhost.c Sun Apr 19 22:10:47 1998
--- src/main/http_vhost.c Mon Oct 5 11:54:05 1998
***************
*** 512,519 ****
* order they occured in the config file, so we insert them at
* the iphash_table_tail but don't advance the tail.
*/
!
for (s = main_s->next; s; s = s->next) {
has_default_vhost_addr = 0;
for (sar = s->addrs; sar; sar = sar->next) {
ipaddr_chain *ic;
--- 512,522 ----
* order they occured in the config file, so we insert them at
* the iphash_table_tail but don't advance the tail.
*/
! /* Let's use variable 'i' again.
! */
! i = 1;
for (s = main_s->next; s; s = s->next) {
+ s->server_hostnumber = i++;
has_default_vhost_addr = 0;
for (sar = s->addrs; sar; sar = sar->next) {
ipaddr_chain *ic;
Binary files ../apache_1.3.2-orig/src/main/http_vhost.o and src/main/http_vhost.o differ
Binary files ../apache_1.3.2-orig/src/main/libmain.a and src/main/libmain.a differ
Binary files ../apache_1.3.2-orig/src/main/util_script.o and src/main/util_script.o differ
Binary files ../apache_1.3.2-orig/src/modules/standard/libstandard.a and src/modules/standard/libstandard.a differ
Binary files ../apache_1.3.2-orig/src/modules/standard/mod_alias.o and src/modules/standard/mod_alias.o differ
Binary files ../apache_1.3.2-orig/src/modules/standard/mod_cgi.o and src/modules/standard/mod_cgi.o differ
Binary files ../apache_1.3.2-orig/src/modules/standard/mod_env.o and src/modules/standard/mod_env.o differ
Binary files ../apache_1.3.2-orig/src/modules/standard/mod_log_config.o and src/modules/standard/mod_log_config.o differ
Binary files ../apache_1.3.2-orig/src/modules/standard/mod_mime.o and src/modules/standard/mod_mime.o differ
Binary files ../apache_1.3.2-orig/src/modules/standard/mod_negotiation.o and src/modules/standard/mod_negotiation.o differ
Binary files ../apache_1.3.2-orig/src/modules/standard/mod_rewrite.o and src/modules/standard/mod_rewrite.o differ
Binary files ../apache_1.3.2-orig/src/modules/standard/mod_setenvif.o and src/modules/standard/mod_setenvif.o differ
diff -rC 3 ../apache_1.3.2-orig/src/modules/standard/mod_status.c src/modules/standard/mod_status.c
*** ../apache_1.3.2-orig/src/modules/standard/mod_status.c Wed Aug 12 12:23:46 1998
--- src/modules/standard/mod_status.c Mon Oct 5 11:52:03 1998
***************
*** 131,136 ****
--- 131,152 ----
module MODULE_VAR_EXPORT status_module;
+ server_rec *main_s;
+
+ char *ap_get_vhostname(int nr)
+ {
+ server_rec *s = main_s;
+
+ while (s) {
+ if (s->server_hostnumber == nr) {
+ return(s->server_hostname);
+ }
+ s = s->next;
+ }
+ return(main_s->server_hostname);
+ }
+
+
/*
*command-related code. This is here to prevent use of ExtendedStatus
* without status_module included.
***************
*** 650,656 ****
else
ap_rprintf(r,
"| %s | %s | %s\n\n",
! score_record.client, score_record.vhost,
ap_escape_html(r->pool, score_record.request));
} /* no_table_report */
} /* !short_report */
--- 666,672 ----
else
ap_rprintf(r,
" | %s | %s | %s\n\n",
! score_record.client, ap_get_vhostname(score_record.vhostNr),
ap_escape_html(r->pool, score_record.request));
} /* no_table_report */
} /* !short_report */
***************
*** 718,723 ****
--- 734,741 ----
status_flags[SERVER_BUSY_LOG] = 'L';
status_flags[SERVER_BUSY_DNS] = 'D';
status_flags[SERVER_GRACEFUL] = 'G';
+
+ main_s = s;
}
static const handler_rec status_handlers[] =
Binary files ../apache_1.3.2-orig/src/modules/standard/mod_status.o and src/modules/standard/mod_status.o differ
Binary files ../apache_1.3.2-orig/src/modules/standard/mod_userdir.o and src/modules/standard/mod_userdir.o differ
Binary files ../apache_1.3.2-orig/src/os/unix/libos.a and src/os/unix/libos.a differ
|