dgaudet 98/12/23 10:34:27
Modified: src CHANGES
src/modules/standard mod_log_config.c
Log:
For %v log ServerName regardless of the UseCanonicalName
setting (similarly for %p).
Revision Changes Path
1.1177 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1176
retrieving revision 1.1177
diff -u -r1.1176 -r1.1177
--- CHANGES 1998/12/23 00:36:12 1.1176
+++ CHANGES 1998/12/23 18:34:19 1.1177
@@ -1,5 +1,8 @@
Changes with Apache 1.3.4
+ *) For %v log ServerName regardless of the UseCanonicalName
+ setting (similarly for %p). [Dean Gaudet]
+
*) Configure was initializing the variables $OSDIR, $INCDIR and $SHELL
rather late (too late for some invocations of TestCompile).
This improves the make environment available to TestCompile and
1.69 +3 -2 apache-1.3/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_log_config.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mod_log_config.c 1998/12/02 00:00:16 1.68
+++ mod_log_config.c 1998/12/23 18:34:25 1.69
@@ -407,12 +407,13 @@
*/
static const char *log_virtual_host(request_rec *r, char *a)
{
- return ap_get_server_name(r);
+ return r->server->server_hostname;
}
static const char *log_server_port(request_rec *r, char *a)
{
- return ap_psprintf(r->pool, "%u", ap_get_server_port(r));
+ return ap_psprintf(r->pool, "%u",
+ r->server->port ? r->server->port : ap_default_port(r));
}
static const char *log_child_pid(request_rec *r, char *a)
